Commits · 1deca4fd84530e91e2f9b0a92db3a678b6441b14 · Chen Yisong / angle

17 Apr, 2014 1 commit

Don't include the test main files in the source listings. · 1deca4fd

authored Apr 17, 2014

Since chrome adds the ANGLE test source directly to it's own projects,
the main function is defined twice.  Remove the main file from the source
listings and only add it for our test executables.

BUG=angle:568

Change-Id: I30b481a23d5de80341d7f339583a43ad2f4391bb
Reviewed-on: https://chromium-review.googlesource.com/195345Reviewed-by: Jamie Madill <jmadill@chromium.org>
Reviewed-by: Shannon Woods <shannonwoods@chromium.org>
Tested-by: Geoff Lang <geofflang@chromium.org>

1deca4fd

16 Apr, 2014 14 commits

Move ShaderVariables to common shared source. · 834e8b77

authored Apr 11, 2014

Also move the block layout encoding utilities to the common folder.
The combined changes allow us to include the shader and block code
into both libGLESv2 and the translator separately. This in turn
fixes the Chromium component build, where we were calling internal
translator functions directly from libGLESv2.

BUG=angle:568

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

834e8b77

Revert "Remove the second translator target, only using static." · 8cc03bf7

authored Apr 11, 2014

This reverts commit d51df461.

Conflicts:
	projects/build/all.sln
	projects/samples/samples.sln
	src/compiler.gypi

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

8cc03bf7

Add validation for GL_RED and GL_RG in glReadPixels. · bdc9b2f0

authored Apr 16, 2014

EXT_texture_rg adds support for these readback formats but validation was
not added.

BUG=angle:609

Change-Id: Iddd94bb8d8cf3b244a0d8a59cd4445ffa2ae61fe
Reviewed-on: https://chromium-review.googlesource.com/195176Reviewed-by: Nicolas Capens <nicolascapens@chromium.org>
Tested-by: Geoff Lang <geofflang@chromium.org>

bdc9b2f0

Fix a semantic index not being written for gl_FragCoord. · b5b02857

authored Apr 16, 2014

BUG=angle:608

Change-Id: Iebf7577a7a0c54cef25cfa7706840e8ad26b7a08
Reviewed-on: https://chromium-review.googlesource.com/195163Reviewed-by: Jamie Madill <jmadill@chromium.org>
Reviewed-by: Nicolas Capens <nicolascapens@chromium.org>
Tested-by: Geoff Lang <geofflang@chromium.org>

b5b02857

Implement EXT_shader_texture_lod · 46485086

authored Apr 15, 2014

BUG=angle:551

Change-Id: I81d7574a15861f1b24ddf6147cf71adbf20e10f3
Reviewed-on: https://chromium-review.googlesource.com/194960Tested-by: Nicolas Capens <nicolascapens@chromium.org>
Reviewed-by: Shannon Woods <shannonwoods@chromium.org>

46485086

Fix comparing TextureFunction structures. · 04296f85

authored Apr 14, 2014

Test each field for smaller or larger than, and when they're equal test the
next field.

BUG=angle:605

Change-Id: I2c5a90d95c7ff73b83f3067381c14b74a213ef05
Reviewed-on: https://chromium-review.googlesource.com/194602Tested-by: Nicolas Capens <nicolascapens@chromium.org>
Reviewed-by: Shannon Woods <shannonwoods@chromium.org>

04296f85

Fix Lod0 texture functions that take a bias parameter. · 84cfa124

authored Apr 14, 2014

Texture functions that are in a divergent path can still take a bias parameter.
Treat the bias parameter as an explicit lod. The logic behind this is that the
implicit lod is considerd to be 0 like with other Lod0 functions, and then the
bias is added to it.

BUG=angle:604

Change-Id: I2dbc309c497d37e960209f08849f9d2bc9e1fbcc
Reviewed-on: https://chromium-review.googlesource.com/194544Tested-by: Nicolas Capens <nicolascapens@chromium.org>
Reviewed-by: Shannon Woods <shannonwoods@chromium.org>

84cfa124

Implement BASE/MAX_LEVEL, and MIN/MAX_LOD functionality. · 35adc099

