Commits · 9674850737bd3e7f44fdc9d1ddc42fffd76f2997 · Chen Yisong / angle

15 May, 2015 7 commits

Clear image descs on Impl errors. · 96748507

authored May 11, 2015

This is a speculative fix for a possible crash, when we could get
out-of-sync between the Impl and the GL state.

BUG=485543

Change-Id: Id26475f1aae7da05b5ffd802c4a7600e21b40315
Reviewed-on: https://chromium-review.googlesource.com/270194Reviewed-by: Geoff Lang <geofflang@chromium.org>
Tested-by: Jamie Madill <jmadill@chromium.org>

96748507

Add -lrt and -ldl to link flags on Linux builds · 4b6945a4

authored May 14, 2015

BUG=angleproject:892

Change-Id: Ic06b493cbfdc061565d94d98aabfc3b1f2d882c6
Reviewed-on: https://chromium-review.googlesource.com/271275Reviewed-by: Jamie Madill <jmadill@chromium.org>
Reviewed-by: Geoff Lang <geofflang@chromium.org>
Tested-by: Corentin Wallez <cwallez@chromium.org>

4b6945a4

translator: Reject shaders that use both FragColor+FragData. · 14e95b38

authored May 07, 2015

*re-land with fix for unused var in release*

We checked this at link time in the D3D back-end, but this
restriction applies to all shaders.

TEST=dEQP-GLES2.functional.shaders.fragdata.*
BUG=angleproject:995
BUG=478572

Change-Id: I63258f4de47e658812822f31601cc235f48c0826
Reviewed-on: https://chromium-review.googlesource.com/271470Tested-by: Jamie Madill <jmadill@chromium.org>
Reviewed-by: Olli Etuaho <oetuaho@nvidia.com>
Reviewed-by: Geoff Lang <geofflang@chromium.org>

14e95b38

Unfold sequence operator when operations inside need unfolding · 0ea959f4

authored May 13, 2015

Unfolding the sequence operator ensures correct evaluation order when parts of
the expression need to get hoisted out of the expression to the surrounding
scope.

BUG=angleproject:1001
TEST=WebGL conformance tests

Change-Id: Ifd3093c9fb63d3e9842ebb4b9531b2f46875ad8a
Reviewed-on: https://chromium-review.googlesource.com/270660Tested-by: Olli Etuaho <oetuaho@nvidia.com>
Reviewed-by: Jamie Madill <jmadill@chromium.org>

0ea959f4

Defer executing if statements in the global scope · d81ed841

authored May 12, 2015

Unfolding of short-circuiting operators (ternary and logical operators) may
create if statements in the global scope, which is not valid HLSL. Use existing
deferred global initialization function to defer execution of if statements in
the global scope.

TEST=WebGL conformance tests
BUG=angleproject:819

Change-Id: I2b0afcc6824dab6bb87eb6abed609e75b1384dab
Reviewed-on: https://chromium-review.googlesource.com/270461Reviewed-by: Jamie Madill <jmadill@chromium.org>
Tested-by: Olli Etuaho <oetuaho@nvidia.com>

d81ed841

Make UnfoldShortCircuit to change AST instead of writing output · a6f22096

authored May 08, 2015

This is needed to make way for further AST transformations to handle array
expressions that need to work correctly together with unfolding short-
circuiting operators. This also improves the maintainability of HLSL output
by isolating the unfolding into a separate compilation step.

The new version of UnfoldShortCircuit traverser will traverse the tree until
an expression that needs to be unfolded is encountered. It then unfolds it and
gets reset. The traverser will be run repeatedly until no more operations to
unfold are found. This helps with keeping the traverser's design relatively
simple.

All declarations are separated to single declarations before short-circuit
unfolding is run. Previously OutputHLSL already output every declaration
separately.

BUG=angleproject:960
TEST=WebGL conformance tests, angle_unittests, angle_end2end_tests

