diff options
Diffstat (limited to 'src/mesa/main/api_exec_es1.c')
| -rw-r--r-- | src/mesa/main/api_exec_es1.c | 71 |
1 files changed, 39 insertions, 32 deletions
diff --git a/src/mesa/main/api_exec_es1.c b/src/mesa/main/api_exec_es1.c index b29eb5a6d6..45cc19ce40 100644 --- a/src/mesa/main/api_exec_es1.c +++ b/src/mesa/main/api_exec_es1.c @@ -2,7 +2,7 @@ * THIS FILE AUTOMATICALLY GENERATED BY THE es_generator.py SCRIPT * API specification file: main/APIspec.xml * GLES version: GLES1.1 - * date: 2010-12-09 17:05:10 + * date: 2011-03-16 14:46:40 */ @@ -430,24 +430,17 @@ static void GL_APIENTRY _es_ClearColorx(GLclampx red, GLclampx green, GLclampx b _mesa_ClearColor(converted_red, converted_green, converted_blue, converted_alpha); } -extern void GL_APIENTRY _mesa_ClearDepth(GLclampd depth); -static void GL_APIENTRY _es_ClearDepthf(GLclampf depth) -{ - GLclampd converted_depth; - - converted_depth = (GLclampd) (depth); - - _mesa_ClearDepth(converted_depth); -} +extern void GL_APIENTRY _mesa_ClearDepthf(GLclampf depth); +#define _es_ClearDepthf _mesa_ClearDepthf -extern void GL_APIENTRY _mesa_ClearDepth(GLclampd depth); +extern void GL_APIENTRY _mesa_ClearDepthf(GLclampf depth); static void GL_APIENTRY _es_ClearDepthx(GLclampx depth) { - GLclampd converted_depth; + GLclampf converted_depth; - converted_depth = (GLclampd) (depth / 65536.0); + converted_depth = (GLclampf) (depth / 65536.0f); - _mesa_ClearDepth(converted_depth); + _mesa_ClearDepthf(converted_depth); } extern void GL_APIENTRY _mesa_ClearStencil(GLint s); @@ -787,28 +780,19 @@ static void GL_APIENTRY _es_DepthFunc(GLenum func) extern void GL_APIENTRY _mesa_DepthMask(GLboolean flag); #define _es_DepthMask _mesa_DepthMask -extern void GL_APIENTRY _mesa_DepthRange(GLclampd zNear, GLclampd zFar); -static void GL_APIENTRY _es_DepthRangef(GLclampf zNear, GLclampf zFar) -{ - GLclampd converted_zNear; - GLclampd converted_zFar; - - converted_zNear = (GLclampd) (zNear); - converted_zFar = (GLclampd) (zFar); +extern void GL_APIENTRY _mesa_DepthRangef(GLclampf zNear, GLclampf zFar); +#define _es_DepthRangef _mesa_DepthRangef - _mesa_DepthRange(converted_zNear, converted_zFar); -} - -extern void GL_APIENTRY _mesa_DepthRange(GLclampd zNear, GLclampd zFar); +extern void GL_APIENTRY _mesa_DepthRangef(GLclampf zNear, GLclampf zFar); static void GL_APIENTRY _es_DepthRangex(GLclampx zNear, GLclampx zFar) { - GLclampd converted_zNear; - GLclampd converted_zFar; + GLclampf converted_zNear; + GLclampf converted_zFar; - converted_zNear = (GLclampd) (zNear / 65536.0); - converted_zFar = (GLclampd) (zFar / 65536.0); + converted_zNear = (GLclampf) (zNear / 65536.0f); + converted_zFar = (GLclampf) (zFar / 65536.0f); - _mesa_DepthRange(converted_zNear, converted_zFar); + _mesa_DepthRangef(converted_zNear, converted_zFar); } extern void GL_APIENTRY _mesa_Disable(GLenum cap); @@ -4111,11 +4095,34 @@ static void GL_APIENTRY _es_TexImage2D(GLenum target, GLint level, GLint interna } switch(internalFormat) { case GL_ALPHA: + if (format != GL_ALPHA) { + _mesa_error(_mesa_get_current_context(), GL_INVALID_VALUE, "glTexImage2D(internalFormat=0x%x)", internalFormat); + return; + } + break; case GL_RGB: + if (format != GL_RGB) { + _mesa_error(_mesa_get_current_context(), GL_INVALID_VALUE, "glTexImage2D(internalFormat=0x%x)", internalFormat); + return; + } + break; case GL_RGBA: - case GL_BGRA_EXT: + if (format != GL_RGBA) { + _mesa_error(_mesa_get_current_context(), GL_INVALID_VALUE, "glTexImage2D(internalFormat=0x%x)", internalFormat); + return; + } + break; case GL_LUMINANCE: + if (format != GL_LUMINANCE) { + _mesa_error(_mesa_get_current_context(), GL_INVALID_VALUE, "glTexImage2D(internalFormat=0x%x)", internalFormat); + return; + } + break; case GL_LUMINANCE_ALPHA: + if (format != GL_LUMINANCE_ALPHA) { + _mesa_error(_mesa_get_current_context(), GL_INVALID_VALUE, "glTexImage2D(internalFormat=0x%x)", internalFormat); + return; + } break; default: _mesa_error(_mesa_get_current_context(), GL_INVALID_VALUE, "glTexImage2D(internalFormat=%d)", internalFormat); |