authored Apr 11, 2014

BUG=angle:596

Change-Id: I0c818fdc1575be1ee16966acf7b6daa067a24282
Reviewed-on: https://chromium-review.googlesource.com/193236Tested-by: Nicolas Capens <nicolascapens@chromium.org>
Reviewed-by: Shannon Woods <shannonwoods@chromium.org>
Reviewed-by: Jamie Madill <jmadill@chromium.org>

35adc099

Implement state tracking for BASE/MAX_LEVEL, and MIN/MAX_LOD. · 8de68287

authored Apr 04, 2014

BUG=angle:596

Change-Id: I773720a19b766c7a6930967983db0a34e84f2790
Reviewed-on: https://chromium-review.googlesource.com/193235Tested-by: Nicolas Capens <nicolascapens@chromium.org>
Reviewed-by: Shannon Woods <shannonwoods@chromium.org>
Reviewed-by: Jamie Madill <jmadill@chromium.org>

8de68287

Move common SRV management into TextureStorage11. · 41d9f7e9

authored Apr 11, 2014

BUG=angle:596

Change-Id: I0de2e3826e18ee769c27577b40677f0ca4da083b
Reviewed-on: https://chromium-review.googlesource.com/193234Reviewed-by: Shannon Woods <shannonwoods@chromium.org>
Tested-by: Nicolas Capens <nicolascapens@chromium.org>

41d9f7e9

Homogenize the parameter list for all SRV creation functions. · e83fb002

authored Apr 11, 2014

BUG=angle:596

Change-Id: Idd13aea4b4074aabbc4c183a3814226c31dda994
Reviewed-on: https://chromium-review.googlesource.com/193233Reviewed-by: Shannon Woods <shannonwoods@chromium.org>
Tested-by: Nicolas Capens <nicolascapens@chromium.org>

e83fb002

Cache previously created SRVs. · a9f85c63

authored Apr 11, 2014

BUG=angle:596

Change-Id: I15ac729388177a2ac89df4caffad5e12c7317bd7
Reviewed-on: https://chromium-review.googlesource.com/193232Tested-by: Nicolas Capens <nicolascapens@chromium.org>
Reviewed-by: Jamie Madill <jmadill@chromium.org>
Reviewed-by: Shannon Woods <shannonwoods@chromium.org>

a9f85c63

Deduplicate SRV creation. · 1d31aca9

authored Apr 03, 2014

BUG=angle:596

Change-Id: I2f4e0c4dd5c1182db1f67589f72dafef3717b363
Reviewed-on: https://chromium-review.googlesource.com/193231Tested-by: Nicolas Capens <nicolascapens@chromium.org>
Reviewed-by: Jamie Madill <jmadill@chromium.org>
Reviewed-by: Shannon Woods <shannonwoods@chromium.org>

1d31aca9

Rename getBaseTexture to getResource, and refactor swizzleRequired. · 76b258f8

authored Apr 03, 2014

BUG=angle:596

Change-Id: I72d8796172c5db57ddeb86bbc6c08cbb2ec125f1
Reviewed-on: https://chromium-review.googlesource.com/193230Tested-by: Nicolas Capens <nicolascapens@chromium.org>
Reviewed-by: Jamie Madill <jmadill@chromium.org>
Reviewed-by: Geoff Lang <geofflang@chromium.org>

76b258f8

14 Apr, 2014 4 commits

Move the map logic to the buffer storage implementation. · 948f5571

authored Apr 08, 2014

Refactoring patch only.

BUG=angle:511

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

948f5571

Fix non-square matrix vertex attributes. · ac0a267b

authored Apr 11, 2014

When we generate an input signature for a vertex shader, we should
use the transpose of the matrix type instead of the matrix type
itself. This was breaking dEQP tests 'shaders.functions.datatypes'.

BUG=angle:594

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

ac0a267b

Stop shader local variables from using invalid qualifiers. · 12bea0a9

authored Apr 11, 2014

Local variables in GLSL can't use any other storage qualifier than
'const', but we weren't checking properly. For example, the can't
have 'in' or 'out' storage. This was causing a dEQP conformance
test failure.

BUG=angle:593

