Bug 119577 - [Qt] REGRESSION(r153664): ThirdParty Angle build is broken.
Summary: [Qt] REGRESSION(r153664): ThirdParty Angle build is broken.
Status: RESOLVED FIXED
Alias: None
Product: WebKit
Classification: Unclassified
Component: ANGLE (show other bugs)
Version: 528+ (Nightly build)
Hardware: Unspecified Unspecified
: P2 Normal
Assignee: Nobody
URL:
Keywords:
Depends on:
Blocks: 119452
  Show dependency tree / graph
 
Reported: 2013-08-08 09:17 PDT by Zoltan Arvai
Modified: 2013-08-09 06:25 PDT (History)
8 users (show)

See Also:

Attachments
build log (44.55 KB, application/zip)
2013-08-08 09:17 PDT, Zoltan Arvai 		no flags Details
buildfix (1.12 KB, patch)
2013-08-09 05:58 PDT, Zoltan Arvai 		no flags Details | Formatted Diff | Diff
View All Add an attachment (proposed patch, testcase, etc.)

Note You need to log in before you can comment on or make changes to this bug.
Description Zoltan Arvai 2013-08-08 09:17:09 PDT 
Created attachment 208348 [details]
build log

It seems a header file is missing from the update. 
I found a SoftLinking.h file in Source/WebCore/platform/win. Should we use that one?


C:\buildslave\qt-windows-32bit-release\build\Source\ThirdParty\ANGLE\include\GLES2/gl2softlinking.h(25) : fatal error C1083: Cannot open include file: 'SoftLinking.h': No such file or directory
util.cpp

Full build log attached.
Comment 1 Alex Christensen 2013-08-08 10:10:09 PDT 
Don't use SoftLinking.h while building ANGLE.  To get the soft linking to work you need to define ANGLE_WEBKIT_WIN (which I did in translatorCommon.props, libEGLCommon.props, and libGLESv2Common.props in https://trac.webkit.org/changeset/153664) while compiling ANGLE to produce an unaltered dll.  When compiling WebCore with WebGL enabled, do not define ANGLE_WEBKIT_WIN and it will use my soft link headers (eglsoftlinking.h and gl2softlinking.h).

Are you planning to get WebGL working on Qt win?  Let me know if you run into any problems.
Comment 2 Zoltan Arvai 2013-08-09 05:58:48 PDT 
Created attachment 208422 [details]
buildfix

Adding ANGLE_WEBKIT_WIN definition to Target.pri.
Comment 3 Allan Sandfeld Jensen 2013-08-09 06:02:42 PDT 
(In reply to comment #1)
> Don't use SoftLinking.h while building ANGLE.  To get the soft linking to work you need to define ANGLE_WEBKIT_WIN (which I did in translatorCommon.props, libEGLCommon.props, and libGLESv2Common.props in https://trac.webkit.org/changeset/153664) while compiling ANGLE to produce an unaltered dll.  When compiling WebCore with WebGL enabled, do not define ANGLE_WEBKIT_WIN and it will use my soft link headers (eglsoftlinking.h and gl2softlinking.h).
> 
> Are you planning to get WebGL working on Qt win?  Let me know if you run into any problems.

WebGL on Qt has been working for years.
Comment 4 WebKit Commit Bot 2013-08-09 06:25:50 PDT 
Comment on attachment 208422 [details]
buildfix

Clearing flags on attachment: 208422

Committed r153888: <http://trac.webkit.org/changeset/153888>
Comment 5 WebKit Commit Bot 2013-08-09 06:25:52 PDT 
All reviewed patches have been landed.  Closing bug.