Change-Id: Id769be396adbd4c0223e418980dc464dd855f019
Reviewed-on: https://chromium-review.googlesource.com/270460Tested-by: Olli Etuaho <oetuaho@nvidia.com>
Reviewed-by: Jamie Madill <jmadill@chromium.org>

a6f22096

Revert "translator: Reject shaders that use both FragColor+FragData." · 531e3d22

authored May 15, 2015

The change introduced a warning in Windows release build.

This reverts commit b8e3a568.

Change-Id: I77bbc35876043c9a164aa2665965f5189ee90052
Reviewed-on: https://chromium-review.googlesource.com/271430Reviewed-by: Olli Etuaho <oetuaho@nvidia.com>
Tested-by: Olli Etuaho <oetuaho@nvidia.com>

531e3d22

14 May, 2015 14 commits

Fix "unused private variable" warning in ParseContext · e8675195

authored May 14, 2015

BUG=angleproject:892

Change-Id: I3d0c23f1c2d43477c8b4ff28a6db470b3491de0b
Reviewed-on: https://chromium-review.googlesource.com/271276Reviewed-by: Jamie Madill <jmadill@chromium.org>
Tested-by: Corentin Wallez <cwallez@chromium.org>

e8675195

Make X11Window::setVisible block until the window is mapped. · 3730f644

authored May 14, 2015

That way the code calling setVisible knows it can safely create a
framebuffer for this window without having its content be undefined.

BUG=angleproject:830

Change-Id: Ia694f50ac20e1d510d0c0f899226ed241d9a5a3a
Reviewed-on: https://chromium-review.googlesource.com/271156Reviewed-by: Kenneth Russell <kbr@chromium.org>
Reviewed-by: Jamie Madill <jmadill@chromium.org>
Tested-by: Corentin Wallez <cwallez@chromium.org>

3730f644

FunctionsGLX: add support for glXWaitX/GL · d64a38b3

authored May 14, 2015

The functions are not used in the code but are useful during development
to try to see where race condition with the X server are.

BUG=angleproject:892

Change-Id: Ie1267e46ac251bd9ac62e2a146db68ad84644fb8
Reviewed-on: https://chromium-review.googlesource.com/271177Reviewed-by: Geoff Lang <geofflang@chromium.org>
Reviewed-by: Jamie Madill <jmadill@chromium.org>
Tested-by: Corentin Wallez <cwallez@chromium.org>

d64a38b3

FunctionsGLX: make most functions take the display implicitly · 582173d9

authored May 13, 2015

In later CLs FunctionsGLX will need to store the X display so we take
advantage of it to reduce the verbosity of the other GLX files slightly.

BUG=angleproject:892

Change-Id: I42ea00d0a37055e5e0752a860978b8ef5afb7a0b
Reviewed-on: https://chromium-review.googlesource.com/271163Reviewed-by: Jamie Madill <jmadill@chromium.org>
Tested-by: Corentin Wallez <cwallez@chromium.org>

582173d9

translator: Reject shaders that use both FragColor+FragData. · b8e3a568

authored May 07, 2015

We checked this at link time in the D3D back-end, but this
restriction applies to all shaders.

TEST=dEQP-GLES2.functional.shaders.fragdata.*
BUG=angleproject:995
BUG=478572

Change-Id: I99111cc6aa05b9352693f9c3b5bc70d56c9842d4
Reviewed-on: https://chromium-review.googlesource.com/269846Reviewed-by: Zhenyao Mo <zmo@chromium.org>
Tested-by: Jamie Madill <jmadill@chromium.org>

b8e3a568

Make TParseContext a class, with private data. · 6e06b1f4

authored May 14, 2015

*re-land with build fix*

BUG=angleproject:995

Change-Id: I67d3ded8f6c705b54fb372857e07ce1a86b58475
Reviewed-on: https://chromium-review.googlesource.com/271162Tested-by: Jamie Madill <jmadill@chromium.org>
Reviewed-by: Zhenyao Mo <zmo@chromium.org>

6e06b1f4

Use a sparse histogram for D3D11CreateDevice errors. · 558d5eb4

authored May 14, 2015

