Commits · d3c29f57aaeb451b149bbb9fd17b3f1f99101c52 · Chen Yisong / angle

29 Apr, 2015 1 commit

Add pragma errors for malformed pragmas. · d3c29f57

authored Apr 28, 2015

Instead of always warning on invalid pragmas, only warn when the pragma
type is not recognized and error when the syntax is invalid.

Fixes:
dEQP-GLES2.functional.shaders.preprocessor.pragmas.invalid_pragma_invalid_debug_vertex
dEQP-GLES2.functional.shaders.preprocessor.pragmas.invalid_pragma_invalid_debug_fragment
dEQP-GLES2.functional.shaders.preprocessor.pragmas.invalid_pragma_invalid_token_vertex
dEQP-GLES2.functional.shaders.preprocessor.pragmas.invalid_pragma_invalid_token_fragment

BUG=angleproject:989

Change-Id: Ibd584dc08a2436e163dfc52eeffdf2dac8a22cb8
Reviewed-on: https://chromium-review.googlesource.com/267639Reviewed-by: Zhenyao Mo <zmo@chromium.org>
Tested-by: Geoff Lang <geofflang@chromium.org>

d3c29f57

28 Apr, 2015 12 commits

Validate that there are no tokens following #undef on the same line. · b819d25d

authored Apr 27, 2015

Fixes:
dEQP-GLES2.functional.shaders.preprocessor.definitions.undefine_object_invalid_syntax_vertex
dEQP-GLES2.functional.shaders.preprocessor.definitions.undefine_object_invalid_syntax_fragment
dEQP-GLES2.functional.shaders.preprocessor.invalid_definitions.undef_non_identifier_2_vertex
dEQP-GLES2.functional.shaders.preprocessor.invalid_definitions.undef_non_identifier_2_fragment

BUG=angleproject:989

Change-Id: I279a38aaae8010017ef6e3f1aa139ae03f374680
Reviewed-on: https://chromium-review.googlesource.com/267397Reviewed-by: Zhenyao Mo <zmo@chromium.org>
Tested-by: Geoff Lang <geofflang@chromium.org>

b819d25d

Reject shaders using attribute aliasing. · 3da79b7b

authored Apr 27, 2015

The current code rejects any shaders that use more than the caps
allow, but a bug would crash us before the check. We don't support
aliasing in shaders that use a lot of uniforms because this
causes problems with the D3D back-end, currently. This changes the
crash in the dEQP aliasing tests to a link error.

See dEQP-GLES2.functional.attribute_location.bind_aliasing.*

BUG=angleproject:901

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

3da79b7b

Create a child window in SurfaceD3D when needed. · 30cb86d8

authored Apr 22, 2015

BUG=angleproject:961
BUG=angleproject:860

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

30cb86d8

Temporarily disable the ClearTest.ClearIssue test on Intel OpenGL. · 463cdeac

authored Apr 28, 2015

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

463cdeac

Expand ShShaderOutput for different GLSL versions · ad0d0799

authored Apr 08, 2015

BUG=angleproject:968

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

ad0d0799

Revert "Revert "Remove non-const FBO attachment queries."" · e3ef715d

authored Apr 28, 2015

Fixed build errors in prior patch.

This reverts commit 34771622.

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

e3ef715d

Revert "Create a child window in SurfaceD3D when needed." · 3fe36ebd

authored Apr 28, 2015

Causing errors with D3D9, see build:

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

This reverts commit b7f1a8b0.

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

3fe36ebd

Revert "Fix compile failure on build systems with UNICODE defined." · 3a12f776

authored Apr 28, 2015

Earlier patch causing errors on D3D9:

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

This reverts commit acb0a1a6.

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

3a12f776

Fix compile failure on build systems with UNICODE defined. · acb0a1a6

authored Apr 28, 2015

BUG=angleproject:961

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

acb0a1a6

Don't subclass windows in SurfaceD3D. · d3b84ab5

authored Apr 22, 2015

The subclassing was not used by chromium and caused problems for users
that wanted to use a window owned by another thread as an EGL surface.

BUG=angleproject:961

Change-Id: I1d91323c758374de317179874320961385b10ae0
Reviewed-on: https://chromium-review.googlesource.com/266658Reviewed-by: Jamie Madill <jmadill@chromium.org>
Reviewed-by: John Bauman <jbauman@chromium.org>
Tested-by: Geoff Lang <geofflang@chromium.org>

d3b84ab5

Create a child window in SurfaceD3D when needed. · b7f1a8b0

authored Apr 22, 2015

BUG=angleproject:961

Change-Id: I61931961f8cb86b47012edd2bc08d0e1e7a5d0f7
Reviewed-on: https://chromium-review.googlesource.com/266515Reviewed-by: Jamie Madill <jmadill@chromium.org>
Reviewed-by: John Bauman <jbauman@chromium.org>
Tested-by: Geoff Lang <geofflang@chromium.org>

b7f1a8b0

Add a special case for binding to GL_FRAMEBUFFER for state tracking. · 5b028d18

