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

mesa: Change an error code in glSamplerParameterI[iu]v().

Browse source 
This is supposed to be INVALID_OPERATION in ES.  We already did this
for the fv/iv variants, but not Iiv/Iuv, which are new in ES 3.2 (or
extensions).

Fixes:
ES31-CTS.texture_border_clamp.samplerparameteri_non_gen_sampler_error

Signed-off-by: Kenneth Graunke <kenneth@whitecape.org>
Reviewed-by: Ilia Mirkin <imirkin@alum.mit.edu>
This commit is contained in:
Kenneth Graunke 2016-04-12 15:23:47 -07:00
parent 46bfcd61f5
commit d1c89f6005
1 changed files with 6 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/mesa/main/samplerobj.c
View file

@ -1171,8 +1171,9 @@ _mesa_SamplerParameterIiv(GLuint sampler, GLenum pname, const GLint *params)
sampObj = _mesa_lookup_samplerobj(ctx, sampler);
if (!sampObj) {
_mesa_error(ctx, GL_INVALID_VALUE, "glSamplerParameterIiv(sampler %u)",
sampler);
_mesa_error(ctx, (_mesa_is_gles(ctx) ?
GL_INVALID_OPERATION : GL_INVALID_VALUE),
"glSamplerParameterIiv(sampler %u)", sampler);
return;
}
@ -1257,8 +1258,9 @@ _mesa_SamplerParameterIuiv(GLuint sampler, GLenum pname, const GLuint *params)
sampObj = _mesa_lookup_samplerobj(ctx, sampler);
if (!sampObj) {
_mesa_error(ctx, GL_INVALID_VALUE, "glSamplerParameterIuiv(sampler %u)",
sampler);
_mesa_error(ctx, (_mesa_is_gles(ctx) ?
GL_INVALID_OPERATION : GL_INVALID_VALUE),
"glSamplerParameterIuiv(sampler %u)", sampler);
return;
}