Bug 119221

Summary:

Windows ANGLE build needs separate hlsl and glsl projects

Product:

WebKit

Reporter:

Alex Christensen <achristensen>

Component:

ANGLE

Assignee:

Nobody <webkit-unassigned>

Status:

RESOLVED FIXED

Severity:

Normal

CC:

bfulgham, buildbot, commit-queue, dino, kondapallykalyan, rniwa

Priority:

Version:

528+ (Nightly build)

Hardware:

OS:

Windows 7

Attachments:

Description	Flags
Patch	none
Patch	bfulgham: review+, buildbot: commit-queue-
Archive of layout-test-results from webkit-ews-03 for mac-mountainlion	none

Alex Christensen

Reported 2013-07-29 10:24:31 PDT

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.

Attachments
Patch (109.01 KB, patch) 2013-07-29 10:55 PDT, Alex Christensen	no flags	Details Formatted Diff Diff
Patch (108.72 KB, patch) 2013-07-29 11:08 PDT, Alex Christensen	bfulgham: review+ buildbot: commit-queue-	Details Formatted Diff Diff
Archive of layout-test-results from webkit-ews-03 for mac-mountainlion (576.16 KB, application/zip) 2013-07-29 11:45 PDT, Build Bot	no flags	Details
Show Obsolete (1) View All Add attachment proposed patch, testcase, etc.

Alex Christensen

Comment 1 2013-07-29 10:55:24 PDT

Created attachment 207664 [details] Patch

Brent Fulgham

Comment 2 2013-07-29 11:05:51 PDT

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 > +2013-07-26 Alex Christensen <achristensen@apple.com> I don't think you wanted this additional ChangeLog entry.

Alex Christensen

Comment 3 2013-07-29 11:08:21 PDT

Created attachment 207665 [details] Patch

Brent Fulgham

Comment 4 2013-07-29 11:08:56 PDT

Comment on attachment 207665 [details] Patch r=me

Build Bot

Comment 5 2013-07-29 11:45:48 PDT

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

Comment 6 2013-07-29 11:45:50 PDT

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

Comment 7 2013-07-29 11:46:49 PDT

(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

Comment 8 2013-07-29 11:50:50 PDT

r153436

Note You need to log in before you can comment on or make changes to this bug.