authored Apr 27, 2015

Binding to GL_FRAMEBUFFER is supposed to set the read and draw framebuffer
bindings instead of being a separate binding point.

BUG=angleproject:885

Change-Id: Ic6d9056a2f8bfa472587c5ed030c15fcc93574c7
Reviewed-on: https://chromium-review.googlesource.com/267460Reviewed-by: Brandon Jones <bajones@chromium.org>
Reviewed-by: Kenneth Russell <kbr@chromium.org>
Tested-by: Geoff Lang <geofflang@chromium.org>

5b028d18

27 Apr, 2015 12 commits

Fixed shadowed error variable. · 0d31828f

authored Apr 27, 2015

BUG=angleproject:886

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

0d31828f

Store value types for FBO attachments. · 2d06b738

authored Apr 20, 2015

*re-land with fix for Mac*

This prevents us from re-allocating FBO attachments every set.
This change requires quite a bit of refactoring.

BUG=angleproject:963

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

2d06b738

Revert "D3D11: Filter HRESULT error code properly." · b36e9b89

authored Apr 27, 2015

Fix is incorrect: See http://crbug.com/477701

This reverts commit 02bce6e5.

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

b36e9b89

Fixed compilation with mingw. · fa60f690

authored Apr 27, 2015

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

fa60f690

Remove separate compilerdebug.h in favor of debug.h · d57e0db3

authored Apr 24, 2015

This unifies the behavior across the compiler and rest of ANGLE - for
example, one can use #define ANGLE_TEST_CONFIG to disable UNIMPLEMENTED
asserts in both the compiler and the rest of ANGLE. Compiler traces from
asserts also go to the same TRACE_OUTPUT_FILE as other traces instead of
being directed through ParseContext.

The compiler build already includes the common sources, so no changes to
build config are needed.

The original version of this change was reverted due to release mode
build issues. This version adds UNUSED_ASSERTION_VARIABLE where needed.

TEST=angle_unittests, angle_end2end_tests,
     dEQP-GLES3.functional.shaders.*
BUG=angleproject:983

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

d57e0db3

Keep default FBO attachments immutable. · 84115c92

authored Apr 23, 2015

In some cases we would let the user change the attachments of the
default FBO. This hole in our validation would confound the dEQP
negative API tests (negative_api.buffer.framebuffer_*) and muck
up the remainder of the test run.

BUG=angleproject:901

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

84115c92

No-op BufferSubData after validation. · 0be9a8a0

authored Apr 23, 2015

We were skipping some validation, which was confusing dEQP. We can
still no-op, but do this after all validation.

BUG=angleproject:901

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

0be9a8a0

Fix missing texture target validations. · a7441353

authored Apr 23, 2015

We were missing this in a few places, and this was giving runtime
errors in dEQP negative tests.

BUG=angleproject:901

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

a7441353

Fix warning about unexpected mock function call. · 48d33aef

authored Apr 27, 2015

BUG=angleproject:985

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

48d33aef

Revert "Remove separate compilerdebug.h in favor of debug.h" · a656490d

authored Apr 27, 2015

Causing compile warnings in Release:

1>compiler\translator\CallDAG.cpp(238): error C2220: warning treated as error - no 'object' file generated
1>compiler\translator\CallDAG.cpp(238): warning C4189: 'op' : local variable is initialized but not referenced
1>compiler\translator\IntermNode.cpp(1495): error C2220: warning treated as error - no 'object' file generated
1>compiler\translator\IntermNode.cpp(1495): warning C4189: 'replaced' : local variable is initialized but not referenced
1>compiler\translator\IntermNode.cpp(1517): warning C4189: 'replaced' : local variable is initialized but not referenced

This reverts commit 52710258.

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

a656490d

Add a sample that uses multiple windows. · 681ad9d1

authored Apr 23, 2015

BUG=angleproject:521

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

681ad9d1

Remove separate compilerdebug.h in favor of debug.h · 52710258

authored Apr 24, 2015

This unifies the behavior across the compiler and rest of ANGLE - for
example, one can use #define ANGLE_TEST_CONFIG to disable UNIMPLEMENTED
asserts in both the compiler and the rest of ANGLE. Compiler traces from
asserts also go to the same TRACE_OUTPUT_FILE as other traces instead of
being directed through ParseContext.

The compiler build already includes the common sources, so no changes to
build config are needed.

TEST=angle_unittests, angle_end2end_tests,
     dEQP-GLES3.functional.shaders.*
BUG=angleproject:983

Change-Id: Ifca4d16f667b1e5cf9c2e7cc4139940091917a1c
Reviewed-on: https://chromium-review.googlesource.com/266993Reviewed-by: Jamie Madill <jmadill@chromium.org>
Reviewed-by: Zhenyao Mo <zmo@chromium.org>
Tested-by: Olli Etuaho <oetuaho@nvidia.com>

52710258

24 Apr, 2015 6 commits

Add ANGLE platform selection for dEQP. · 2a7ffe16

authored Apr 23, 2015

