Commits · 4a643ae4fa6ec736ebe2693552aed80bcc316904 · Chen Yisong / angle

30 May, 2013 40 commits

Add support to the HLSL translator to output interface blocks to constant… · 4a643ae4

authored May 30, 2013

Add support to the HLSL translator to output interface blocks to constant buffers, using HLSL register packing rules.

TRAC #22930

Signed-off-by: Nicolas Capens
Signed-off-by: Geoff Lang
Author: Jamie Madill

git-svn-id: https://angleproject.googlecode.com/svn/branches/es3proto@2344 736b8ea6-26fd-11df-bfd4-992fa37f6226

4a643ae4

Add logic to compute the size and offsets of interface blocks stored in shared… · 61aaf24d

authored May 30, 2013

Add logic to compute the size and offsets of interface blocks stored in shared (packed) and standard layouts.

The shared layout follows the standard HLSL packing rules for optimal shader performance.

TRAC #22930

Signed-off-by: Nicolas Capens
Signed-off-by: Geoff Lang
Author: Jamie Madill

git-svn-id: https://angleproject.googlecode.com/svn/branches/es3proto@2343 736b8ea6-26fd-11df-bfd4-992fa37f6226

61aaf24d

Moved utilities.h/cpp and mathutils.h to the shared common code folder. · a2ecfccc

authored May 30, 2013

The HLSL translator needs to compute the sizes of various GL types for computing block layouts.

TRAC #22930

Signed-off-by: Nicolas Capens
Signed-off-by: Geoff Lang
Author: Jamie Madill

git-svn-id: https://angleproject.googlecode.com/svn/branches/es3proto@2342 736b8ea6-26fd-11df-bfd4-992fa37f6226

a2ecfccc

Add support for parsing interface blocks to the shader translator. · 5668c5d7

authored May 30, 2013

TRAC #22930

Signed-off-by: Nicolas Capens
Signed-off-by: Geoff Lang
Author: Jamie Madill

git-svn-id: https://angleproject.googlecode.com/svn/branches/es3proto@2341 736b8ea6-26fd-11df-bfd4-992fa37f6226

5668c5d7

Move the logic for parsing structs and index/field selection expressions from… · a9100887

authored May 30, 2013

Move the logic for parsing structs and index/field selection expressions from the grammar into TParseContext.

TRAC #22930

Signed-off-by: Nicolas Capens
Signed-off-by: Geoff Lang
Author: Jamie Madill

git-svn-id: https://angleproject.googlecode.com/svn/branches/es3proto@2340 736b8ea6-26fd-11df-bfd4-992fa37f6226

a9100887

Pass uniform buffers active bound to uniform blocks of the active program to… · 1bddfb98

authored May 30, 2013

Pass uniform buffers active bound to uniform blocks of the active program to HLSL/D3D constant buffers.

TRAC #22892

Signed-off-by: Nicolas Capens
Signed-off-by: Shannon Woods
Author: Jamie Madill

git-svn-id: https://angleproject.googlecode.com/svn/branches/es3proto@2339 736b8ea6-26fd-11df-bfd4-992fa37f6226

1bddfb98

Add uniform block linking between the API, the program binary, and the compiler. · 1500f093

authored May 30, 2013

TRAC #22892

Signed-off-by: Nicolas Capens
Signed-off-by: Shannon Woods
Author: Jamie Madill

git-svn-id: https://angleproject.googlecode.com/svn/branches/es3proto@2338 736b8ea6-26fd-11df-bfd4-992fa37f6226

1500f093

Ensure we have enough space in our reported max uniform buffer counts for our… · 2b544223

authored May 30, 2013

Ensure we have enough space in our reported max uniform buffer counts for our dedicated internal constant buffers.

TRAC #22892

Signed-off-by: Nicolas Capens
Signed-off-by: Shannon Woods
Author: Jamie Madill

git-svn-id: https://angleproject.googlecode.com/svn/branches/es3proto@2337 736b8ea6-26fd-11df-bfd4-992fa37f6226

2b544223

Properly validate struct uniform linking between the vertex and pixel shaders. · 7923dd2b

authored May 30, 2013

This also implements proper struct validation for uniform blocks.

TRAC #22932

Signed-off-by: Nicolas Capens
Signed-off-by: Geoff Lang
Author: Jamie Madill

git-svn-id: https://angleproject.googlecode.com/svn/branches/es3proto@2336 736b8ea6-26fd-11df-bfd4-992fa37f6226