Change-Id: Ibb333950f2d0990a47d1a96caecc455497d5e57e
Reviewed-on: https://chromium-review.googlesource.com/191460Reviewed-by: Nicolas Capens <nicolascapens@chromium.org>
Tested-by: Jamie Madill <jmadill@chromium.org>

12bea0a9

Regenerate the compiled lexer. · 9f45240c

authored Apr 11, 2014

The lexer was missing some recent changes.

BUG=angle:593

Change-Id: I8fa598e5a4ae35ebc9f9a48789632b6a326bc4d3
Reviewed-on: https://chromium-review.googlesource.com/194136Reviewed-by: Nicolas Capens <nicolascapens@chromium.org>
Reviewed-by: Geoff Lang <geofflang@chromium.org>
Tested-by: Jamie Madill <jmadill@chromium.org>

9f45240c

11 Apr, 2014 7 commits

Fix warnings about unreferenced local variables. · cebb5aa0

authored Apr 07, 2014

BUG=angleproject:602

Change-Id: I2eb04fe6eed60b3877b14628e81c0b1fe3b68647
Reviewed-on: https://chromium-review.googlesource.com/193431Tested-by: Geoff Lang <geofflang@chromium.org>
Reviewed-by: Shannon Woods <shannonwoods@chromium.org>

cebb5aa0

Handle an unknown error when exiting fullscreen on Windows 8. · 662b8481

authored Apr 11, 2014

BUG=361553

Change-Id: I6d3e843a8ae06f1bbd5313ed95e338cb0b74fef3
Reviewed-on: https://chromium-review.googlesource.com/194233Reviewed-by: Shannon Woods <shannonwoods@chromium.org>
Tested-by: Geoff Lang <geofflang@chromium.org>

662b8481

Insert missing sampler cases in TType::buildMangledName. · 9bab6d8f

authored Apr 10, 2014

We were missing the cases for 2D Rect samplers and external OES
samplers. This was causing an assert in the WebGL CTS in Debug.

BUG=angle:550

Change-Id: Ieefeef6ff0f9a486bf7667c7efc60dee766f03ef
Reviewed-on: https://chromium-review.googlesource.com/194122Reviewed-by: Geoff Lang <geofflang@chromium.org>
Reviewed-by: Shannon Woods <shannonwoods@chromium.org>
Tested-by: Jamie Madill <jmadill@chromium.org>

9bab6d8f

Use shader optimization level 3 selectively. · 655fe36e

authored Apr 11, 2014

Default to HLSL compiler optimization level 1 and work around a compiler bug with break in nested loops by using optimization level 3.

BUG=angle:603

Change-Id: I4f7985a5648f1b5f54d80554c21aced7fc1777c2
Reviewed-on: https://chromium-review.googlesource.com/194129Tested-by: Nicolas Capens <nicolascapens@chromium.org>
Reviewed-by: Shannon Woods <shannonwoods@chromium.org>

655fe36e

Refactor buffer storage to split backing stores. · 15cba8b1

authored Apr 08, 2014

A more flexible representation of a buffer storage implementation
allows us to represent storage for D3D11 buffers, and also pack
buffer as CPU memory.

Refactoring patch only.

BUG=angle:511

Change-Id: Ie123099f6217bec6edc98594e49333d16f006a0b
Reviewed-on: https://chromium-review.googlesource.com/191033Reviewed-by: Shannon Woods <shannonwoods@chromium.org>
Tested-by: Jamie Madill <jmadill@chromium.org>

15cba8b1

Pass pack state arguments instead of split parameters. · eb9baabb

authored Mar 24, 2014

Similar to unpack state, the PixelPackState struct encapsulates
all the parameters related to pixel pack buffers. Passing the
packstate makes functions more consise.

BUG=angle:511

Change-Id: If6954a5085e9b8f828cfc8892a73e7c7514b0c8a
Reviewed-on: https://chromium-review.googlesource.com/191032Reviewed-by: Shannon Woods <shannonwoods@chromium.org>
Tested-by: Jamie Madill <jmadill@chromium.org>

eb9baabb

Clamp ReadPixels calls to unsigned limits in D3D11. · 1eb5bd76

authored Mar 28, 2014

