diff options
| author | Laura Ekstrand <[email protected]> | 2015-03-04 11:03:18 -0800 |
|---|---|---|
| committer | Laura Ekstrand <[email protected]> | 2015-03-09 13:33:53 -0700 |
| commit | 8979368f12b96c28774119aff955e7f66a57b3fc (patch) | |
| tree | db4827da22afaf8226d3bdd1b680d148726339c1 | |
| parent | 1ee000a0b6737d6c140d4f07b6044908b8ebfdc7 (diff) | |
main: Remove redundant NumLayers checks.
ARB_direct_state_access texture functions that operate on cube maps no longer
need to verify that cube map texture objects contain six texture images
because _mesa_cube_level_complete now does that for them.
Reviewed-by: Anuj Phogat <[email protected]>
| -rw-r--r-- | src/mesa/main/texgetimage.c | 13 | ||||
| -rw-r--r-- | src/mesa/main/teximage.c | 14 |
2 files changed, 0 insertions, 27 deletions
diff --git a/src/mesa/main/texgetimage.c b/src/mesa/main/texgetimage.c index f975c160e39..42044ddb3e1 100644 --- a/src/mesa/main/texgetimage.c +++ b/src/mesa/main/texgetimage.c @@ -1088,19 +1088,6 @@ _mesa_GetTextureImage(GLuint texture, GLint level, GLenum format, /* Must handle special case GL_TEXTURE_CUBE_MAP. */ if (texObj->Target == GL_TEXTURE_CUBE_MAP) { - /* Error checking */ - if (texObj->NumLayers < 6) { - /* Not enough image planes for a cube map. The spec does not say - * what should happen in this case because the user has always - * specified each cube face separately (using - * GL_TEXTURE_CUBE_MAP_POSITIVE_X+i) in previous GL versions. - * This is addressed in Khronos Bug 13223. - */ - _mesa_error(ctx, GL_INVALID_OPERATION, - "glGetTextureImage(insufficient cube map storage)"); - return; - } - /* * What do we do if the user created a texture with the following code * and then called this function with its handle? diff --git a/src/mesa/main/teximage.c b/src/mesa/main/teximage.c index 611d664b6c0..cb1c81a44c1 100644 --- a/src/mesa/main/teximage.c +++ b/src/mesa/main/teximage.c @@ -3636,20 +3636,6 @@ texturesubimage(struct gl_context *ctx, GLuint dims, if (texObj->Target == GL_TEXTURE_CUBE_MAP) { GLint rowStride; - /* Error checking */ - if (texObj->NumLayers < 6) { - /* Not enough image planes for a cube map. The spec does not say - * what should happen in this case because the user has always - * specified each cube face separately (using - * GL_TEXTURE_CUBE_MAP_POSITIVE_X+i) in previous GL versions. - * This is addressed in Khronos Bug 13223. - */ - _mesa_error(ctx, GL_INVALID_OPERATION, - "glTextureSubImage%uD(insufficient cube map storage)", - dims); - return; - } - /* * What do we do if the user created a texture with the following code * and then called this function with its handle? |