AlexIndustrial/mesa
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

mesa/es: Validate ColorPointer types in Mesa code rather than the ES wrapper

Browse Source 
Signed-off-by: Ian Romanick <ian.d.romanick@intel.com>
This commit is contained in:
Ian Romanick
2012-07-25 14:53:01 -07:00
parent 28ee443d7b
commit 07ccfef8d1
2 changed files with 8 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/mesa/main/APIspec.xml
-7
View File
@@ -1222,13 +1222,6 @@
<desc name="size" error="GL_INVALID_VALUE">
<value name="4"/>
</desc>
<desc name="type">
<value name="GL_UNSIGNED_BYTE"/>
<value name="GL_FLOAT"/>
<value name="GL_FIXED"/>
<value name="GL_HALF_FLOAT_OES" category="OES_vertex_half_float"/>
</desc>
</template>
<template name="DisableClientState">
src/mesa/main/varray.c
+8 -7
View File
@@ -285,14 +285,15 @@ _mesa_NormalPointer(GLenum type, GLsizei stride, const GLvoid *ptr )
void GLAPIENTRY
_mesa_ColorPointer(GLint size, GLenum type, GLsizei stride, const GLvoid *ptr)
{
const GLbitfield legalTypes = (BYTE_BIT | UNSIGNED_BYTE_BIT |
SHORT_BIT | UNSIGNED_SHORT_BIT |
INT_BIT | UNSIGNED_INT_BIT |
HALF_BIT | FLOAT_BIT | DOUBLE_BIT |
FIXED_ES_BIT |
UNSIGNED_INT_2_10_10_10_REV_BIT |
INT_2_10_10_10_REV_BIT);
GET_CURRENT_CONTEXT(ctx);
const GLbitfield legalTypes = (ctx->API == API_OPENGLES)
? (UNSIGNED_BYTE_BIT | HALF_BIT | FLOAT_BIT | FIXED_ES_BIT)
: (BYTE_BIT | UNSIGNED_BYTE_BIT |
SHORT_BIT | UNSIGNED_SHORT_BIT |
INT_BIT | UNSIGNED_INT_BIT |
HALF_BIT | FLOAT_BIT | DOUBLE_BIT |
UNSIGNED_INT_2_10_10_10_REV_BIT |
INT_2_10_10_10_REV_BIT);
ASSERT_OUTSIDE_BEGIN_END_AND_FLUSH(ctx);
update_array(ctx, "glColorPointer", VERT_ATTRIB_COLOR0,