This avoid us needing to capture an enum value for every possible
error code. Leave the existing enum values in for now.

BUG=477701

Change-Id: Iccaa4d9b732fe4d56432e17578421cba11bcf9ce
Reviewed-on: https://chromium-review.googlesource.com/271159Tested-by: Jamie Madill <jmadill@chromium.org>
Reviewed-by: Brandon Jones <bajones@chromium.org>
Reviewed-by: Geoff Lang <geofflang@chromium.org>

558d5eb4

Add collection of D3D11 and DXGI stats. · 72537ef1

authored May 14, 2015

Will require a chromium-side patch to enable boolean histograms.

BUG=angleproject:966
BUG=436191

Change-Id: I3026c73894fbbff521503b377955816a8e831df8
Reviewed-on: https://chromium-review.googlesource.com/271174Tested-by: Jamie Madill <jmadill@chromium.org>
Reviewed-by: Brandon Jones <bajones@chromium.org>
Reviewed-by: Geoff Lang <geofflang@chromium.org>

72537ef1

Fix typo in a comment in PbufferTest · 21ce9b02

authored May 14, 2015

BUG=angleproject:892

Change-Id: I8383b0b061f613ee3592c3d7cd41135164223604
Reviewed-on: https://chromium-review.googlesource.com/271158Reviewed-by: Jamie Madill <jmadill@chromium.org>
Tested-by: Corentin Wallez <cwallez@chromium.org>

21ce9b02

Move ANGLETest back in test_utils, leaving a proxy header for Chromium · d3970de4

authored May 14, 2015

BUG=angleproject:892

Change-Id: Ibd494813be87e996096077d6e208cc92461b8f49
Reviewed-on: https://chromium-review.googlesource.com/271154Reviewed-by: Jamie Madill <jmadill@chromium.org>
Tested-by: Corentin Wallez <cwallez@chromium.org>

d3970de4

EGLWindow: remove redundant EGL_NONE to finish attrib list. · 1f67547b

authored May 14, 2015

Only one EGL_NONE is needed to signal the end of the list.

BUG=angleproject:892

Change-Id: I7de349bef9d674344ccd1b2c4801d8b42c801299
Reviewed-on: https://chromium-review.googlesource.com/271157Reviewed-by: Jamie Madill <jmadill@chromium.org>
Tested-by: Corentin Wallez <cwallez@chromium.org>

1f67547b

Revert "Add more D3D11 init errors to stats collection." · e897cecf

authored May 14, 2015

Going to rework this in favor of a sparse histogram.

BUG=477701

This reverts commit c5146c76.

Change-Id: I88ba7b461a1de04324a6ebe164037ea9081f2239
Reviewed-on: https://chromium-review.googlesource.com/271155Reviewed-by: Jamie Madill <jmadill@chromium.org>
Tested-by: Jamie Madill <jmadill@chromium.org>

e897cecf

Revert "Revert "Make EGLQueryContextTest use ANGLE_INSTANTIATE_TEST"" · 9e7db227

authored May 11, 2015

The original commit was not the one causing the problem it was reverted
for.

This reverts commit c4738880.

BUG=angleproject:892

Change-Id: I8dee28545c3895750247635a63b73ecec4ba449c
Reviewed-on: https://chromium-review.googlesource.com/270262Reviewed-by: Geoff Lang <geofflang@chromium.org>
Tested-by: Corentin Wallez <cwallez@chromium.org>
Reviewed-on: https://chromium-review.googlesource.com/270473Reviewed-by: Jamie Madill <jmadill@chromium.org>
Reviewed-by: Corentin Wallez <cwallez@chromium.org>

9e7db227

Compile the GLX EGL implementation in BUILD.gn · 47fc1fec

authored May 14, 2015

BUG=angleproject:892

Change-Id: Ifebcadab4fc4ad9fd93b9cf21b3ebdd2f4d6cfc1
Reviewed-on: https://chromium-review.googlesource.com/271164Reviewed-by: Jamie Madill <jmadill@chromium.org>
Reviewed-by: Geoff Lang <geofflang@chromium.org>
Tested-by: Corentin Wallez <cwallez@chromium.org>

