summaryrefslogtreecommitdiff
path: root/src/mesa/main
diff options
context:
space:
mode:
authorBrian Paul <brianp@vmware.com>2010-12-08 21:38:35 -0700
committerBrian Paul <brianp@vmware.com>2010-12-08 21:38:35 -0700
commit09a5e028a6d254f619132e302a96c8535018603d (patch)
treea6f560c78144cddfc6ee3de04e4d82f6b16cb119 /src/mesa/main
parent7404fa3f07a953343f2640fa97d82ab82ba5545d (diff)
mesa: simplify target checking for TexImage functions
Diffstat (limited to 'src/mesa/main')
-rw-r--r--src/mesa/main/teximage.c26
1 files changed, 18 insertions, 8 deletions
diff --git a/src/mesa/main/teximage.c b/src/mesa/main/teximage.c
index 74dc273121..c5ae63052a 100644
--- a/src/mesa/main/teximage.c
+++ b/src/mesa/main/teximage.c
@@ -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
- * 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
-legal_copyteximage_target(struct gl_context *ctx, GLuint dims, GLenum target)
+legal_texsubimage_target(struct gl_context *ctx, GLuint dims, GLenum target)
{
switch (dims) {
case 1:
@@ -1463,8 +1465,18 @@ legal_copyteximage_target(struct gl_context *ctx, GLuint dims, GLenum target)
default:
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:
+ return GL_FALSE;
+ }
default:
- _mesa_problem(ctx, "invalid dims=%u in legal_copyteximage_target()", dims);
+ _mesa_problem(ctx, "invalid dims=%u in legal_texsubimage_target()",
+ dims);
return GL_FALSE;
}
}
@@ -1856,7 +1868,7 @@ copytexture_error_check( struct gl_context *ctx, GLuint dimensions,
GLint format;
/* 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)",
dimensions, _mesa_lookup_enum_by_nr(target));
return GL_TRUE;
@@ -1982,8 +1994,7 @@ copytexsubimage_error_check1( struct gl_context *ctx, GLuint dimensions,
}
/* check target (proxies not allowed) */
- if (!legal_teximage_target(ctx, dimensions, target) ||
- _mesa_is_proxy_texture(target)) {
+ if (!legal_texsubimage_target(ctx, dimensions, target)) {
_mesa_error(ctx, GL_INVALID_ENUM, "glCopyTexSubImage%uD(target=%s)",
dimensions, _mesa_lookup_enum_by_nr(target));
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);
/* check target (proxies not allowed) */
- if (!legal_teximage_target(ctx, dims, target) ||
- _mesa_is_proxy_texture(target)) {
+ if (!legal_texsubimage_target(ctx, dims, target)) {
_mesa_error(ctx, GL_INVALID_ENUM, "glTexSubImage%uD(target=%s)",
dims, _mesa_lookup_enum_by_nr(target));
return;