OpenHarmony/third_party_mesa3d
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

mesa/es: Validate glFramebufferTexture2D textarget in Mesa code rather than the ES wrapper

Browse Source 
v2: Add proper core-profile and GLES3 filtering.

v3: Change !_mesa_is_desktop_gl tests to _mesa_is_gles test.  The test
around GL_TEXTURE_2D_ARRAY got some other changes because that enum is
also available with GLES3 (which uses API_OPENGLES2).  Based on review
feedback from Eric Anholt.

Signed-off-by: Ian Romanick <ian.d.romanick@intel.com>
This commit is contained in:
Ian Romanick
2012-07-27 07:22:41 -07:00
parent 2809ae3d44
commit 7f991d26ad
2 changed files with 4 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/mesa/main/APIspec.xml
View File

@@ -2169,22 +2169,6 @@
<param name="texture" type="GLuint"/> <param name="texture" type="GLuint"/>
<param name="level" type="GLint"/> <param name="level" type="GLint"/>
</proto> </proto>
<desc name="textarget" error="GL_INVALID_OPERATION">
<value name="GL_TEXTURE_2D"/>
<value name="GL_TEXTURE_CUBE_MAP_POSITIVE_X" category="GLES2.0"/>
<value name="GL_TEXTURE_CUBE_MAP_POSITIVE_Y" category="GLES2.0"/>
<value name="GL_TEXTURE_CUBE_MAP_POSITIVE_Z" category="GLES2.0"/>
<value name="GL_TEXTURE_CUBE_MAP_NEGATIVE_X" category="GLES2.0"/>
<value name="GL_TEXTURE_CUBE_MAP_NEGATIVE_Y" category="GLES2.0"/>
<value name="GL_TEXTURE_CUBE_MAP_NEGATIVE_Z" category="GLES2.0"/>
<value name="GL_TEXTURE_CUBE_MAP_POSITIVE_X_OES" category="OES_texture_cube_map"/>
<value name="GL_TEXTURE_CUBE_MAP_POSITIVE_Y_OES" category="OES_texture_cube_map"/>
<value name="GL_TEXTURE_CUBE_MAP_POSITIVE_Z_OES" category="OES_texture_cube_map"/>
<value name="GL_TEXTURE_CUBE_MAP_NEGATIVE_X_OES" category="OES_texture_cube_map"/>
<value name="GL_TEXTURE_CUBE_MAP_NEGATIVE_Y_OES" category="OES_texture_cube_map"/>
<value name="GL_TEXTURE_CUBE_MAP_NEGATIVE_Z_OES" category="OES_texture_cube_map"/>
</desc>
<!-- According to the base specification, "level" must be 0. But <!-- According to the base specification, "level" must be 0. But
extension GL_OES_fbo_render_mipmap lifts that restriction, extension GL_OES_fbo_render_mipmap lifts that restriction,
so no restriction is placed here. --> so no restriction is placed here. -->

6
src/mesa/main/fbobject.c
View File

@@ -2137,7 +2137,8 @@ _mesa_FramebufferTexture2DEXT(GLenum target, GLenum attachment,
error = GL_FALSE; error = GL_FALSE;
break; break;
case GL_TEXTURE_RECTANGLE: case GL_TEXTURE_RECTANGLE:
error = !ctx->Extensions.NV_texture_rectangle; error = _mesa_is_gles(ctx)
|| !ctx->Extensions.NV_texture_rectangle;
break; break;
case GL_TEXTURE_CUBE_MAP_POSITIVE_X: case GL_TEXTURE_CUBE_MAP_POSITIVE_X:
case GL_TEXTURE_CUBE_MAP_NEGATIVE_X: case GL_TEXTURE_CUBE_MAP_NEGATIVE_X:
@@ -2148,7 +2149,8 @@ _mesa_FramebufferTexture2DEXT(GLenum target, GLenum attachment,
error = !ctx->Extensions.ARB_texture_cube_map; error = !ctx->Extensions.ARB_texture_cube_map;
break; break;
case GL_TEXTURE_2D_ARRAY: case GL_TEXTURE_2D_ARRAY:
error = !ctx->Extensions.EXT_texture_array; error = (_mesa_is_gles(ctx) && ctx->Version < 30)
|| !ctx->Extensions.EXT_texture_array;
break; break;
default: default:
error = GL_TRUE; error = GL_TRUE;