47fc1fec

13 May, 2015 11 commits

Add plumbing for D3D11 device caps · ba8a0bf8

authored May 13, 2015

BUG=angleproject:1002

Change-Id: Id24783c75377ea92a73a43f2605693e07f63dc15
Reviewed-on: https://chromium-review.googlesource.com/270545Reviewed-by: Geoff Lang <geofflang@chromium.org>
Reviewed-by: Jamie Madill <jmadill@chromium.org>
Tested-by: Austin Kinross <aukinros@microsoft.com>

ba8a0bf8

Revert "Make TParseContext a class, with private data." · 749fe340

authored May 13, 2015

Causing build errors on Linux:

FAILED: ninja -t msvc -e environment.x86 -- C:\b\build\goma/gomacc "C:\b\depot_tools\win_toolchain\vs2013_files\VC\bin\amd64_x86\cl.exe" /nologo /showIncludes /FC @obj\third_party\angle\src\compiler\translator\translator_lib.ParseContext.obj.rsp /c ..\..\third_party\angle\src\compiler\translator\ParseContext.cpp /Foobj\third_party\angle\src\compiler\translator\translator_lib.ParseContext.obj /Fdobj\third_party\angle\src\translator_lib.cc.pdb
c:\b\build\slave\gpu_win_builder__dbg_\build\src\third_party\angle\src\compiler\translator\validateglobalinitializer.h(11) : error C2220: warning treated as error - no 'object' file generated
c:\b\build\slave\gpu_win_builder__dbg_\build\src\third_party\angle\src\compiler\translator\validateglobalinitializer.h(11) : warning C4099: 'TParseContext' : type name first seen using 'class' now seen using 'struct'
c:\b\build\slave\gpu_win_builder__dbg_\build\src\third_party\angle\src\compiler\translator\parsecontext.h(28) : see declaration of 'TParseContext'

BUG=angleproject:995

This reverts commit 6c0c2987.

Change-Id: I49a8b7df9bc8b7c4892bf3af5e2c7a6444fba890
Reviewed-on: https://chromium-review.googlesource.com/270767Reviewed-by: Jamie Madill <jmadill@chromium.org>
Tested-by: Jamie Madill <jmadill@chromium.org>

749fe340

Make TParseContext a class, with private data. · 6c0c2987

authored May 13, 2015

BUG=angleproject:995

Change-Id: Ie077e3a4f0fd5ef840aa35edeb41d15a98b7c0ff
Reviewed-on: https://chromium-review.googlesource.com/270628Reviewed-by: Zhenyao Mo <zmo@chromium.org>
Tested-by: Jamie Madill <jmadill@chromium.org>

6c0c2987

Refactor style in ParseContext.h. · 06145236

authored May 13, 2015

BUG=angleproject:995

Change-Id: I893785a068d0d5cf4afc18123896bf540e53a3e0
Reviewed-on: https://chromium-review.googlesource.com/270627Reviewed-by: Zhenyao Mo <zmo@chromium.org>
Tested-by: Jamie Madill <jmadill@chromium.org>

06145236

Revert "Add constant folding support for min,max and clamp" · 95d34aaf

authored May 13, 2015

This reverts commit 1137a2a6.

Change-Id: I1493c2706e5f08a9f0001835e663a147be85a303
Reviewed-on: https://chromium-review.googlesource.com/270782Reviewed-by: Geoff Lang <geofflang@chromium.org>
Tested-by: Geoff Lang <geofflang@chromium.org>

95d34aaf

Fix crash in IndexDataManagerPerfTest. · 71632d0c

authored May 12, 2015

Since the gl::Buffer doesn't know about its data, the index range needs to
be computed on the raw indices instead of through the buffer.

Change-Id: I3f53822033a1a25bf5fae9132ee2ceb312eaa283
Reviewed-on: https://chromium-review.googlesource.com/270498Reviewed-by: Jamie Madill <jmadill@chromium.org>
Reviewed-by: Corentin Wallez <cwallez@chromium.org>
Tested-by: Geoff Lang <geofflang@chromium.org>

