From 42c64b5f87531367eb554188fd924c885c8cecde Mon Sep 17 00:00:00 2001 From: Kenneth Graunke Date: Wed, 12 Jul 2017 19:49:55 -0700 Subject: [PATCH] mesa: Return GL_INVALID_ENUM for bogus TEXTURE_SRGB_DECODE_EXT params. Fixes dEQP-GLES31.functional.debug.negative_coverage.get_error.shader.srgb_decode_samplerparameter{f,fv,i,Iiv,Iuiv,iv}. Reviewed-by: Jason Ekstrand Reviewed-by: Iago Toral Quiroga --- src/mesa/main/samplerobj.c | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/src/mesa/main/samplerobj.c b/src/mesa/main/samplerobj.c index d78528be2db..26e77252490 100644 --- a/src/mesa/main/samplerobj.c +++ b/src/mesa/main/samplerobj.c @@ -780,8 +780,19 @@ set_sampler_srgb_decode(struct gl_context *ctx, if (samp->sRGBDecode == param) return GL_FALSE; + /* The EXT_texture_sRGB_decode spec says: + * + * "INVALID_ENUM is generated if the parameter of + * TexParameter[i,f,Ii,Iui][v][EXT], + * MultiTexParameter[i,f,Ii,Iui][v]EXT, + * TextureParameter[i,f,Ii,Iui][v]EXT, SamplerParameter[i,f,Ii,Iui][v] + * is TEXTURE_SRGB_DECODE_EXT when the parameter is not one of + * DECODE_EXT or SKIP_DECODE_EXT. + * + * Returning INVALID_PARAM makes that happen. + */ if (param != GL_DECODE_EXT && param != GL_SKIP_DECODE_EXT) - return INVALID_VALUE; + return INVALID_PARAM; flush(ctx); samp->sRGBDecode = param; -- 2.30.2