GL allows reads beyond the defined pixel rectangle, although their
resultant values are undefined. D3D11 gives an error when reading
out-of-bounds, hence clamping the area satisfies both APIs.

This fixes a Renderer crash in our ReadPixels out of bounds test,
and also fixes the test to test the correct area of pixels.

BUG=angle:590

Change-Id: I12439c22d53ec6a2d69e1b8cf80f53e9c18e11f7
Reviewed-on: https://chromium-review.googlesource.com/191080Reviewed-by: Shannon Woods <shannonwoods@chromium.org>
Reviewed-by: Geoff Lang <geofflang@chromium.org>
Tested-by: Jamie Madill <jmadill@chromium.org>

1eb5bd76

09 Apr, 2014 3 commits

Allow sample projects to choose ES3 & D3D version. · 96e46cd6

authored Apr 07, 2014

Passing parameters from the sample constructor allows us to test
ES3 functionality, as well as choose between D3D9 and 11.

BUG=angle:521

Change-Id: I7b9543b399450f62c5415654e8026a7c218b7e37
Reviewed-on: https://chromium-review.googlesource.com/193292Reviewed-by: Geoff Lang <geofflang@chromium.org>
Reviewed-by: Shannon Woods <shannonwoods@chromium.org>
Tested-by: Jamie Madill <jmadill@chromium.org>

96e46cd6

Add a common include in the project definitions. · d095bdaa

authored Apr 07, 2014

Any projects that may be included by gyp files outside our project (chrome
or skia) may not have the same defines or ignored compiler warnings.  To
make sure that we can always compile, each project now includes a common
file with all required definitions and gyp variables.

BUG=angleproject:583

Change-Id: I702bee975d0554c51bfa03981920dfb295ffbafa
Reviewed-on: https://chromium-review.googlesource.com/189458Reviewed-by: Zhenyao Mo <zmo@chromium.org>
Reviewed-by: Shannon Woods <shannonwoods@chromium.org>
Tested-by: Geoff Lang <geofflang@chromium.org>

d095bdaa

Remove the angle_relative_path gyp variable. · f3e6a9e0

authored Apr 07, 2014

Add a separate step to copy the scripts to the intermediate directory and
run them from there.

BUG=angleproject:583

Change-Id: I307a2810ac03c00248cba1f227f128a1517c6574
Reviewed-on: https://chromium-review.googlesource.com/193432Reviewed-by: Jamie Madill <jmadill@chromium.org>
Reviewed-by: Shannon Woods <shannonwoods@chromium.org>
Tested-by: Geoff Lang <geofflang@chromium.org>

f3e6a9e0

01 Apr, 2014 11 commits

Remove max level from texture storage. · bf712d0a

authored Mar 31, 2014

BUG=angle:596

Change-Id: I174e3b73c0cb675b5c9aea5722a7051a34639831
Reviewed-on: https://chromium-review.googlesource.com/192340Tested-by: Nicolas Capens <nicolascapens@chromium.org>
Reviewed-by: Shannon Woods <shannonwoods@chromium.org>
Reviewed-by: Jamie Madill <jmadill@chromium.org>

bf712d0a

Remove base level from texture storage. · fa7b76d0

authored Mar 31, 2014

BUG=angle:596

Change-Id: I66173f77b6c5aed3b8836cd2c9f1da02ae769429
Reviewed-on: https://chromium-review.googlesource.com/192056Tested-by: Nicolas Capens <nicolascapens@chromium.org>
Reviewed-by: Shannon Woods <shannonwoods@chromium.org>

fa7b76d0

Rename lod offset to top level. · f61738a5

authored Mar 31, 2014

BUG=angle:596

Change-Id: Ic256445528d6587adcf0adfd8aaba5e47778988b
Reviewed-on: https://chromium-review.googlesource.com/192055Tested-by: Nicolas Capens <nicolascapens@chromium.org>
Reviewed-by: Shannon Woods <shannonwoods@chromium.org>

f61738a5

Create a single-level SRV when not mipmapping. · e47e7363

authored Mar 27, 2014

BUG=angle:596