71632d0c

Roll Gmock and Gtest. · 3ba57d1b

authored May 13, 2015

This fixes the build of angle_end2end_tests on Linux/Clang.

BUG=angleproject:997

Change-Id: Ie6eca3dc0fc7114d2755892b4b02e8b47a8fa478
Reviewed-on: https://chromium-review.googlesource.com/270680Reviewed-by: Geoff Lang <geofflang@chromium.org>
Tested-by: Jamie Madill <jmadill@chromium.org>

3ba57d1b

Validate global initializer qualifiers · b0c645e2

authored May 12, 2015

Allow only constants, other globals, temporaries, and uniforms to be used
in global variable initialization for now. The spec limits global
variable initialization further to only constant expressions, but fully
implementing this has a too large compatibility cost for ESSL 1.00, so
implement it only partially. In the case of ESSL 3.00 we can use stricter
validation, since there's no legacy to worry about.

Resubmitting the change, since the previous version neglected to remove
incorrect GLSL tests.

TEST=angle_unittests, WebGL conformance tests, angle_end2end_tests
BUG=angleproject:988

Change-Id: I1bb3b8dc305689a90eadfe8cc7705e5ac3829e03
Reviewed-on: https://chromium-review.googlesource.com/270651Tested-by: Olli Etuaho <oetuaho@nvidia.com>
Reviewed-by: Jamie Madill <jmadill@chromium.org>

b0c645e2

perf_tests: Reduce iteration counts in some tests. · fe5f54f5

authored May 12, 2015

This gives the tests more room to breathe, and report more
precision in the final scores. Hopefully this will clear up the
issues on the bots where some tests appear to fluctuate between a 
high and low value.

BUG=468852

Change-Id: Ie2793e0a89e5ded63ba4217828076df46c393a92
Reviewed-on: https://chromium-review.googlesource.com/270497Tested-by: Jamie Madill <jmadill@chromium.org>
Reviewed-by: Geoff Lang <geofflang@chromium.org>

fe5f54f5

Revert "Validate global initializer qualifiers" · b6a52bb4

authored May 13, 2015

Seems to be failing angle_end2end_tests:

GLSLTest.GlobalStaticAndVarying_0
GLSLTest.GlobalStaticAndVarying_1
GLSLTest_ES3.GlobalStaticAndInstanceID_0

http://build.chromium.org/p/chromium.gpu.fyi/builders/Win7%20Release%20%28NVIDIA%29/builds/15598

BUG=angleproject:988

This reverts commit 6caa5e81.

Change-Id: I394b571c9b4ee739721018c5287a45df49e1471c
Reviewed-on: https://chromium-review.googlesource.com/270589Reviewed-by: Jamie Madill <jmadill@chromium.org>
Tested-by: Jamie Madill <jmadill@chromium.org>

b6a52bb4

Validate global initializer qualifiers · 6caa5e81

authored May 12, 2015

Allow only constants, other globals, temporaries, and uniforms to be used
in global variable initialization for now. The spec limits global
variable initialization further to only constant expressions, but fully
implementing this has a too large compatibility cost for ESSL 1.00, so
implement it only partially. In the case of ESSL 3.00 we can use stricter
validation, since there's no legacy to worry about.

TEST=angle_unittests, WebGL conformance tests
BUG=angleproject:988

Change-Id: I6a66f6a31130b44717dd2bef3082a0fc395a60b6
Reviewed-on: https://chromium-review.googlesource.com/270430Reviewed-by: Kenneth Russell <kbr@chromium.org>
Tested-by: Olli Etuaho <oetuaho@nvidia.com>

6caa5e81

12 May, 2015 8 commits

Add more D3D11 init errors to stats collection. · c5146c76

authored May 12, 2015

We ran into the UNSUPPORTED value when looking at D3D11 on a VM.
It's quite possible that systems which don't support D3D11 return
this value when initialization fails.

Also add a few more severe errors such as device removed.

