WebKit Bugzilla
New
Browse
Log In
×
Sign in with GitHub
or
Remember my login
Create Account
·
Forgot Password
Forgotten password account recovery
RESOLVED FIXED
180177
Update ANGLE
https://bugs.webkit.org/show_bug.cgi?id=180177
Summary
Update ANGLE
Dean Jackson
Reported
2017-11-29 17:25:18 PST
Update ANGLE
Attachments
Patch
(15.66 MB, patch)
2017-11-29 17:44 PST
,
Dean Jackson
no flags
Details
Formatted Diff
Diff
patch
(15.32 MB, patch)
2017-11-29 23:35 PST
,
Alex Christensen
achristensen
: review+
Details
Formatted Diff
Diff
patch
(15.66 MB, patch)
2017-11-30 09:09 PST
,
Alex Christensen
achristensen
: review+
Details
Formatted Diff
Diff
Show Obsolete
(2)
View All
Add attachment
proposed patch, testcase, etc.
Dean Jackson
Comment 1
2017-11-29 17:44:59 PST
Created
attachment 327938
[details]
Patch
EWS Watchlist
Comment 2
2017-11-29 18:04:25 PST
Attachment 327938
[details]
did not pass style-queue: ERROR: Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/multiplyalpha_ftof_pm_rgb_ps.h:1: One or more unexpected \r (^M) found; better to use only a \n [whitespace/carriage_return] [1] ERROR: Suppressing further [whitespace/carriage_return] reports for this file. ERROR: Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/clearsint11ps7.h:1: One or more unexpected \r (^M) found; better to use only a \n [whitespace/carriage_return] [1] ERROR: Suppressing further [whitespace/carriage_return] reports for this file. ERROR: Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/clearfloat11ps4.h:1: One or more unexpected \r (^M) found; better to use only a \n [whitespace/carriage_return] [1] ERROR: Suppressing further [whitespace/carriage_return] reports for this file. ERROR: Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/multiplyalpha_ftof_um_rgb_ps.h:1: One or more unexpected \r (^M) found; better to use only a \n [whitespace/carriage_return] [1] ERROR: Suppressing further [whitespace/carriage_return] reports for this file. ERROR: Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/clearfloat11ps2.h:1: One or more unexpected \r (^M) found; better to use only a \n [whitespace/carriage_return] [1] ERROR: Suppressing further [whitespace/carriage_return] reports for this file. ERROR: Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/clear11multiviewgs.h:1: One or more unexpected \r (^M) found; better to use only a \n [whitespace/carriage_return] [1] ERROR: Suppressing further [whitespace/carriage_return] reports for this file. ERROR: Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d9/shaders/compiled/componentmaskunmultps.h:25: One or more unexpected \r (^M) found; better to use only a \n [whitespace/carriage_return] [1] ERROR: Suppressing further [whitespace/carriage_return] reports for this file. ERROR: Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/clear11vs.h:1: One or more unexpected \r (^M) found; better to use only a \n [whitespace/carriage_return] [1] ERROR: Suppressing further [whitespace/carriage_return] reports for this file. ERROR: Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/clearfloat11ps8.h:1: One or more unexpected \r (^M) found; better to use only a \n [whitespace/carriage_return] [1] ERROR: Suppressing further [whitespace/carriage_return] reports for this file. ERROR: Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/clearfloat11ps6.h:1: One or more unexpected \r (^M) found; better to use only a \n [whitespace/carriage_return] [1] ERROR: Suppressing further [whitespace/carriage_return] reports for this file. ERROR: Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/multiplyalpha_ftof_pm_rgba_ps.h:1: One or more unexpected \r (^M) found; better to use only a \n [whitespace/carriage_return] [1] ERROR: Suppressing further [whitespace/carriage_return] reports for this file. ERROR: Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/clear11multiviewvs.h:1: One or more unexpected \r (^M) found; better to use only a \n [whitespace/carriage_return] [1] ERROR: Suppressing further [whitespace/carriage_return] reports for this file. ERROR: Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/cleardepth11ps.h:1: One or more unexpected \r (^M) found; better to use only a \n [whitespace/carriage_return] [1] ERROR: Suppressing further [whitespace/carriage_return] reports for this file. ERROR: Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/multiplyalpha_ftof_pm_luma_ps.h:1: One or more unexpected \r (^M) found; better to use only a \n [whitespace/carriage_return] [1] ERROR: Suppressing further [whitespace/carriage_return] reports for this file. ERROR: Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/multiplyalpha_ftof_um_lumaalpha_ps.h:1: One or more unexpected \r (^M) found; better to use only a \n [whitespace/carriage_return] [1] ERROR: Suppressing further [whitespace/carriage_return] reports for this file. ERROR: Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/clearuint11ps2.h:1: One or more unexpected \r (^M) found; better to use only a \n [whitespace/carriage_return] [1] ERROR: Suppressing further [whitespace/carriage_return] reports for this file. ERROR: Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/clearfloat11_fl9ps.h:6: One or more unexpected \r (^M) found; better to use only a \n [whitespace/carriage_return] [1] ERROR: Suppressing further [whitespace/carriage_return] reports for this file. ERROR: Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/multiplyalpha_ftof_pm_lumaalpha_ps.h:1: One or more unexpected \r (^M) found; better to use only a \n [whitespace/carriage_return] [1] ERROR: Suppressing further [whitespace/carriage_return] reports for this file. ERROR: Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/clearuint11ps8.h:1: One or more unexpected \r (^M) found; better to use only a \n [whitespace/carriage_return] [1] ERROR: Suppressing further [whitespace/carriage_return] reports for this file. ERROR: Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/clearsint11ps3.h:1: One or more unexpected \r (^M) found; better to use only a \n [whitespace/carriage_return] [1] ERROR: Suppressing further [whitespace/carriage_return] reports for this file. ERROR: Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/clearsint11ps5.h:1: One or more unexpected \r (^M) found; better to use only a \n [whitespace/carriage_return] [1] ERROR: Suppressing further [whitespace/carriage_return] reports for this file. ERROR: Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/clearuint11ps6.h:1: One or more unexpected \r (^M) found; better to use only a \n [whitespace/carriage_return] [1] ERROR: Suppressing further [whitespace/carriage_return] reports for this file. ERROR: Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/multiplyalpha_ftou_pt_rgba_ps.h:1: One or more unexpected \r (^M) found; better to use only a \n [whitespace/carriage_return] [1] ERROR: Suppressing further [whitespace/carriage_return] reports for this file. ERROR: Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/clearsint11ps1.h:1: One or more unexpected \r (^M) found; better to use only a \n [whitespace/carriage_return] [1] ERROR: Suppressing further [whitespace/carriage_return] reports for this file. ERROR: Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/multiplyalpha_ftof_um_luma_ps.h:1: One or more unexpected \r (^M) found; better to use only a \n [whitespace/carriage_return] [1] ERROR: Suppressing further [whitespace/carriage_return] reports for this file. ERROR: Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/clearfloat11ps5.h:1: One or more unexpected \r (^M) found; better to use only a \n [whitespace/carriage_return] [1] ERROR: Suppressing further [whitespace/carriage_return] reports for this file. ERROR: Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/clearfloat11ps7.h:1: One or more unexpected \r (^M) found; better to use only a \n [whitespace/carriage_return] [1] ERROR: Suppressing further [whitespace/carriage_return] reports for this file. ERROR: Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/clearfloat11ps1.h:1: One or more unexpected \r (^M) found; better to use only a \n [whitespace/carriage_return] [1] ERROR: Suppressing further [whitespace/carriage_return] reports for this file. ERROR: Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/multiplyalpha_ftou_um_rgba_ps.h:1: One or more unexpected \r (^M) found; better to use only a \n [whitespace/carriage_return] [1] ERROR: Suppressing further [whitespace/carriage_return] reports for this file. ERROR: Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/clearfloat11ps3.h:1: One or more unexpected \r (^M) found; better to use only a \n [whitespace/carriage_return] [1] ERROR: Suppressing further [whitespace/carriage_return] reports for this file. ERROR: Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/clearsint11ps4.h:1: One or more unexpected \r (^M) found; better to use only a \n [whitespace/carriage_return] [1] ERROR: Suppressing further [whitespace/carriage_return] reports for this file. ERROR: Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/clear11_fl9vs.h:1: One or more unexpected \r (^M) found; better to use only a \n [whitespace/carriage_return] [1] ERROR: Suppressing further [whitespace/carriage_return] reports for this file. ERROR: Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/multiplyalpha_ftof_um_rgba_ps.h:1: One or more unexpected \r (^M) found; better to use only a \n [whitespace/carriage_return] [1] ERROR: Suppressing further [whitespace/carriage_return] reports for this file. ERROR: Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/multiplyalpha_ftou_pm_rgb_ps.h:1: One or more unexpected \r (^M) found; better to use only a \n [whitespace/carriage_return] [1] ERROR: Suppressing further [whitespace/carriage_return] reports for this file. ERROR: Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/multiplyalpha_ftou_pm_rgba_ps.h:1: One or more unexpected \r (^M) found; better to use only a \n [whitespace/carriage_return] [1] ERROR: Suppressing further [whitespace/carriage_return] reports for this file. ERROR: Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/passthroughrgba2dms11ps.h:1: One or more unexpected \r (^M) found; better to use only a \n [whitespace/carriage_return] [1] ERROR: Suppressing further [whitespace/carriage_return] reports for this file. ERROR: Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d9/shaders/compiled/luminanceunmultps.h:25: One or more unexpected \r (^M) found; better to use only a \n [whitespace/carriage_return] [1] ERROR: Suppressing further [whitespace/carriage_return] reports for this file. ERROR: Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d9/shaders/compiled/componentmaskpremultps.h:25: One or more unexpected \r (^M) found; better to use only a \n [whitespace/carriage_return] [1] ERROR: Suppressing further [whitespace/carriage_return] reports for this file. ERROR: Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/clearuint11ps3.h:1: One or more unexpected \r (^M) found; better to use only a \n [whitespace/carriage_return] [1] ERROR: Suppressing further [whitespace/carriage_return] reports for this file. ERROR: Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/clearuint11ps7.h:1: One or more unexpected \r (^M) found; better to use only a \n [whitespace/carriage_return] [1] ERROR: Suppressing further [whitespace/carriage_return] reports for this file. ERROR: Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/clearuint11ps1.h:1: One or more unexpected \r (^M) found; better to use only a \n [whitespace/carriage_return] [1] ERROR: Suppressing further [whitespace/carriage_return] reports for this file. ERROR: Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/passthrougha2d11ps.h:1: One or more unexpected \r (^M) found; better to use only a \n [whitespace/carriage_return] [1] ERROR: Suppressing further [whitespace/carriage_return] reports for this file. ERROR: Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/clearuint11ps4.h:1: One or more unexpected \r (^M) found; better to use only a \n [whitespace/carriage_return] [1] ERROR: Suppressing further [whitespace/carriage_return] reports for this file. ERROR: Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/clearuint11ps5.h:1: One or more unexpected \r (^M) found; better to use only a \n [whitespace/carriage_return] [1] ERROR: Suppressing further [whitespace/carriage_return] reports for this file. ERROR: Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/clearsint11ps2.h:1: One or more unexpected \r (^M) found; better to use only a \n [whitespace/carriage_return] [1] ERROR: Suppressing further [whitespace/carriage_return] reports for this file. ERROR: Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/multiplyalpha_ftou_um_rgb_ps.h:1: One or more unexpected \r (^M) found; better to use only a \n [whitespace/carriage_return] [1] ERROR: Suppressing further [whitespace/carriage_return] reports for this file. ERROR: Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/clearsint11ps6.h:1: One or more unexpected \r (^M) found; better to use only a \n [whitespace/carriage_return] [1] ERROR: Suppressing further [whitespace/carriage_return] reports for this file. ERROR: Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/multiplyalpha_ftou_pt_rgb_ps.h:1: One or more unexpected \r (^M) found; better to use only a \n [whitespace/carriage_return] [1] ERROR: Suppressing further [whitespace/carriage_return] reports for this file. ERROR: Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/clearsint11ps8.h:1: One or more unexpected \r (^M) found; better to use only a \n [whitespace/carriage_return] [1] ERROR: Suppressing further [whitespace/carriage_return] reports for this file. ERROR: Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d9/shaders/compiled/luminancepremultps.h:25: One or more unexpected \r (^M) found; better to use only a \n [whitespace/carriage_return] [1] ERROR: Suppressing further [whitespace/carriage_return] reports for this file. Total errors found: 4594 in 1168 files If any of these errors are false positives, please file a bug against check-webkit-style.
Alex Christensen
Comment 3
2017-11-29 22:45:27 PST
In WebCore you changed calls from sh::ShaderVariable::elementCount to sh::ShaderVariable::getBasicTypeElementCount which asserts. Based on reading of the old definition of sh::ShaderVariable::elementCount and the current arraySizes, I replaced it instead with std::max(1u, variable.arraySizes.back()) and it works without asserting. Now to look into iOS-sim...
Alex Christensen
Comment 4
2017-11-29 23:35:43 PST
Created
attachment 327958
[details]
patch
Alex Christensen
Comment 5
2017-11-30 09:09:09 PST
Created
attachment 327979
[details]
patch
EWS Watchlist
Comment 6
2017-11-30 09:40:00 PST
Attachment 327979
[details]
did not pass style-queue: ERROR: Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/multiplyalpha_ftof_pm_rgb_ps.h:1: One or more unexpected \r (^M) found; better to use only a \n [whitespace/carriage_return] [1] ERROR: Suppressing further [whitespace/carriage_return] reports for this file. ERROR: Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/clearsint11ps7.h:1: One or more unexpected \r (^M) found; better to use only a \n [whitespace/carriage_return] [1] ERROR: Suppressing further [whitespace/carriage_return] reports for this file. ERROR: Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/clearfloat11ps4.h:1: One or more unexpected \r (^M) found; better to use only a \n [whitespace/carriage_return] [1] ERROR: Suppressing further [whitespace/carriage_return] reports for this file. ERROR: Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/multiplyalpha_ftof_um_rgb_ps.h:1: One or more unexpected \r (^M) found; better to use only a \n [whitespace/carriage_return] [1] ERROR: Suppressing further [whitespace/carriage_return] reports for this file. ERROR: Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/clearfloat11ps2.h:1: One or more unexpected \r (^M) found; better to use only a \n [whitespace/carriage_return] [1] ERROR: Suppressing further [whitespace/carriage_return] reports for this file. ERROR: Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/clear11multiviewgs.h:1: One or more unexpected \r (^M) found; better to use only a \n [whitespace/carriage_return] [1] ERROR: Suppressing further [whitespace/carriage_return] reports for this file. ERROR: Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d9/shaders/compiled/componentmaskunmultps.h:25: One or more unexpected \r (^M) found; better to use only a \n [whitespace/carriage_return] [1] ERROR: Suppressing further [whitespace/carriage_return] reports for this file. ERROR: Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/clear11vs.h:1: One or more unexpected \r (^M) found; better to use only a \n [whitespace/carriage_return] [1] ERROR: Suppressing further [whitespace/carriage_return] reports for this file. ERROR: Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/clearfloat11ps8.h:1: One or more unexpected \r (^M) found; better to use only a \n [whitespace/carriage_return] [1] ERROR: Suppressing further [whitespace/carriage_return] reports for this file. ERROR: Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/clearfloat11ps6.h:1: One or more unexpected \r (^M) found; better to use only a \n [whitespace/carriage_return] [1] ERROR: Suppressing further [whitespace/carriage_return] reports for this file. ERROR: Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/multiplyalpha_ftof_pm_rgba_ps.h:1: One or more unexpected \r (^M) found; better to use only a \n [whitespace/carriage_return] [1] ERROR: Suppressing further [whitespace/carriage_return] reports for this file. ERROR: Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/clear11multiviewvs.h:1: One or more unexpected \r (^M) found; better to use only a \n [whitespace/carriage_return] [1] ERROR: Suppressing further [whitespace/carriage_return] reports for this file. ERROR: Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/cleardepth11ps.h:1: One or more unexpected \r (^M) found; better to use only a \n [whitespace/carriage_return] [1] ERROR: Suppressing further [whitespace/carriage_return] reports for this file. ERROR: Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/multiplyalpha_ftof_pm_luma_ps.h:1: One or more unexpected \r (^M) found; better to use only a \n [whitespace/carriage_return] [1] ERROR: Suppressing further [whitespace/carriage_return] reports for this file. ERROR: Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/multiplyalpha_ftof_um_lumaalpha_ps.h:1: One or more unexpected \r (^M) found; better to use only a \n [whitespace/carriage_return] [1] ERROR: Suppressing further [whitespace/carriage_return] reports for this file. ERROR: Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/clearuint11ps2.h:1: One or more unexpected \r (^M) found; better to use only a \n [whitespace/carriage_return] [1] ERROR: Suppressing further [whitespace/carriage_return] reports for this file. ERROR: Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/clearfloat11_fl9ps.h:6: One or more unexpected \r (^M) found; better to use only a \n [whitespace/carriage_return] [1] ERROR: Suppressing further [whitespace/carriage_return] reports for this file. ERROR: Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/multiplyalpha_ftof_pm_lumaalpha_ps.h:1: One or more unexpected \r (^M) found; better to use only a \n [whitespace/carriage_return] [1] ERROR: Suppressing further [whitespace/carriage_return] reports for this file. ERROR: Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/clearuint11ps8.h:1: One or more unexpected \r (^M) found; better to use only a \n [whitespace/carriage_return] [1] ERROR: Suppressing further [whitespace/carriage_return] reports for this file. ERROR: Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/clearsint11ps3.h:1: One or more unexpected \r (^M) found; better to use only a \n [whitespace/carriage_return] [1] ERROR: Suppressing further [whitespace/carriage_return] reports for this file. ERROR: Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/clearsint11ps5.h:1: One or more unexpected \r (^M) found; better to use only a \n [whitespace/carriage_return] [1] ERROR: Suppressing further [whitespace/carriage_return] reports for this file. ERROR: Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/clearuint11ps6.h:1: One or more unexpected \r (^M) found; better to use only a \n [whitespace/carriage_return] [1] ERROR: Suppressing further [whitespace/carriage_return] reports for this file. ERROR: Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/multiplyalpha_ftou_pt_rgba_ps.h:1: One or more unexpected \r (^M) found; better to use only a \n [whitespace/carriage_return] [1] ERROR: Suppressing further [whitespace/carriage_return] reports for this file. ERROR: Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/clearsint11ps1.h:1: One or more unexpected \r (^M) found; better to use only a \n [whitespace/carriage_return] [1] ERROR: Suppressing further [whitespace/carriage_return] reports for this file. ERROR: Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/multiplyalpha_ftof_um_luma_ps.h:1: One or more unexpected \r (^M) found; better to use only a \n [whitespace/carriage_return] [1] ERROR: Suppressing further [whitespace/carriage_return] reports for this file. ERROR: Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/clearfloat11ps5.h:1: One or more unexpected \r (^M) found; better to use only a \n [whitespace/carriage_return] [1] ERROR: Suppressing further [whitespace/carriage_return] reports for this file. ERROR: Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/clearfloat11ps7.h:1: One or more unexpected \r (^M) found; better to use only a \n [whitespace/carriage_return] [1] ERROR: Suppressing further [whitespace/carriage_return] reports for this file. ERROR: Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/clearfloat11ps1.h:1: One or more unexpected \r (^M) found; better to use only a \n [whitespace/carriage_return] [1] ERROR: Suppressing further [whitespace/carriage_return] reports for this file. ERROR: Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/multiplyalpha_ftou_um_rgba_ps.h:1: One or more unexpected \r (^M) found; better to use only a \n [whitespace/carriage_return] [1] ERROR: Suppressing further [whitespace/carriage_return] reports for this file. ERROR: Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/clearfloat11ps3.h:1: One or more unexpected \r (^M) found; better to use only a \n [whitespace/carriage_return] [1] ERROR: Suppressing further [whitespace/carriage_return] reports for this file. ERROR: Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/clearsint11ps4.h:1: One or more unexpected \r (^M) found; better to use only a \n [whitespace/carriage_return] [1] ERROR: Suppressing further [whitespace/carriage_return] reports for this file. ERROR: Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/clear11_fl9vs.h:1: One or more unexpected \r (^M) found; better to use only a \n [whitespace/carriage_return] [1] ERROR: Suppressing further [whitespace/carriage_return] reports for this file. ERROR: Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/multiplyalpha_ftof_um_rgba_ps.h:1: One or more unexpected \r (^M) found; better to use only a \n [whitespace/carriage_return] [1] ERROR: Suppressing further [whitespace/carriage_return] reports for this file. ERROR: Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/multiplyalpha_ftou_pm_rgb_ps.h:1: One or more unexpected \r (^M) found; better to use only a \n [whitespace/carriage_return] [1] ERROR: Suppressing further [whitespace/carriage_return] reports for this file. ERROR: Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/multiplyalpha_ftou_pm_rgba_ps.h:1: One or more unexpected \r (^M) found; better to use only a \n [whitespace/carriage_return] [1] ERROR: Suppressing further [whitespace/carriage_return] reports for this file. ERROR: Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/passthroughrgba2dms11ps.h:1: One or more unexpected \r (^M) found; better to use only a \n [whitespace/carriage_return] [1] ERROR: Suppressing further [whitespace/carriage_return] reports for this file. ERROR: Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d9/shaders/compiled/luminanceunmultps.h:25: One or more unexpected \r (^M) found; better to use only a \n [whitespace/carriage_return] [1] ERROR: Suppressing further [whitespace/carriage_return] reports for this file. ERROR: Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d9/shaders/compiled/componentmaskpremultps.h:25: One or more unexpected \r (^M) found; better to use only a \n [whitespace/carriage_return] [1] ERROR: Suppressing further [whitespace/carriage_return] reports for this file. ERROR: Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/clearuint11ps3.h:1: One or more unexpected \r (^M) found; better to use only a \n [whitespace/carriage_return] [1] ERROR: Suppressing further [whitespace/carriage_return] reports for this file. ERROR: Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/clearuint11ps7.h:1: One or more unexpected \r (^M) found; better to use only a \n [whitespace/carriage_return] [1] ERROR: Suppressing further [whitespace/carriage_return] reports for this file. ERROR: Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/clearuint11ps1.h:1: One or more unexpected \r (^M) found; better to use only a \n [whitespace/carriage_return] [1] ERROR: Suppressing further [whitespace/carriage_return] reports for this file. ERROR: Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/passthrougha2d11ps.h:1: One or more unexpected \r (^M) found; better to use only a \n [whitespace/carriage_return] [1] ERROR: Suppressing further [whitespace/carriage_return] reports for this file. ERROR: Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/clearuint11ps4.h:1: One or more unexpected \r (^M) found; better to use only a \n [whitespace/carriage_return] [1] ERROR: Suppressing further [whitespace/carriage_return] reports for this file. ERROR: Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/clearuint11ps5.h:1: One or more unexpected \r (^M) found; better to use only a \n [whitespace/carriage_return] [1] ERROR: Suppressing further [whitespace/carriage_return] reports for this file. ERROR: Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/clearsint11ps2.h:1: One or more unexpected \r (^M) found; better to use only a \n [whitespace/carriage_return] [1] ERROR: Suppressing further [whitespace/carriage_return] reports for this file. ERROR: Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/multiplyalpha_ftou_um_rgb_ps.h:1: One or more unexpected \r (^M) found; better to use only a \n [whitespace/carriage_return] [1] ERROR: Suppressing further [whitespace/carriage_return] reports for this file. ERROR: Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/clearsint11ps6.h:1: One or more unexpected \r (^M) found; better to use only a \n [whitespace/carriage_return] [1] ERROR: Suppressing further [whitespace/carriage_return] reports for this file. ERROR: Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/multiplyalpha_ftou_pt_rgb_ps.h:1: One or more unexpected \r (^M) found; better to use only a \n [whitespace/carriage_return] [1] ERROR: Suppressing further [whitespace/carriage_return] reports for this file. ERROR: Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/clearsint11ps8.h:1: One or more unexpected \r (^M) found; better to use only a \n [whitespace/carriage_return] [1] ERROR: Suppressing further [whitespace/carriage_return] reports for this file. ERROR: Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d9/shaders/compiled/luminancepremultps.h:25: One or more unexpected \r (^M) found; better to use only a \n [whitespace/carriage_return] [1] ERROR: Suppressing further [whitespace/carriage_return] reports for this file. Total errors found: 4594 in 1168 files If any of these errors are false positives, please file a bug against check-webkit-style.
Radar WebKit Bug Importer
Comment 7
2017-11-30 09:54:07 PST
<
rdar://problem/35774734
>
Dean Jackson
Comment 8
2017-11-30 12:46:02 PST
Committed
r225340
: <
https://trac.webkit.org/changeset/225340
>
Ryan Haddad
Comment 9
2017-11-30 14:34:36 PST
I understand that this change is massive, but I don't think it is right to skip the broken tests on iOS (
https://trac.webkit.org/changeset/225350/webkit
), especially since EWS caught these failures before the patch was landed.
Matt Lewis
Comment 10
2017-11-30 14:47:53 PST
Broken build:
https://build.webkit.org/results/Apple%20iOS%2011%20Simulator%20Release%20WK2%20(Tests)/r225342%20(1621)/results.html
https://build.webkit.org/builders/Apple%20iOS%2011%20Simulator%20Release%20WK2%20%28Tests%29/builds/1621
Matt Lewis
Comment 11
2017-11-30 14:48:52 PST
(In reply to Matt Lewis from
comment #10
)
> Broken build: > >
https://build.webkit.org/results/
> Apple%20iOS%2011%20Simulator%20Release%20WK2%20(Tests)/r225342%20(1621)/ > results.html >
https://build.webkit.org/builders/
> Apple%20iOS%2011%20Simulator%20Release%20WK2%20%28Tests%29/builds/1621
correction: tester builds with many broken layout test due to the patch.
Matt Lewis
Comment 12
2017-11-30 15:05:42 PST
The failing tests that Ryan is referring to being skipped were skipped in this revision:
https://trac.webkit.org/changeset/225350/webkit
Fujii Hironori
Comment 13
2017-11-30 17:41:10 PST
I'm going to fix WinCairo builds in
Bug 180230
.
Michael Catanzaro
Comment 14
2017-12-01 12:17:25 PST
This changed the definitions of EGLNativeDisplayType, EGLNativeWindowType, and EGLNativePixmapType for the WPE port. I don't know if that's right or not, but I suspect it was not intended. Also, I see changes.diff was not updated! It should be kept up-to-date or else removed. I'm going to commit couple compiler warning fixups without touching changes.diff, since it is already outdated.
Michael Catanzaro
Comment 15
2017-12-01 12:25:12 PST
Committed
r225404
: <
https://trac.webkit.org/changeset/225404
>
Michael Catanzaro
Comment 16
2017-12-01 14:09:23 PST
Committed
r225412
: <
https://trac.webkit.org/changeset/225412
>
Michael Catanzaro
Comment 17
2017-12-01 14:10:08 PST
(In reply to Michael Catanzaro from
comment #14
)
> This changed the definitions of EGLNativeDisplayType, EGLNativeWindowType, > and EGLNativePixmapType for the WPE port. I don't know if that's right or > not, but I suspect it was not intended.
I'm not going to do anything about this, because I suspect the original definitions for WPE were probably not right. Don't know.
Michael Catanzaro
Comment 18
2017-12-01 14:19:14 PST
(In reply to Michael Catanzaro from
comment #16
)
> Committed
r225412
: <
https://trac.webkit.org/changeset/225412
>
Upstream PR:
https://github.com/aappleby/smhasher/pull/50
Regarding all our downstream Clang pragmas. It's starting to get pretty messy. You might want to just turn off these warnings when building ANGLE. It's not our code, after all, and it seems futile to try to enable warnings that upstream obviously does not care about.
Ryan Haddad
Comment 19
2017-12-01 14:56:35 PST
(In reply to Michael Catanzaro from
comment #16
)
> Committed
r225412
: <
https://trac.webkit.org/changeset/225412
>
This change broke 32-bit macOS builds:
https://build.webkit.org/builders/Apple%20High%20Sierra%20Release%20%2832-bit%20Build%29/builds/1944
Ryan Haddad
Comment 20
2017-12-01 15:13:53 PST
Reverted
r225412
for reason: Breaks 32-bit macOS builds. Committed
r225419
: <
https://trac.webkit.org/changeset/225419
>
Michael Catanzaro
Comment 21
2017-12-01 17:05:10 PST
Committed
r225436
: <
https://trac.webkit.org/changeset/225436
>
Michael Catanzaro
Comment 22
2017-12-01 17:07:14 PST
Thanks Ryan... I think I've done it right this time. I'll keep an eye on the bots.
Dean Jackson
Comment 23
2017-12-01 17:22:00 PST
I agree that we should just turn off these warnings. It's painful to have to merge ANGLE and add code at each instance.
Don Olmstead
Comment 24
2017-12-02 13:36:46 PST
(In reply to Michael Catanzaro from
comment #14
)
> This changed the definitions of EGLNativeDisplayType, EGLNativeWindowType, > and EGLNativePixmapType for the WPE port. I don't know if that's right or > not, but I suspect it was not intended. > > Also, I see changes.diff was not updated! It should be kept up-to-date or > else removed. > > I'm going to commit couple compiler warning fixups without touching > changes.diff, since it is already outdated.
Yes can we please get a changes.diff as well? We actually forked ANGLE into our Github org,
https://github.com/WebKitForWindows/angle
, and we're trying to figure out a better way to keep pace with upstream ANGLE. Having the changes.diff would be really great to have. That way we could potentially rebase ANGLE on a regular basis and land it in WebKit. Hopefully if we update ANGLE at a regular cadence we won't break as much.
Dean Jackson
Comment 25
2017-12-03 18:27:52 PST
My bad for not updating changes.diff. There were many fewer changes needed this time, but probably only because I was testing on macOS and iOS. It seems the other ports need a lot more. In general I really wish we didn't have to make any changes, because it makes updating ANGLE a pain (more of a pain, it's already annoying). The majority are about compiler warnings, which we should just turn off, or fix upstream.
Michael Catanzaro
Comment 26
2017-12-04 05:17:12 PST
I don't know how to suppress warnings in the XCode build, but if you do so, here is how to make the corresponding change in CMake: if (COMPILER_IS_GCC_OR_CLANG) WEBKIT_ADD_TARGET_CXX_FLAGS(libEGL -Wno-cast-align -Wno-exit-time-destructors) WEBKIT_ADD_TARGET_CXX_FLAGS(libGLESv2 -Wno-cast-align -Wno-exit-time-destructors) WEBKIT_ADD_TARGET_CXX_FLAGS(libANGLE -Wno-cast-align -Wno-exit-time-destructors) endif ()
Michael Catanzaro
Comment 27
2017-12-04 05:18:02 PST
(in Source/ThirdParty/ANGLE/CMakeLists.txt. The ideal place would be at the bottom of the file, right after the libraries are declared and before all the forwarding headers goo.)
Michael Catanzaro
Comment 28
2017-12-04 06:27:23 PST
(In reply to Michael Catanzaro from
comment #17
)
> (In reply to Michael Catanzaro from
comment #14
) > > This changed the definitions of EGLNativeDisplayType, EGLNativeWindowType, > > and EGLNativePixmapType for the WPE port. I don't know if that's right or > > not, but I suspect it was not intended. > > I'm not going to do anything about this, because I suspect the original > definitions for WPE were probably not right. Don't know.
Zan says: "the ANGLE ifdef shouldn't be required since we're not using ANGLE EGL headers anymore" so there's no problem here.
Note
You need to
log in
before you can comment on or make changes to this bug.
Top of Page
Format For Printing
XML
Clone This Bug