Commits · 5d64cafab66b27344a4e93f0bc4178710edd1f28 · Chen Yisong / angle

24 Feb, 2014 12 commits

Fix multiple variables named i in the same scope. · 5d64cafa

authored Feb 11, 2014

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

5d64cafa

Implement texelFetch and texelFetchOffset. · fc01454b

authored Feb 18, 2014

BUG=angle:564

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

fc01454b

Fix redefinition of variables. · 5c9a29ab

authored Feb 11, 2014

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

5c9a29ab

Implement textureProjLod and textureProjLodOffset. · 2adc256a

authored Feb 14, 2014

BUG=angle:564

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

2adc256a

Implement textureProjOffset and textureLodOffset. · df86c6b9

authored Feb 14, 2014

BUG=angle:564

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

df86c6b9

Fix commit id versioning when building with Chrome. · 774b39ff

authored Feb 19, 2014

The GYP syntax would cause problems with the ninja build.

BUG=angle:529

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

774b39ff

Fix breaking the build with missing GetGlobalMaxTokenSize. · 5508f39d

authored Feb 20, 2014

Because the preprocessor is used independently from the compiler,
we need a way to track max token size when we don't have access
to the parse context with the current spec.

BUG=angle:550

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

5508f39d

Use generic sampler types to compact symbol table initialization. · 4fd5e4a3

authored Feb 14, 2014

BUG=angle:564

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

4fd5e4a3

Fix incorrect cast. · 7bee6395

authored Feb 11, 2014

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

7bee6395

Define generic sampler types. · 759b994b

authored Feb 14, 2014

BUG=angle:564

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

759b994b

Simplify the creation of global types. · c9508842

authored Feb 14, 2014

BUG=angle:564

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

c9508842

Add functionality to create and destroy TransformFeedback objects. · c8058451

authored Feb 03, 2014

BUG=angle:491

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

c8058451

20 Feb, 2014 5 commits

Regenerate public projects. · 92877af5

authored Feb 20, 2014

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

92877af5

Remove dependence on dxguid.lib for release builds. · 8e32884a

authored Feb 10, 2014

BUG=angle:559

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

8e32884a

Detect cross-process HWNDs and verify DXGI 1.2 exists in D3D11. · 94a9089b

authored Feb 18, 2014

DXGI 1.2 is required to create a swap chain for a HWND owned by another
process.  This fix will allow us to fall back to creating a Renderer9 if
DXGI 1.2 is not available instead of failing to create the swap chain
later.

BUG=angle:562

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

94a9089b

Fix git call syntax in commit_id.bat · ac97d59f

authored Feb 19, 2014

BUG=angle:566

Change-Id: I437bdec916dbfe12cb310a20d4f38c18072eacd0
Reviewed-on: https://chromium-review.googlesource.com/187210Reviewed-by: Jamie Madill <jmadill@chromium.org>
Tested-by: Shannon Woods <shannonwoods@chromium.org>
(cherry picked from commit aacedfcf)
Reviewed-on: https://chromium-review.googlesource.com/187201Reviewed-by: Shannon Woods <shannonwoods@chromium.org>

ac97d59f

Fix standalone Linux build. · e78603b5

authored Feb 19, 2014

We can include Makefiles in the ignore list, and need a few extra
flags to fix the GCC build on Linux.

BUG=angle:563

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

e78603b5

19 Feb, 2014 8 commits

Implement EXT_blend_minmax. · 496123fd

authored Feb 12, 2014

BUG=angle:555

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

496123fd

Add defines to enable or disable specific renderers. · 2a419244

authored Feb 10, 2014

BUG=angle:559

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

2a419244

Proper support for token max size in WebGL+ES3. · 88f6e946

authored Feb 19, 2014

WebGL specifies a maximum token size of 256 characters, while
ES3 specifies 1024 characters. We can determine the proper max
size to support from the spec.

BUG=angle:550
Change-Id: I6aeabe8af3b6184a27b456248ce2f84f361b76e4
Reviewed-on: https://chromium-review.googlesource.com/186973Reviewed-by: Shannon Woods <shannonwoods@chromium.org>
Tested-by: Jamie Madill <jmadill@chromium.org>

88f6e946

