From a8f475d8f6b56ddec36634437d007e06b48ff1cd Mon Sep 17 00:00:00 2001
From: Ian Romanick <ian.d.romanick@intel.com>
Date: Wed, 25 Jul 2012 15:13:51 -0700
Subject: mesa/es: Validate TexCoordPointer size in Mesa code rather than the
 ES wrapper

Signed-off-by: Ian Romanick <ian.d.romanick@intel.com>
---
 src/mesa/main/APIspec.xml | 6 ------
 src/mesa/main/varray.c    | 3 ++-
 2 files changed, 2 insertions(+), 7 deletions(-)

(limited to 'src/mesa/main')

diff --git a/src/mesa/main/APIspec.xml b/src/mesa/main/APIspec.xml
index c08a82be4c7..0316d4cee79 100644
--- a/src/mesa/main/APIspec.xml
+++ b/src/mesa/main/APIspec.xml
@@ -1339,12 +1339,6 @@
 		<param name="stride" type="GLsizei"/>
 		<param name="pointer" type="const GLvoid *"/>
 	</proto>
-
-	<desc name="size" error="GL_INVALID_VALUE">
-		<value name="2"/>
-		<value name="3"/>
-		<value name="4"/>
-	</desc>
 </template>
 
 <template name="VertexPointer">
diff --git a/src/mesa/main/varray.c b/src/mesa/main/varray.c
index aacc5c9c3f3..4269fd25da4 100644
--- a/src/mesa/main/varray.c
+++ b/src/mesa/main/varray.c
@@ -361,11 +361,12 @@ _mesa_TexCoordPointer(GLint size, GLenum type, GLsizei stride,
          HALF_BIT | FLOAT_BIT | DOUBLE_BIT |
          UNSIGNED_INT_2_10_10_10_REV_BIT |
          INT_2_10_10_10_REV_BIT);
+   const GLint sizeMin = (ctx->API == API_OPENGLES) ? 2 : 1;
    const GLuint unit = ctx->Array.ActiveTexture;
    ASSERT_OUTSIDE_BEGIN_END_AND_FLUSH(ctx);
 
    update_array(ctx, "glTexCoordPointer", VERT_ATTRIB_TEX(unit),
-                legalTypes, 1, 4,
+                legalTypes, sizeMin, 4,
                 size, type, stride, GL_FALSE, GL_FALSE,
                 ptr);
 }
-- 
cgit v1.2.3