7923dd2b

Implemented glInvalidateFramebuffer and glInvalidateSubFramebuffer. · d63ef891

authored May 30, 2013

TRAC #23133

Signed-off-by: Jamie Madill
Signed-off-by: Shannon Woods
Author: Geoff Lang

git-svn-id: https://angleproject.googlecode.com/svn/branches/es3proto@2335 736b8ea6-26fd-11df-bfd4-992fa37f6226

d63ef891

Added an abstract invalidate method to rx::RenderTarget. · 1654faf4

authored May 30, 2013

TRAC #23133

Signed-off-by: Jamie Madill
Signed-off-by: Shannon Woods
Author: Geoff Lang

git-svn-id: https://angleproject.googlecode.com/svn/branches/es3proto@2334 736b8ea6-26fd-11df-bfd4-992fa37f6226

1654faf4

Validate allocation size in PoolAllocator. · c796484e

authored May 30, 2013

Note that I am planning to get rid of PoolAllocator entirely.

BUG=crbug 179654

Review URL: https://codereview.appspot.com/8662046

git-svn-id: https://angleproject.googlecode.com/svn/branches/es3proto@2333 736b8ea6-26fd-11df-bfd4-992fa37f6226

c796484e

Store optimization level in program binaries and do not load those compiled with a different level. · f97a084f

authored May 30, 2013

Review URL: https://codereview.appspot.com/9427043


Conflicts:

	src/libGLESv2/renderer/Renderer9.cpp

git-svn-id: https://angleproject.googlecode.com/svn/branches/es3proto@2332 736b8ea6-26fd-11df-bfd4-992fa37f6226

f97a084f

Bump version.h for dx11proto. · 482eb95c

authored May 30, 2013

Review URL: https://codereview.appspot.com/9330043

git-svn-id: https://angleproject.googlecode.com/svn/branches/es3proto@2331 736b8ea6-26fd-11df-bfd4-992fa37f6226

482eb95c

Merge r2002 to dx11proto: Remove dependency on dwmapi.dll. · 9f913fb4

authored May 30, 2013

Review URL: https://codereview.appspot.com/9279048

git-svn-id: https://angleproject.googlecode.com/svn/branches/es3proto@2330 736b8ea6-26fd-11df-bfd4-992fa37f6226

9f913fb4

Add an extension describing the new D3D renderer chooser behavior in eglGetDisplay. · 807faf22

authored May 30, 2013

TRAC #23029

Author: Shannon Woods
Signed-off-by: Nicolas Capens

git-svn-id: https://angleproject.googlecode.com/svn/branches/es3proto@2329 736b8ea6-26fd-11df-bfd4-992fa37f6226

807faf22

Control the creation of DX9 or DX11 renderers through eglGetDisplay. · eff3a127

authored May 30, 2013

TRAC #23029
Signed-off-by: Jamie Madill
Signed-off-by: Shannon Woods
Author: Nicolas Capens

git-svn-id: https://angleproject.googlecode.com/svn/branches/es3proto@2328 736b8ea6-26fd-11df-bfd4-992fa37f6226

eff3a127

Removed old texture conversion functions. · 094cc410

authored May 30, 2013

TRAC #22972

Signed-off-by: Jamie Madill
Signed-off-by: Nicolas Capens
Author: Geoff Lang

git-svn-id: https://angleproject.googlecode.com/svn/branches/es3proto@2327 736b8ea6-26fd-11df-bfd4-992fa37f6226

094cc410

Replaced remaining uses of old texture conversion functions in gl entry points. · 8dcfc6ab

authored May 30, 2013

TRAC #22972

Signed-off-by: Jamie Madill
Signed-off-by: Nicolas Capens
Author: Geoff Lang

git-svn-id: https://angleproject.googlecode.com/svn/branches/es3proto@2326 736b8ea6-26fd-11df-bfd4-992fa37f6226

8dcfc6ab

Replaced remaining uses of old texture conversion functions in gl objects. · f6fb959e

authored May 30, 2013

TRAC #22972

Signed-off-by: Jamie Madill
Signed-off-by: Nicolas Capens
Author: Geoff Lang

git-svn-id: https://angleproject.googlecode.com/svn/branches/es3proto@2325 736b8ea6-26fd-11df-bfd4-992fa37f6226

f6fb959e

