Commits · d38d66e49a77f0b84006c7e69964d93473892087 · Chen Yisong / angle

30 May, 2013 40 commits

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

Fix line endings in the Uniform source and header files to be UNIX-style. · 7e0904d3

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@2304 736b8ea6-26fd-11df-bfd4-992fa37f6226

7e0904d3

Add a helper routine to parse out uniform array indices. · 6d7b61c2

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@2303 736b8ea6-26fd-11df-bfd4-992fa37f6226

6d7b61c2

Add support for querying uniform block related enums. · f2d76f80

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@2302 736b8ea6-26fd-11df-bfd4-992fa37f6226

f2d76f80

Update the shader compiler/translator bison-generated source files with the latest cygwin releases. · 98c01b6a

authored May 30, 2013

TRAC #22934

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

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

98c01b6a

Fix the off-by-one errors in the indexed binding functions BindBufferBase and BindBufferRange. · d11158fa

authored May 30, 2013

TRAC #22958

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

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

d11158fa

Ensure non-zero transform feedback buffers must only be bound with an offset and… · a26aeaf1

authored May 30, 2013

Ensure non-zero transform feedback buffers must only be bound with an offset and size of a multiple of four.

TRAC #22958

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

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

a26aeaf1

Allow the application to implicitly create buffers by binding them at indexed… · e6e00792

authored May 30, 2013

Allow the application to implicitly create buffers by binding them at indexed binding points, without previously calling GenBuffers or BufferData.

TRAC #22958

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

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

e6e00792

Return correct GL version and GLSL ES version strings when we are running in an ES3 context. · e2865d02

authored May 30, 2013

TRAC #22865

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

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

e2865d02

Implement glGetStringi, for querying specific extension strings. · 302df74c

authored May 30, 2013

TRAC #22865

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

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

302df74c

Not not allow the app to query uniform locations of basic types with "[0]"… · 0ee85f88

authored May 30, 2013

Not not allow the app to query uniform locations of basic types with "[0]" appended to the uniform name.

TRAC #22865

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

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

0ee85f88

Implement glGetActiveUniformsiv, querying specific uniform properties. · 2a9a9d23

authored May 30, 2013

TRAC #22865

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

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

2a9a9d23

Implement GetUniformIndices, for retrieving active uniform indices from their names. · c2ed991c

authored May 30, 2013

TRAC #22865

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

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

c2ed991c

Add support for querying gl_DepthRange as an active uniform via GetActiveUniform. · 0329988b

authored May 30, 2013

TRAC #22865

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

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

0329988b

Fix binding of the generic uniform buffer bind point when setting the transform… · 7a1ebada

authored May 30, 2013

Fix binding of the generic uniform buffer bind point when setting the transform feedback binding point in BindBuffer.

TRAC #22852

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

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

7a1ebada

Add a path to BufferStorage11 to point to D3D11 constant buffer data storage for… · ce672484

authored May 30, 2013

Add a path to BufferStorage11 to point to D3D11 constant buffer data storage for uniform buffer objects.

TRAC #22852

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

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

ce672484

Add and implement Renderer::getMaxUniformBufferSize(), returning the maximum… · 33e798f5

authored May 30, 2013

Add and implement Renderer::getMaxUniformBufferSize(), returning the maximum uniform buffer/block size.

TRAC #22852

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

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

33e798f5

Call BufferStorage::markUsage when we retrieve a buffer pointer for rendering,… · 29233b29

authored May 30, 2013

Call BufferStorage::markUsage when we retrieve a buffer pointer for rendering, instead of when we prepare data.

The automatic call eliminates function calls from other points in the library.

TRAC #22852

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

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

29233b29

Redesign BufferStorage11 to support simultaneously managing constant buffers and… · 675526eb

authored May 30, 2013

Redesign BufferStorage11 to support simultaneously managing constant buffers and vertex/index buffers.

TRAC #22852

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

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

675526eb

Add a roundUp math utility function that rounds an integral value up to a nearest multiple. · 06d4e84f

authored May 30, 2013

TRAC #22852

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

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

06d4e84f

Add state queries for uniform buffer object count and alignment, and enforce a large alignment. · 97c3d501

authored May 30, 2013

This will allow us to force the app to bind uniform buffers with zero offset. Zero offset allows us to map
uniform blocks one-to-one to uniform buffers, then subsequently map UBOs to constant buffers.

TRAC #22852

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

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

97c3d501

Make the sentinel value for glBindBufferBase whole-buffer binding zero instead… · 3eeca1ec

authored May 30, 2013

Make the sentinel value for glBindBufferBase whole-buffer binding zero instead of -1, to harmonize with the spec.

TRAC #22852

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

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

3eeca1ec

Implemented mipmap generation for 3D textures. · 37b8a91a

authored May 30, 2013

TRAC #22926

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

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

37b8a91a