fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-05-04 07:38:10 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

mesa: additional GL_INVALID_OPERATION tests for texture swizzle

Browse source
This commit is contained in:
Brian Paul 2009-01-28 10:44:04 -07:00
parent 54c62ba5c3
commit 72f0b4a55b
1 changed files with 7 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
src/mesa/main/texparam.c
View file

@ -368,6 +368,11 @@ set_tex_parameteri(GLcontext *ctx,
if (ctx->Extensions.EXT_texture_swizzle) {
const GLuint comp = pname - GL_TEXTURE_SWIZZLE_R_EXT;
const GLint swz = comp_to_swizzle(params[0]);
if (swz < 0) {
_mesa_error(ctx, GL_INVALID_OPERATION,
"glTexParameter(swizzle 0x%x)", params[0]);
return;
}
ASSERT(comp < 4);
if (swz >= 0) {
FLUSH_VERTICES(ctx, _NEW_TEXTURE);
@ -390,8 +395,8 @@ set_tex_parameteri(GLcontext *ctx,
set_swizzle_component(&texObj->_Swizzle, comp, swz);
}
else {
_mesa_error(ctx, GL_INVALID_ENUM, "glTexParameter(param=0x%x)",
params[comp]);
_mesa_error(ctx, GL_INVALID_OPERATION,
"glTexParameter(swizzle 0x%x)", params[comp]);
return;
}
}