From ca39c0f94a4e3cc25b6cc9507fb729b85140733a Mon Sep 17 00:00:00 2001 From: Ian Romanick Date: Wed, 16 Jan 2013 15:34:49 -0800 Subject: 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 Reviewed-by: Kenneth Graunke Reviewed-by: Anuj Phogat --- src/mesa/main/glformats.c | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) (limited to 'src/mesa/main/glformats.c') 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) -- cgit v1.2.3