Commits · de3ed7043b930b54a4441e83d7ba53fac6d45fd4 · Chen Yisong / angle

05 Sep, 2014 6 commits

Use ImageIndex to return Texture attachment properties. · de3ed704

authored Sep 03, 2014

This and subsequent patches will eliminate the need for typed
attachments.

BUG=angle:732

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

de3ed704

Fix typo in "PixelShaderOuputVariable". · f6be8d7c

authored Sep 05, 2014

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

f6be8d7c

Drop support for the old "full multiplexed" MRT shaders. · f9479eff

authored Sep 05, 2014

This will simplify the code somewhat. It should no longer be
necessary now that we have the nVidia workaround.

BUG=angle:705

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

f9479eff

Enable MRT pixel shader rewriting. · 3f2e61de

authored Sep 05, 2014

Writing to all 8 pixel outputs was causing performance problems on
Intel and AMD. Enabling Geoff's work to rewrite our pixel shaders
solves the regression.

This patch also includes a workaround to the nVidia driver bug
where it would ignore NULL RT values in OMSetRenderTargets, by
compacting the RT list to skip NULL values.

BUG=angle:705
BUG=365078

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

3f2e61de

Use attachment binding points for dynamic PS key. · aef95dec

authored Sep 05, 2014

Because our output signature is only dependent on the arrangment
of the attachments, not the attachment type, use the output
layout key for now. If we need to, we could store both, in the
future.

BUG=angle:705

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

aef95dec

Declare commit_id a gyp 'hard_dependency'. · b33b4777

authored Sep 04, 2014

Hard dependencies are marked for static library targets, unlike
normal soft dependencies which the static libraries ignore. This
change ensures we run the commit_id script before compiling any
static libraries that depend on it.

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

b33b4777

04 Sep, 2014 1 commit

Fix MSVC librarian warning about no target machine. · 58f79422

authored Sep 04, 2014

We had the appropriate setting in our linker settings, but were
missing the entry in our librarian settings. The new static lib
target exposed the error.

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

58f79422

03 Sep, 2014 13 commits

Add a new TextureAttachment class to simplify FBO attachments. · 3592a338

authored Sep 03, 2014

This single class will eventually replace the four child classes.

BUG=angle:732

Change-Id: Ie2862b4458c8b1302ff4fc5fbe0e4ded3b81894d
Reviewed-on: https://chromium-review.googlesource.com/213857Reviewed-by: Brandon Jones <bajones@chromium.org>
Reviewed-by: Shannon Woods <shannonwoods@chromium.org>
Tested-by: Jamie Madill <jmadill@chromium.org>

3592a338

Add an ImageIndex helper struct to index into tex levels. · 945f7329

authored Sep 03, 2014

This encapsulates the three values needed to index into the image
array. It will simplify the logic for querying texture images from
the base calss.

BUG=angle:732

Change-Id: I31c55b3f972fd4d96ab540ec8498ef4b9b2ba16b
Reviewed-on: https://chromium-review.googlesource.com/213856Reviewed-by: Brandon Jones <bajones@chromium.org>
Reviewed-by: Shannon Woods <shannonwoods@chromium.org>
Tested-by: Jamie Madill <jmadill@chromium.org>

945f7329

Refactor Framebuffer::invalidateSub. · 6d708263

authored Sep 03, 2014

Use our new helper methods to simplify this method.

BUG=angle:732

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

6d708263

Use libANGLE to reduce duplicated ANGLE source compiles. · 04994ec4

authored Aug 28, 2014

libGLESv2_static and libGLESv2 can re-use the same object files.

BUG=angle:733

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

04994ec4

Retrieve render colorbuffers as a single vector. · ce20c7f1

authored Sep 03, 2014

Making all our render methods query FBO attachments for rendering
in one place will allow us to easily control the MRT peformance
workaround, and simplify the implementation.

BUG=angle:705

Change-Id: I6c476d45b81228d6ffe8831347443994237e3593
Reviewed-on: https://chromium-review.googlesource.com/215843Tested-by: Jamie Madill <jmadill@chromium.org>
Reviewed-by: Brandon Jones <bajones@chromium.org>

ce20c7f1

Mark shared and std140 UBOs as always active. · 04668675

authored Sep 03, 2014

This aligns ANGLE with the GL spec. With this fix, we pass
all of the dEQP conformance tests in Functional / Uniform
Buffer Object that don't rely on single buffers.

BUG=angle:507

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

04668675

Move CollectVariables to sh namespace. · a2fbb840