BUG=477701

Change-Id: I2ebbfff5f7eed6fe3939dea86b25845a748caedc
Reviewed-on: https://chromium-review.googlesource.com/270346Reviewed-by: Geoff Lang <geofflang@chromium.org>
Tested-by: Jamie Madill <jmadill@chromium.org>

c5146c76

Revert "Create a child window in SurfaceD3D when needed." · 6cd03cf9

authored May 12, 2015

Reverting until chromium sandbox issues are resolved.

This reverts commit b7f1a8b0.

BUG=484963
BUG=angleproject:961

Change-Id: I4b030329a322d0a96a18e6ae875d500c5f755ddd
Reviewed-on: https://chromium-review.googlesource.com/270490Reviewed-by: Geoff Lang <geofflang@chromium.org>
Tested-by: Geoff Lang <geofflang@chromium.org>

6cd03cf9

Fix compilation of EGLSurfaceTest · e96899c4

authored May 12, 2015

BUG=angleproject:892

Change-Id: I8c999e06c8cc3567f7bb1aed23286bd7e9080616
Reviewed-on: https://chromium-review.googlesource.com/270432Tested-by: Corentin Wallez <cwallez@chromium.org>
Reviewed-by: Geoff Lang <geofflang@chromium.org>

e96899c4

X11Window: implement event handling and modifiers · 43b0c221

authored May 12, 2015

BUG=angleproject:892

Change-Id: I65f251abdd28b273e2d3d574825f20bba8bb2532
Reviewed-on: https://chromium-review.googlesource.com/270452Reviewed-by: Jamie Madill <jmadill@chromium.org>
Reviewed-by: Geoff Lang <geofflang@chromium.org>
Tested-by: Corentin Wallez <cwallez@chromium.org>

43b0c221

Temporarily move back ANGLETest in end2end_tests · ac3ab882

authored May 12, 2015

This path needs to a Chrome change before it can change.

BUG=angleproject:892

Change-Id: I549737383b9720a2e7d83ee5e3145d71716f04cb
Reviewed-on: https://chromium-review.googlesource.com/270457Reviewed-by: Jamie Madill <jmadill@chromium.org>
Tested-by: Corentin Wallez <cwallez@chromium.org>

ac3ab882

Revert "Make EGLQueryContextTest use ANGLE_INSTANTIATE_TEST" · c4738880

authored May 12, 2015

Broke win build

ninja: error: '../../gpu/egl_tests/EGLQueryContextTest.cpp', needed by 'obj/gpu/egl_tests/angle_end2end_tests.EGLQueryContextTest.obj', missing and no known rule to make it
This reverts commit 887dd2f1.

Change-Id: I2ceb430010628c2aa7cb242eb2bf49406d8d87db
Reviewed-on: https://chromium-review.googlesource.com/270471Reviewed-by: Zhenyao Mo <zmo@chromium.org>
Tested-by: Zhenyao Mo <zmo@chromium.org>

c4738880

Make EGLQueryContextTest use ANGLE_INSTANTIATE_TEST · 887dd2f1

authored May 11, 2015

This makes it run correctly on Linux where the only platform available
is OpenGL.

BUG=angleproject:892

Change-Id: I3d72163b49b35daba702ebb5b48d010761c7fb6d
Reviewed-on: https://chromium-review.googlesource.com/270262Reviewed-by: Geoff Lang <geofflang@chromium.org>
Tested-by: Corentin Wallez <cwallez@chromium.org>

887dd2f1

Compile end2end tests on Linux · 973402fd

authored May 11, 2015

BUG=angleproject:892

Change-Id: Id4a9ddc35ae9600080e743c77476d36743a3e646
Reviewed-on: https://chromium-review.googlesource.com/270199Reviewed-by: Geoff Lang <geofflang@chromium.org>
Reviewed-by: Jamie Madill <jmadill@chromium.org>
Tested-by: Corentin Wallez <cwallez@chromium.org>
Reviewed-on: https://chromium-review.googlesource.com/270412

973402fd