KonstantinSeurer
/
mesa
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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 <ian.d.romanick@intel.com>
Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
Reviewed-by: Anuj Phogat <anuj.phogat@gmail.com>
This commit is contained in:
Ian Romanick 2013-01-16 15:34:49 -08:00
parent 311cc5d973
commit ca39c0f94a
3 changed files with 3 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/mesa/main/glformats.c
View File

@ -1697,8 +1697,7 @@ _mesa_es_error_check_format_and_type(GLenum format, GLenum type,
*/ */
GLenum GLenum
_mesa_es3_error_check_format_and_type(GLenum format, GLenum type, _mesa_es3_error_check_format_and_type(GLenum format, GLenum type,
GLenum internalFormat, GLenum internalFormat)
unsigned dimensions)
{ {
GLboolean type_valid = GL_TRUE; GLboolean type_valid = GL_TRUE;
@ -2068,9 +2067,6 @@ _mesa_es3_error_check_format_and_type(GLenum format, GLenum type,
break; break;
case GL_DEPTH_COMPONENT: case GL_DEPTH_COMPONENT:
if (dimensions != 2) {
return GL_INVALID_OPERATION;
}
switch (type) { switch (type) {
case GL_UNSIGNED_SHORT: case GL_UNSIGNED_SHORT:
if (internalFormat != GL_DEPTH_COMPONENT16) if (internalFormat != GL_DEPTH_COMPONENT16)
@ -2098,9 +2094,6 @@ _mesa_es3_error_check_format_and_type(GLenum format, GLenum type,
break; break;
case GL_DEPTH_STENCIL: case GL_DEPTH_STENCIL:
if (dimensions != 2) {
return GL_INVALID_OPERATION;
}
switch (type) { switch (type) {
case GL_UNSIGNED_INT_24_8: case GL_UNSIGNED_INT_24_8:
if (internalFormat != GL_DEPTH24_STENCIL8) if (internalFormat != GL_DEPTH24_STENCIL8)

3
src/mesa/main/glformats.h
View File

@ -122,8 +122,7 @@ _mesa_es_error_check_format_and_type(GLenum format, GLenum type,
extern GLenum extern GLenum
_mesa_es3_error_check_format_and_type(GLenum format, GLenum type, _mesa_es3_error_check_format_and_type(GLenum format, GLenum type,
GLenum internalFormat, GLenum internalFormat);
unsigned dimensions);
#ifdef __cplusplus #ifdef __cplusplus

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

@ -1896,8 +1896,7 @@ texture_error_check( struct gl_context *ctx,
if (_mesa_is_gles(ctx)) { if (_mesa_is_gles(ctx)) {
if (_mesa_is_gles3(ctx)) { if (_mesa_is_gles3(ctx)) {
err = _mesa_es3_error_check_format_and_type(format, type, err = _mesa_es3_error_check_format_and_type(format, type,
internalFormat, internalFormat);
dimensions);
} else { } else {
if (format != internalFormat) { if (format != internalFormat) {
_mesa_error(ctx, GL_INVALID_OPERATION, _mesa_error(ctx, GL_INVALID_OPERATION,