commit f2d76f80850ed4a7184f33fa0dbfbc0c47144525
author shannonwoods@chromium.org <shannonwoods@chromium.org@736b8ea6-26fd-11df-bfd4-992fa37f6226> Thu May 30 00:06:32 2013 +0000
committer shannonwoods@chromium.org <shannonwoods@chromium.org@736b8ea6-26fd-11df-bfd4-992fa37f6226> Thu May 30 00:06:32 2013 +0000
tree 57d7b2cdeb3312dc280fca37fd9e4826db8cf3e4
parent 98c01b6ab84fa71a65d1a9818263189fce9c7222

Add support for querying uniform block related enums.

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

src/libGLESv2/Context.cpp

diff --git a/src/libGLESv2/Context.cpp b/src/libGLESv2/Context.cpp
index 2deec40..0d5fa72 100644
--- a/src/libGLESv2/Context.cpp
+++ b/src/libGLESv2/Context.cpp
@@ -1507,6 +1507,9 @@
       case GL_MAX_ARRAY_TEXTURE_LAYERS:         *params = getMaximum2DArrayTextureLayers();            break;
       case GL_UNIFORM_BUFFER_OFFSET_ALIGNMENT:  *params = getUniformBufferOffsetAlignment();           break;
       case GL_MAX_UNIFORM_BUFFER_BINDINGS:      *params = getMaximumCombinedUniformBufferBindings();   break;
+      case GL_MAX_VERTEX_UNIFORM_BLOCKS:        *params = mRenderer->getMaxVertexShaderUniformBuffers(); break;
+      case GL_MAX_FRAGMENT_UNIFORM_BLOCKS:      *params = mRenderer->getMaxFragmentShaderUniformBuffers(); break;
+      case GL_MAX_COMBINED_UNIFORM_BLOCKS:      *params = getMaximumCombinedUniformBufferBindings();   break;
       case GL_NUM_COMPRESSED_TEXTURE_FORMATS:   
         params[0] = mNumCompressedTextureFormats;
         break;
@@ -1940,6 +1943,9 @@
       case GL_TEXTURE_BINDING_2D_ARRAY:
       case GL_MAX_3D_TEXTURE_SIZE:
       case GL_MAX_ARRAY_TEXTURE_LAYERS:
+      case GL_MAX_VERTEX_UNIFORM_BLOCKS:
+      case GL_MAX_FRAGMENT_UNIFORM_BLOCKS:
+      case GL_MAX_COMBINED_UNIFORM_BLOCKS:
         {
             *type = GL_INT;
             *numParams = 1;