Don't include symbols in release builds of the public projects. · 16851c87

authored Feb 10, 2014

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

16851c87

Add preprocess bison files to the gyp files. · c9f140d8

authored Feb 18, 2014

We had accidentally left out the y and l files from our generation
scripts, causing us to miss several instances of updated enum names.

BUG=angle:550
Change-Id: I8790742fbaab5435e4c0db4f61c3e8194a231550
Reviewed-on: https://chromium-review.googlesource.com/186972Reviewed-by: Nicolas Capens <nicolascapens@chromium.org>
Tested-by: Jamie Madill <jmadill@chromium.org>

c9f140d8

Fix unsized formats in GenerateMipmap. · 61b54433

authored Feb 18, 2014

We had accidentally blocked mipmap generation for all unsized
formats in ES3, because they were marked as non-renderable.
The spec specifically allows for mipmaps with unsized formats
in GenerateMipmap.

BUG=angle:550
Change-Id: Iee7eddd011f4fe86b690422723620593f8049ba6
Reviewed-on: https://chromium-review.googlesource.com/186971Reviewed-by: Shannon Woods <shannonwoods@chromium.org>
Tested-by: Jamie Madill <jmadill@chromium.org>

61b54433

Fix bugged tokens marked as reserved/free in ES2. · 5c55caf3

authored Feb 18, 2014

We had accidentally marked 'smoooth', 'centroid' and 'case'
as reserved in ES2, when they are available as identifiers.
Additionally 'sampler2DShadow' was marked as free, instead
of reserved.

BUG=angle:550

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

5c55caf3

Enable GPU dynamic conversion for unnormalized int formats. · d2d648cc

authored Jan 29, 2014

This patch turns on the dynamic conversion logic for integer formats
that we must convert to floating point for ESSL 1.0 compatibility. The
converted formats are 1, 2 and 4 channel unnormalized integer.

BUG=angle:560
Change-Id: I3bcc45f1103290613029bc54fdd6012dddb0a03d
Reviewed-on: https://chromium-review.googlesource.com/186700Reviewed-by: Geoff Lang <geofflang@chromium.org>
Reviewed-by: Shannon Woods <shannonwoods@chromium.org>
Tested-by: Jamie Madill <jmadill@chromium.org>

d2d648cc

18 Feb, 2014 1 commit

Refactor HLSL compilation out of Renderer. · dad5ed39

authored Feb 10, 2014

This moves the start-up and tear-down code for D3DCompiler.dll into an object
that Renderer9 and Renderer11 use.  This will help future efforts to remove
references to HLSL at the GL/Renderer interface level.

BUG=angle:558

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

dad5ed39

14 Feb, 2014 7 commits

Add logic for dynamic converstion of int to float vertex data. · 8664b063

authored Feb 14, 2014

We can use the format tables and input layout to determine when we need
to generate conversion code in the vertex shader.

BUG=angle:560
Change-Id: Ib64fb16823bf78ed6432fba283b0d24bcb673a76
Reviewed-on: https://chromium-review.googlesource.com/185195Reviewed-by: Geoff Lang <geofflang@chromium.org>
Tested-by: Jamie Madill <jmadill@chromium.org>

8664b063

Add logic for inserting vertex conversion code in HLSL. · c5ede1a7

authored Feb 14, 2014

The patch refactors the vertex input HLSL to allow for dynamic
conversion in the future. Using a placehold keyword, the code
replaces that stub with the vertex input conversion logic.

BUG=angle:560
Change-Id: I100c50cb4decd45b0f0c10d7c2c22583368b773e
Reviewed-on: https://chromium-review.googlesource.com/185194Reviewed-by: Nicolas Capens <nicolascapens@chromium.org>
Tested-by: Jamie Madill <jmadill@chromium.org>

c5ede1a7

Store un-linked shader attributes in ProgramBinary. · 2c7d84ac

authored Feb 14, 2014

Our caching of compiled vertex shaders according to their input
signature needs a consistent input signature to match up shaders.
Since the linking step currently shuffles attributes according
to API specified locations we need a separate list.

BUG=angle:560
Change-Id: Icc4d5df1d37ae895d5c882b86e60f05b5c268461
Reviewed-on: https://chromium-review.googlesource.com/185193Reviewed-by: Geoff Lang <geofflang@chromium.org>
Tested-by: Jamie Madill <jmadill@chromium.org>