Replaced remaining uses of old texture conversion functions in rx objects. · 755012f4

authored May 30, 2013

TRAC #22972

Signed-off-by: Jamie Madill
Signed-off-by: Nicolas Capens
Author: Geoff Lang

git-svn-id: https://angleproject.googlecode.com/svn/branches/es3proto@2324 736b8ea6-26fd-11df-bfd4-992fa37f6226

755012f4

Renderer initializes the client version to 2 since the renderer is used to… · e9438a55

authored May 30, 2013

Renderer initializes the client version to 2 since the renderer is used to create a SwapChain object before the Context has been created and the client version is known.

TRAC #22972

Signed-off-by: Jamie Madill
Signed-off-by: Nicolas Capens
Author: Geoff Lang

git-svn-id: https://angleproject.googlecode.com/svn/branches/es3proto@2323 736b8ea6-26fd-11df-bfd4-992fa37f6226

e9438a55

Updated the RenderTarget and TextureStorage classes to use new texture format functions. · d38d66e4

authored May 30, 2013

TRAC #22972

Signed-off-by: Jamie Madill
Signed-off-by: Nicolas Capens
Author: Geoff Lang

git-svn-id: https://angleproject.googlecode.com/svn/branches/es3proto@2322 736b8ea6-26fd-11df-bfd4-992fa37f6226

d38d66e4

Texture storage classes determine the bind flags through the new helper methods. · adc56358

authored May 30, 2013

TRAC #22972

Signed-off-by: Jamie Madill
Signed-off-by: Nicolas Capens
Author: Geoff Lang

git-svn-id: https://angleproject.googlecode.com/svn/branches/es3proto@2321 736b8ea6-26fd-11df-bfd4-992fa37f6226

adc56358

Image9 and Image11 determine the d3d formats through the new helper methods. · 803be0a9

authored May 30, 2013

TRAC #22972

Signed-off-by: Jamie Madill
Signed-off-by: Nicolas Capens
Author: Geoff Lang

git-svn-id: https://angleproject.googlecode.com/svn/branches/es3proto@2320 736b8ea6-26fd-11df-bfd4-992fa37f6226

803be0a9

Replaced the Image::generateMipmap switch statements with function calls to get… · cead8ad7

authored May 30, 2013

Replaced the Image::generateMipmap switch statements with function calls to get the mip generation function.

TRAC #22972

Signed-off-by: Jamie Madill
Signed-off-by: Nicolas Capens
Author: Geoff Lang

git-svn-id: https://angleproject.googlecode.com/svn/branches/es3proto@2319 736b8ea6-26fd-11df-bfd4-992fa37f6226

cead8ad7

Removed the static Image data loading functions. · f73d40f8

authored May 30, 2013

TRAC #22972

Signed-off-by: Jamie Madill
Signed-off-by: Nicolas Capens
Author: Geoff Lang

git-svn-id: https://angleproject.googlecode.com/svn/branches/es3proto@2318 736b8ea6-26fd-11df-bfd4-992fa37f6226

f73d40f8

Image::loadCompressedData now uses new loading functions. · b8cabd59

authored May 30, 2013

TRAC #22972

Signed-off-by: Jamie Madill
Signed-off-by: Nicolas Capens
Author: Geoff Lang

git-svn-id: https://angleproject.googlecode.com/svn/branches/es3proto@2317 736b8ea6-26fd-11df-bfd4-992fa37f6226

b8cabd59

Texture image setting functions use the refactored texture conversion and loading functions. · 557aab05

authored May 30, 2013

TRAC #22972

Signed-off-by: Jamie Madill
Signed-off-by: Nicolas Capens
Author: Geoff Lang

git-svn-id: https://angleproject.googlecode.com/svn/branches/es3proto@2316 736b8ea6-26fd-11df-bfd4-992fa37f6226

557aab05

Put the renderer*_utils functions into the rx namespace. · ed0adcf6

authored May 30, 2013

TRAC #22972

Signed-off-by: Jamie Madill
Signed-off-by: Nicolas Capens
Author: Geoff Lang

git-svn-id: https://angleproject.googlecode.com/svn/branches/es3proto@2315 736b8ea6-26fd-11df-bfd4-992fa37f6226

ed0adcf6

Texture::setImage methods now have an internal format parameter, if the internal… · 4ad58e08

authored May 30, 2013

