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

mesa: simplify target checking for TexImage functions

Browse Source
This commit is contained in:
Brian Paul
2010-12-08 21:38:35 -07:00
parent 7404fa3f07
commit 09a5e028a6
1 changed files with 18 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
src/mesa/main/teximage.c
View File

@@ -1437,10 +1437,12 @@ legal_teximage_target(struct gl_context *ctx, GLuint dims, GLenum target)
/** /**
* Check if the given texture target value is legal for a * Check if the given texture target value is legal for a
* glCopyTexImage1/2D call. * glTexSubImage, glCopyTexSubImage or glCopyTexImage call.
* The difference compared to legal_teximage_target() above is that
* proxy targets are not supported.
*/ */
static GLboolean static GLboolean
legal_copyteximage_target(struct gl_context *ctx, GLuint dims, GLenum target) legal_texsubimage_target(struct gl_context *ctx, GLuint dims, GLenum target)
{ {
switch (dims) { switch (dims) {
case 1: case 1:
@@ -1463,8 +1465,18 @@ legal_copyteximage_target(struct gl_context *ctx, GLuint dims, GLenum target)
default: default:
return GL_FALSE; return GL_FALSE;
} }
case 3:
switch (target) {
case GL_TEXTURE_3D:
return GL_TRUE;
case GL_TEXTURE_2D_ARRAY_EXT:
return ctx->Extensions.MESA_texture_array;
default: default:
_mesa_problem(ctx, "invalid dims=%u in legal_copyteximage_target()", dims); return GL_FALSE;
}
default:
_mesa_problem(ctx, "invalid dims=%u in legal_texsubimage_target()",
dims);
return GL_FALSE; return GL_FALSE;
} }
} }
@@ -1856,7 +1868,7 @@ copytexture_error_check( struct gl_context *ctx, GLuint dimensions,
GLint format; GLint format;
/* check target */ /* check target */
if (!legal_copyteximage_target(ctx, dimensions, target)) { if (!legal_texsubimage_target(ctx, dimensions, target)) {
_mesa_error(ctx, GL_INVALID_ENUM, "glCopyTexImage%uD(target=%s)", _mesa_error(ctx, GL_INVALID_ENUM, "glCopyTexImage%uD(target=%s)",
dimensions, _mesa_lookup_enum_by_nr(target)); dimensions, _mesa_lookup_enum_by_nr(target));
return GL_TRUE; return GL_TRUE;
@@ -1982,8 +1994,7 @@ copytexsubimage_error_check1( struct gl_context *ctx, GLuint dimensions,
} }
/* check target (proxies not allowed) */ /* check target (proxies not allowed) */
if (!legal_teximage_target(ctx, dimensions, target) || if (!legal_texsubimage_target(ctx, dimensions, target)) {
_mesa_is_proxy_texture(target)) {
_mesa_error(ctx, GL_INVALID_ENUM, "glCopyTexSubImage%uD(target=%s)", _mesa_error(ctx, GL_INVALID_ENUM, "glCopyTexSubImage%uD(target=%s)",
dimensions, _mesa_lookup_enum_by_nr(target)); dimensions, _mesa_lookup_enum_by_nr(target));
return GL_TRUE; return GL_TRUE;
@@ -2579,8 +2590,7 @@ texsubimage(struct gl_context *ctx, GLuint dims, GLenum target, GLint level,
_mesa_lookup_enum_by_nr(type), pixels); _mesa_lookup_enum_by_nr(type), pixels);
/* check target (proxies not allowed) */ /* check target (proxies not allowed) */
if (!legal_teximage_target(ctx, dims, target) || if (!legal_texsubimage_target(ctx, dims, target)) {
_mesa_is_proxy_texture(target)) {
_mesa_error(ctx, GL_INVALID_ENUM, "glTexSubImage%uD(target=%s)", _mesa_error(ctx, GL_INVALID_ENUM, "glTexSubImage%uD(target=%s)",
dims, _mesa_lookup_enum_by_nr(target)); dims, _mesa_lookup_enum_by_nr(target));
return; return;