authored Sep 03, 2014

BUG=angle:466

Change-Id: I903ea840e333dfeb44f242a1759aed39974d0510
Reviewed-on: https://chromium-review.googlesource.com/213505Reviewed-by: Zhenyao Mo <zmo@chromium.org>
Reviewed-by: Nicolas Capens <capn@chromium.org>
Tested-by: Jamie Madill <jmadill@chromium.org>

a2fbb840

Use the CollectVariables path on the HLSL translator. · 54ad4f81

authored Sep 03, 2014

This approach consolidates our two methods, and lets us reuse the
same code for both methods of variable collection.

BUG=angle:466

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

54ad4f81

Compact the D3D shader specializations into one. · 2ad1dc48

authored Sep 03, 2014

BUG=angle:731

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

2ad1dc48

Move shader variables into the base impl. · d15250e6

authored Sep 03, 2014

These variable types apply across shader types. Either we'll want a
way to cache them after we query them, or we'll do a pre-parse pass
similar to our current Chromium GLSL to GLSL pre-pass where we store
the variables in ANGLE. In either case, they're shared across GL
implementations so make sense as queries from gl::Shader.

BUG=angle:731

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

d15250e6

Fix memory leaks in angle_unittests. · ab56c6ae

authored Sep 01, 2014

Call ShDestruct() to destroy the compiler objects to
avoid memory leaks.

BUG=angle:737

Change-Id: I71a8ddfe67c9d8c7b4e5b5683c69dd578fc38c66
Reviewed-on: https://chromium-review.googlesource.com/215860Reviewed-by: Jamie Madill <jmadill@chromium.org>
Tested-by: Sudarsana Nagineni <sudarsana.nagineni@intel.com>

ab56c6ae

Use GL-like methods for InvalidateFramebuffer calls. · 2d96b9eb

authored Aug 29, 2014

This will faciliate the MANGLE implementation.

BUG=angle:732

Change-Id: I0e4d569667e03305c9cca8d7c23154c70fb71eeb
Reviewed-on: https://chromium-review.googlesource.com/213854Tested-by: Jamie Madill <jmadill@chromium.org>
Reviewed-by: Brandon Jones <bajones@chromium.org>
Reviewed-by: Shannon Woods <shannonwoods@chromium.org>

2d96b9eb

Move logic of InvalidateFramebuffer to Framebuffer.cpp. · 400a4418

authored Aug 29, 2014

This method will translate to an implementation call.

BUG=angle:732

Change-Id: Ida1e3c9cccd94f7d166cc9a785708c12bfc52da5
Reviewed-on: https://chromium-review.googlesource.com/213853Tested-by: Jamie Madill <jmadill@chromium.org>
Reviewed-by: Brandon Jones <bajones@chromium.org>
Reviewed-by: Shannon Woods <shannonwoods@chromium.org>

400a4418

02 Sep, 2014 5 commits

Fix use of references with va_start · 8e7d7a30

authored Sep 02, 2014

BUG=angle:736

va_start behavior is undefined if the second parameter is a
function, array, or reference type. clang produces a warning
for this, while MSVC does not.

Change-Id: I0bc2805e312e3542aac816f10a257e2f1cfad128
Reviewed-on: https://chromium-review.googlesource.com/216010Reviewed-by: Jamie Madill <jmadill@chromium.org>
Reviewed-by: Nico Weber <thakis@chromium.org>
Tested-by: Nico Weber <thakis@chromium.org>

8e7d7a30

Replace getDepthStencil with getRenderTarget. · 685dd27a

authored Aug 29, 2014

In all places where we called this method, we treated a NULL return
value as an internal error. This implies to me that we don't need the
two getRenderTarget and getDepthStencil methods, since we aren't using
them to check if a surface is depth or stencil.

BUG=angle:732

Change-Id: I4d1dc148abf3383b1b101bbff4f4d22de27ad03e
Reviewed-on: https://chromium-review.googlesource.com/213852Tested-by: Jamie Madill <jmadill@chromium.org>
Reviewed-by: Brandon Jones <bajones@chromium.org>
Reviewed-by: Shannon Woods <shannonwoods@chromium.org>

685dd27a

Clean up Query classes. · 97d65b79

authored Aug 05, 2014

BUG=angle:717

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

97d65b79

Expand the SubData benchmark. · 2d8c879f

authored Aug 29, 2014

BUG=angle:705

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

2d8c879f

Added BufferSubData benchmark. · 33ea2f97

