diff options
| author | Ian Romanick <[email protected]> | 2013-01-16 15:34:49 -0800 |
|---|---|---|
| committer | Ian Romanick <[email protected]> | 2013-01-17 10:47:46 -0800 |
| commit | ca39c0f94a4e3cc25b6cc9507fb729b85140733a (patch) | |
| tree | 8e602b5c5d9e8435a4964ee809a4ba0f91e647bf | |
| parent | 311cc5d973115465cb7b0e272702e14124478ded (diff) | |
mesa/es3: Don't check dimensions in _mesa_es3_error_check_format_and_type
Filtering of DEPTH_COMPONENT and DEPTH_STENCIL for TEXTURE_3D is already
done in texture_error_check because these combinations aren't allowed on
desktop GL either.
Signed-off-by: Ian Romanick <[email protected]>
Reviewed-by: Kenneth Graunke <[email protected]>
Reviewed-by: Anuj Phogat <[email protected]>
| -rw-r--r-- | src/mesa/main/glformats.c | 9 | ||||
| -rw-r--r-- | src/mesa/main/glformats.h | 3 | ||||
| -rw-r--r-- | src/mesa/main/teximage.c | 3 |
3 files changed, 3 insertions, 12 deletions
diff --git a/src/mesa/main/glformats.c b/src/mesa/main/glformats.c index 7969f77a4e3..3004c08e283 100644 --- a/src/mesa/main/glformats.c +++ b/src/mesa/main/glformats.c @@ -1697,8 +1697,7 @@ _mesa_es_error_check_format_and_type(GLenum format, GLenum type, */ GLenum _mesa_es3_error_check_format_and_type(GLenum format, GLenum type, - GLenum internalFormat, - unsigned dimensions) + GLenum internalFormat) { GLboolean type_valid = GL_TRUE; @@ -2068,9 +2067,6 @@ _mesa_es3_error_check_format_and_type(GLenum format, GLenum type, break; case GL_DEPTH_COMPONENT: - if (dimensions != 2) { - return GL_INVALID_OPERATION; - } switch (type) { case GL_UNSIGNED_SHORT: if (internalFormat != GL_DEPTH_COMPONENT16) @@ -2098,9 +2094,6 @@ _mesa_es3_error_check_format_and_type(GLenum format, GLenum type, break; case GL_DEPTH_STENCIL: - if (dimensions != 2) { - return GL_INVALID_OPERATION; - } switch (type) { case GL_UNSIGNED_INT_24_8: if (internalFormat != GL_DEPTH24_STENCIL8) diff --git a/src/mesa/main/glformats.h b/src/mesa/main/glformats.h index 4cbc82f5e01..cdd2b942716 100644 --- a/src/mesa/main/glformats.h +++ b/src/mesa/main/glformats.h @@ -122,8 +122,7 @@ _mesa_es_error_check_format_and_type(GLenum format, GLenum type, extern GLenum _mesa_es3_error_check_format_and_type(GLenum format, GLenum type, - GLenum internalFormat, - unsigned dimensions); + GLenum internalFormat); #ifdef __cplusplus diff --git a/src/mesa/main/teximage.c b/src/mesa/main/teximage.c index 99b145ef77d..b2fb41bb624 100644 --- a/src/mesa/main/teximage.c +++ b/src/mesa/main/teximage.c @@ -1896,8 +1896,7 @@ texture_error_check( struct gl_context *ctx, if (_mesa_is_gles(ctx)) { if (_mesa_is_gles3(ctx)) { err = _mesa_es3_error_check_format_and_type(format, type, - internalFormat, - dimensions); + internalFormat); } else { if (format != internalFormat) { _mesa_error(ctx, GL_INVALID_OPERATION, |