Change-Id: Iec5a9e43a23c0743ff8b01985a86a72c5f18a7f7
Reviewed-on: https://chromium-review.googlesource.com/192052Tested-by: Nicolas Capens <nicolascapens@chromium.org>
Reviewed-by: Shannon Woods <shannonwoods@chromium.org>

e47e7363

Pass all sampler state to getSRV. · a10c1c7e

authored Mar 27, 2014

BUG=angle:596

Change-Id: I4f97ea7c43bf12f5d986db39ae67d87074f98e82
Reviewed-on: https://chromium-review.googlesource.com/192051Tested-by: Nicolas Capens <nicolascapens@chromium.org>
Reviewed-by: Shannon Woods <shannonwoods@chromium.org>

a10c1c7e

Remove the es_util project. · 73f51433

authored Mar 04, 2014

BUG=angle:521

Change-Id: Iad633bf210c36db340490f21923534697e27891b
Reviewed-on: https://chromium-review.googlesource.com/188741Reviewed-by: Shannon Woods <shannonwoods@chromium.org>
Reviewed-by: Jamie Madill <jmadill@chromium.org>
Tested-by: Geoff Lang <geofflang@chromium.org>

73f51433

Port the PostSubBuffer sample to the new sample framework. · e977efc4

authored Mar 04, 2014

Add a swap method on the SampleApplication class so that samples can
override the default eglSwapBuffers function call.

BUG=angle:521

Change-Id: I3f0ba6ed182b368e6f5fe502de67d1a14267a857
Reviewed-on: https://chromium-review.googlesource.com/188740Reviewed-by: Shannon Woods <shannonwoods@chromium.org>
Reviewed-by: Jamie Madill <jmadill@chromium.org>
Tested-by: Geoff Lang <geofflang@chromium.org>

e977efc4

Port the TextureWrap sample to the new sample framework. · e9b02245

authored Mar 04, 2014

Refactor the generation of checkerboard textures since they're used by
this sample and MipMap2D.

BUG=angle:521

Change-Id: I1ba8bc4927a7944eb8efad0c8aa71eba4619e457
Reviewed-on: https://chromium-review.googlesource.com/188729Reviewed-by: Shannon Woods <shannonwoods@chromium.org>
Reviewed-by: Jamie Madill <jmadill@chromium.org>
Tested-by: Geoff Lang <geofflang@chromium.org>

e9b02245

Port the Stencil_Test sample to the new sample framework. · d3a4092d

authored Mar 04, 2014

Rename Stencil_Test to stencil_operations, a more fitting name for a
sample.

BUG=angle:521

Change-Id: I5412ecef12d80c3dbf54539bc7509678a35c44d5
Reviewed-on: https://chromium-review.googlesource.com/188728Reviewed-by: Shannon Woods <shannonwoods@chromium.org>
Reviewed-by: Jamie Madill <jmadill@chromium.org>
Tested-by: Geoff Lang <geofflang@chromium.org>

d3a4092d

Remove excess dereferences and casts. · 3b3ad1fe

authored Mar 05, 2014

The behaviour of dereferencing an array on the stack is the same as simply
using the array but it is counter-intuitive, error prone and requires a
cast to fit the required type.

Change-Id: Ib14e902293cf6dc71aaf944d57f53ea895a680ab
Reviewed-on: https://chromium-review.googlesource.com/188875Tested-by: Geoff Lang <geofflang@chromium.org>
Reviewed-by: Shannon Woods <shannonwoods@chromium.org>

3b3ad1fe

Fix off-by-one error with the number of storage mip levels. · 98705b7d

authored Mar 31, 2014

This caused there to be too few mip levels in the TextureStorage and it
would be discarded if there was a modification to a lower mip.

Also modified Texture::mipLevels to return the number of mip levels rather
than the index of the smallest mip to avoid confusion.

Fixes WebGL D3D9 conformance failures in:
    mipmap-fbo

BUG=angleproject:550

Change-Id: Idf3f543487232edceb520337331b39dab2bd26ba
Reviewed-on: https://chromium-review.googlesource.com/192341Reviewed-by: Nicolas Capens <nicolascapens@chromium.org>
Reviewed-by: Shannon Woods <shannonwoods@chromium.org>
Tested-by: Geoff Lang <geofflang@chromium.org>

98705b7d