Bug 119221 – Windows ANGLE build needs separate hlsl and glsl projects

• Status: RESOLVED
• Resolution: FIXED
• Component: ANGLE

[Alex Christensen]

ANGLE's libGLESv2 creates an HLSL translator and needs to link with the translator_hlsl library (see Source/ThirdParty/ANGLE/src/libGLESv2/Shader.cpp line 233).  ANGLEWebKitBridge creates a GLSL translator and needs to link with the translator_glsl library (see Source/WebCore/platform/graphics/ANGLEWebKitBridge.h line 73).  My previous approach of combining ANGLE's preprocessor, translator_common, and my translator_glsl will not work.  They need to be separate libraries and the linking needs to be a little more complicated, but doing this will get it to work.

[Alex Christensen]

Created attachment 207664 [details]
Patch

[Brent Fulgham]

Comment on attachment 207664 [details]
Patch

View in context: https://bugs.webkit.org/attachment.cgi?id=207664&action=review

Looks good, but please fix the ChangeLog file.

> Source/ThirdParty/ANGLE/ChangeLog:28
> [phone]  Alex Christensen  <[e-mail]>

I don't think you wanted this additional ChangeLog entry.

[Alex Christensen]

Created attachment 207665 [details]
Patch

[Brent Fulgham]

Comment on attachment 207665 [details]
Patch

r=me

[Build Bot]

Comment on attachment 207665 [details]
Patch

Attachment 207665 [details] did not pass mac-ews (mac):
Output: http://webkit-queues.appspot.com/results/1295079

New failing tests:
editing/selection/leak-document-with-selection-inside.html

[Build Bot]

Created attachment 207666 [details]
Archive of layout-test-results from webkit-ews-03 for mac-mountainlion

The attached test failures were seen while running run-webkit-tests on the mac-ews.
Bot: webkit-ews-03  Port: mac-mountainlion  Platform: Mac OS X 10.8.4

[Alex Christensen]

(In reply to comment #6)
> Created an attachment (id=207666) [details]
> Archive of layout-test-results from webkit-ews-03 for mac-mountainlion
> 
> The attached test failures were seen while running run-webkit-tests on the mac-ews.
> Bot: webkit-ews-03  Port: mac-mountainlion  Platform: Mac OS X 10.8.4

There's no way this broke anything on Mac.  I'm going to land this manually.

[Alex Christensen]

r153436