authored Aug 29, 2014

BUG=angle:705

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

33ea2f97

29 Aug, 2014 2 commits

Fix 64-bit use of Win32Window. · 0bab342b

authored Aug 29, 2014

An incorrect call to SetWindowLongPtr was crashing the 64-bit test.

BUG=angle:705

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

0bab342b

Converted ProgramBinary to use Context caps instead of Renderer · 43a53e24

authored Aug 28, 2014

BUG=angle:731
Change-Id: I9bbce69cabf767fb5fb2c94f437a9950bc79d1aa
Reviewed-on: https://chromium-review.googlesource.com/215370Tested-by: Brandon Jones <bajones@chromium.org>
Reviewed-by: Jamie Madill <jmadill@chromium.org>
Reviewed-by: Geoff Lang <geofflang@chromium.org>

43a53e24

28 Aug, 2014 13 commits

Use the specified Program instead of current in GetUniform. · a502c749

authored Aug 28, 2014

This bug slipped in with the GetUniform validation refactor.

BUG=angle:571

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

a502c749

Update validation functions to use new error mechanisms. · b1196687

authored Jul 23, 2014

BUG=angle:520

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

b1196687

Add caps for transform feedback limits from table 6.34. · 05881a0f

authored Jul 10, 2014

BUG=angle:658

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

05881a0f

Add caps for the aggregate shader limits from table 6.33. · 3a61c321

authored Jul 10, 2014

BUG=angle:658

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

3a61c321

Add a README file for the ANGLE github page. · a59b8ba4

authored Aug 27, 2014

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

a59b8ba4

Add a performance tests target. · ffcc2e62

authored Aug 26, 2014

Include a preliminary implementation of a simple benchmark app.

BUG=angle:705

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

ffcc2e62

Removed common_includes.h reordered includes. · 0b7eef7c

authored Jun 12, 2014

Since we are not using precompiled headers anymore, remove common_includes.h
so that fewer files are included in cpp files.

Reordered includes to be in the following order:
 1) Local ANGLE project headers, ordered by directory in descending depth
 2) GL headers
 3) STL headers
This helps enforce the include-what-you-use principal by reducing the
number of STL headers unexpectedly shared between files.

This include order conflicts with some of the Google c++ style guide
which states that STL includes should be first but this helps us catch
more issues.

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

0b7eef7c

Make OSWindow destructor virtual. · 44771099

authored Aug 28, 2014

BUG=angle:734

Change-Id: I6deb639abc26a314dd890189613e0a3a2e1be1d2
Reviewed-on: https://chromium-review.googlesource.com/214714Tested-by: Jamie Madill <jmadill@chromium.org>
Reviewed-by: Brandon Jones <bajones@chromium.org>

44771099

Moved DynamicHLSL into renderer/d3d · d8d72434

authored Aug 22, 2014

Obviously D3D-only class is obvious. :)

BUG=angle:731

Change-Id: Ide54e76a8b9bacb9b6834e2cb0a801140eecfe46
Reviewed-on: https://chromium-review.googlesource.com/213862Reviewed-by: Jamie Madill <jmadill@chromium.org>
Tested-by: Brandon Jones <bajones@chromium.org>

d8d72434

More shader refactor cleanup · 7162096e

authored Aug 20, 2014

Removed VertexShader and FragmentShader in favor of using a single Shader object
Used VertexShaderD3D and FragmentShaderD3D directly when appropriate.

BUG=angle:731
Change-Id: Ib1ffdf85ee0bfa7c88bb9ddb1029ccbd63a9dbe1
Reviewed-on: https://chromium-review.googlesource.com/213840Reviewed-by: Jamie Madill <jmadill@chromium.org>
Tested-by: Brandon Jones <bajones@chromium.org>

7162096e

Revert "Fixes a compilation error when ANGLE_DEFAULT_D3D11 is defined." · e3929050

authored Aug 28, 2014

The condition would always evaluate to true, since we define ANGLE_DEFAULT_D3D11 as zero.

This reverts commit 10f05630.

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

e3929050

Fix a compilation error for the ES3 CTS in 64bit. · b1319f62

authored Aug 28, 2014

The generated obj file was too large, it required an extra MSVC flag for
this particular project.

BUG=angle:497

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

b1319f62

Remove remnants of old PCH code. · ea24759f

authored Aug 28, 2014

Remove the precompiled.cpp file which was producing a build warning,
and rename the header to make it clear we no longer support PCH.

BUG=angle:

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

ea24759f