2c7d84ac

Store multiple vertex executables in the program binary. · c5a83000

authored Feb 14, 2014

With dynamic vertex conversion the GPU, we will have different input
layouts resulting in different executables. This patch adds a way
of mapping the input layouts to vertex executables.

BUG=angle:560
Change-Id: Ie36f2f8ac2dfcb96f562af577d31f57d6d89b447
Reviewed-on: https://chromium-review.googlesource.com/185192Reviewed-by: Geoff Lang <geofflang@chromium.org>
Tested-by: Jamie Madill <jmadill@chromium.org>

c5a83000

Moved all HLSL-related code from ProgramBinary to DynamicHLSL. · 5f562735

authored Feb 14, 2014

DynamicHLSL encapsulates all HLSL generation we need outside the
the shader translator, such as for linking between input and output
stages and point sprite geometry shaders.

BUG=angle:560
Change-Id: Ib5079aa102000a7c37b166bcbe26b09cc82f8932
Reviewed-on: https://chromium-review.googlesource.com/185191Reviewed-by: Geoff Lang <geofflang@chromium.org>
Tested-by: Jamie Madill <jmadill@chromium.org>

5f562735

Optimize masked clearing of missing channels. · e8bc3193

authored Feb 14, 2014

Instead of doing a masked clear when a texture has mismatched channel
counts, set the clear color to the default for the missing channels and do
a regular clear.

This catches es3proto up to master in terms of clear performance.

BUG=angle:557

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

e8bc3193

Merge 'Tie program binary version to commit hash.' · 0aa84f63

authored Feb 13, 2014

Port changes from master branch with commit hash embedding
to the development branch.

BUG=angle:529
Change-Id: I307bf44103913aaaeb875a2e3ade1fab77838c48
Reviewed-on: https://chromium-review.googlesource.com/186390Reviewed-by: Shannon Woods <shannonwoods@chromium.org>
Reviewed-by: Geoff Lang <geofflang@chromium.org>
Tested-by: Jamie Madill <jmadill@chromium.org>

0aa84f63

13 Feb, 2014 1 commit

Align static and streaming vertex data to 16-byte boundaries. · 5f6937ca

authored Feb 12, 2014

Certain vertex formats using fewer than 4 bytes could confuse our
buffer code, giving us improperly aligned offsets. Aligning vertex
data across the board should fix the problem, and minimal cost.

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

5f6937ca

12 Feb, 2014 4 commits

Add an option to initialize varyings without static use in vertex shaders · 4a667fe9

authored Feb 11, 2014

ANGLEBUG=554
TEST=webgl conformance test on mac: shaders-with-varyings.html
r=kbr@chromium.org,nicolascapens@chromium.org
cc=alokp@chromium.org,shannonwoods@chromium.org

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

Conflicts:
	src/common/version.h
	src/compiler/translator/Compiler.cpp
Change-Id: If7db13ef345bd6199d4ea0d7786f0de20885f2f3
Reviewed-on: https://chromium-review.googlesource.com/186144Reviewed-by: Nicolas Capens <nicolascapens@chromium.org>
Reviewed-by: Kenneth Russell <kbr@chromium.org>
Reviewed-by: Zhenyao Mo <zmo@chromium.org>
Tested-by: Zhenyao Mo <zmo@chromium.org>

4a667fe9

Fix checking for a NULL pointer after using the pointer. · 32d508e2

authored Feb 11, 2014

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

32d508e2

Fix depth texture validation in ES2 contexts. · 2a20562f

authored Feb 12, 2014

We were checking for extra conditions that apply to ES3 within all
ES2 contexts, causing the webgl depth texture conformance test to
fail.

BUG=angle:550

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

2a20562f

Move ShaderCache.h to the d3d directory. · 7ea42a55

authored Feb 10, 2014

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

7ea42a55

11 Feb, 2014 2 commits

Fix variable being used to initialize itself. · 0bf3a982

authored Feb 11, 2014

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

0bf3a982

Mark destructors of Surface and Context as virtual. · a4de2657

authored Feb 11, 2014

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

a4de2657