This gives us the choice between D3D9 and D3D11. We can add more
platforms easily using the same patterns.

BUG=angleproject:901

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

2a7ffe16

Clean up binary operation constant folding code · 2cb7b835

authored Apr 23, 2015

Fix mixed up comments, remove unnecessary type conversions, clarify
variable names and improve formatting in a few places.

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

Change-Id: Ice8fe3682d8e97f42747752302a1fba116132df4
Reviewed-on: https://chromium-review.googlesource.com/266843Reviewed-by: Jamie Madill <jmadill@chromium.org>
Tested-by: Olli Etuaho <oetuaho@nvidia.com>
Reviewed-by: Zhenyao Mo <zmo@chromium.org>

2cb7b835

Add basic support for arrays as return values in HLSL output · a8c414ba

authored Apr 16, 2015

In HLSL output, user-defined functions that have an array as their return value
get changed so that they have the array as an out parameter instead.

Still missing: support for calling a function that has array as a return value
without assigning the array. Also support for assignments inside complex
expressions.

TEST=dEQP-GLES3.functional.shaders.arrays.return.*
BUG=angleproject:941

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

a8c414ba

Prune empty declarations from the AST · c6833115

authored Apr 22, 2015

Empty declarations in ESSL shaders currently result in errors on several
platforms. Prune empty declarations that are not struct or interface block
declarations from the AST.

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

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

c6833115

Disallow length being called on expressions with side effects · 39282e1f

authored Apr 23, 2015

ESSL 3.00 definition of expressions does not include calling length on
anything other than array names, so enforce this restriction in the
parser.

TEST=WebGL 2 conformance tests
BUG=angleproject:972

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

39282e1f

Fix array.length() to return a signed integer · 96e67388

authored Apr 23, 2015

array.length() should return a signed integer as specified in ESSL 3.00
section 4.1.9, not unsigned. Fix this and add a simple unit test - the
dEQP tests included in WebGL conformance are built in a way that they
don't catch the issue.

TEST=angle_unittests
BUG=angleproject:972

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

96e67388

23 Apr, 2015 9 commits

Sync the remaining miscellaneous state before drawing in RendererGL. · d42f5b8c

authored Apr 16, 2015

BUG=angleproject:883

Change-Id: Id530f855ab14b6ec575101c9e74c02842c27d3d6
Reviewed-on: https://chromium-review.googlesource.com/266036Reviewed-by: Brandon Jones <bajones@chromium.org>
Reviewed-by: Kenneth Russell <kbr@chromium.org>
Tested-by: Geoff Lang <geofflang@chromium.org>

d42f5b8c

Sync the entire rasterizer state before drawing in RendererGL. · 4b3f4169

authored Apr 16, 2015

BUG=angleproject:883

Change-Id: I721c198f33caa18ec04899d6323faa9dbd4aa100
Reviewed-on: https://chromium-review.googlesource.com/266035Reviewed-by: Brandon Jones <bajones@chromium.org>
Reviewed-by: Kenneth Russell <kbr@chromium.org>
Tested-by: Geoff Lang <geofflang@chromium.org>

4b3f4169

Sync the entire depth stencil state before drawing in RendererGL. · b8517346

authored Apr 16, 2015

BUG=angleproject:883

Change-Id: I1d748281184ff8111f8ff1c63f56882650b6871b
Reviewed-on: https://chromium-review.googlesource.com/266034Reviewed-by: Brandon Jones <bajones@chromium.org>
Reviewed-by: Kenneth Russell <kbr@chromium.org>
Tested-by: Geoff Lang <geofflang@chromium.org>

b8517346

Sync the entire blend state before drawing in RendererGL. · 0fbb600f

authored Apr 16, 2015

BUG=angleproject:883

Change-Id: I903090c1a7ba90bd479ad8d24f943672eb51054e
Reviewed-on: https://chromium-review.googlesource.com/266033Reviewed-by: Brandon Jones <bajones@chromium.org>
Reviewed-by: Kenneth Russell <kbr@chromium.org>
Tested-by: Geoff Lang <geofflang@chromium.org>

0fbb600f

Remove last uses of the enumerate_files script. · 08c9cd97

authored Apr 22, 2015

BUG=angleproject:981

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

08c9cd97

Remove uses of enumerate_files in the sample projects. · 704c716a

authored Apr 22, 2015

Speeds up project generation a lot.

BUG=angleproject:981

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

704c716a

Rename translator to shader_translator and remove redundant projects. · 2f3ba210

authored Apr 22, 2015

The essl_to_hlsl and essl_to_glsl projects were exactly the same so it
doesn't make sense to keep both.

BUG=angleproject:981

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

2f3ba210

Move all GLES samples into the samples directory. · 413fd933

authored Apr 22, 2015

There was no real reason to keep them in an angle directory and it makes
the generated projects nicer.

BUG=angleproject:981

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

413fd933

Remove the dds_to_header sample. · 53643854

authored Apr 22, 2015

It has very little to do with ANGLE and should not be in the repository.

BUG=angleproject:981

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

53643854