Texture::setImage methods now have an internal format parameter, if the internal format is unsized, a sized one is computed so that Texture classes always store sized internal formats.

TRAC #22972

Signed-off-by: Jamie Madill
Signed-off-by: Nicolas Capens
Author: Geoff Lang

git-svn-id: https://angleproject.googlecode.com/svn/branches/es3proto@2314 736b8ea6-26fd-11df-bfd4-992fa37f6226

4ad58e08

Created new helper functions for converting texture formats, loading images and… · b8490f3c

authored May 30, 2013

Created new helper functions for converting texture formats, loading images and generating mipmaps."

TRAC #22972

Signed-off-by: Jamie Madill
Signed-off-by: Nicolas Capens
Author: Geoff Lang

git-svn-id: https://angleproject.googlecode.com/svn/branches/es3proto@2313 736b8ea6-26fd-11df-bfd4-992fa37f6226

b8490f3c

Split the floating point texture queries into individual methods and mark all… · 89200d93

authored May 30, 2013

Split the floating point texture queries into individual methods and mark all support methods as const.

TRAC #22972

Signed-off-by: Jamie Madill
Signed-off-by: Nicolas Capens
Author: Geoff Lang

git-svn-id: https://angleproject.googlecode.com/svn/branches/es3proto@2312 736b8ea6-26fd-11df-bfd4-992fa37f6226

89200d93

Add support for querying number of active uniform blocks/block name max length… · e684b58a

authored May 30, 2013

Add support for querying number of active uniform blocks/block name max length from a program object.

TRAC #22858

Signed-off-by: Geoff Lang
Signed-off-by: Nicolas Capens
Author: Jamie Madill

git-svn-id: https://angleproject.googlecode.com/svn/branches/es3proto@2311 736b8ea6-26fd-11df-bfd4-992fa37f6226

e684b58a

Implement glGetActiveUniformBlockiv. · e7317ca8

authored May 30, 2013

TRAC #22858

Signed-off-by: Geoff Lang
Signed-off-by: Nicolas Capens
Author: Jamie Madill

git-svn-id: https://angleproject.googlecode.com/svn/branches/es3proto@2310 736b8ea6-26fd-11df-bfd4-992fa37f6226

e7317ca8

Implement glGetActiveUniformBlockName. · beb02783

authored May 30, 2013

TRAC #22858

Signed-off-by: Geoff Lang
Signed-off-by: Nicolas Capens
Author: Jamie Madill

git-svn-id: https://angleproject.googlecode.com/svn/branches/es3proto@2309 736b8ea6-26fd-11df-bfd4-992fa37f6226

beb02783

Implement UniformBlockBinding, and necessary state to track uniform block bindings on the API side. · 70eb1ea2

authored May 30, 2013

TRAC #22858

Signed-off-by: Geoff Lang
Signed-off-by: Nicolas Capens
Author: Jamie Madill

git-svn-id: https://angleproject.googlecode.com/svn/branches/es3proto@2308 736b8ea6-26fd-11df-bfd4-992fa37f6226

70eb1ea2

Implement the API-side logic GetUniformBlockIndex. Functionality depends on shader support. · 42766252

authored May 30, 2013

TRAC #22858

Signed-off-by: Geoff Lang
Signed-off-by: Nicolas Capens
Author: Jamie Madill

git-svn-id: https://angleproject.googlecode.com/svn/branches/es3proto@2307 736b8ea6-26fd-11df-bfd4-992fa37f6226

42766252

Add state for uniform blocks to ProgramBinary, along with loading and saving of… · d7784174

authored May 30, 2013

Add state for uniform blocks to ProgramBinary, along with loading and saving of the new binary format.

Updated Version.h with this patch.

TRAC #22858

Signed-off-by: Geoff Lang
Signed-off-by: Nicolas Capens
Author: Jamie Madill
Conflicts:

	src/common/version.h

git-svn-id: https://angleproject.googlecode.com/svn/branches/es3proto@2306 736b8ea6-26fd-11df-bfd4-992fa37f6226

d7784174

Refactor Uniform::[vp]sRegisterIndex to unsigned integers. · 38676dc1

authored May 30, 2013

TRAC #22858

Signed-off-by: Geoff Lang
Signed-off-by: Nicolas Capens
Author: Jamie Madill

git-svn-id: https://angleproject.googlecode.com/svn/branches/es3proto@2305 736b8ea6-26fd-11df-bfd4-992fa37f6226

38676dc1