OpenHarmony/third_party_mesa3d
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

mesa: Return GL_INVALID_ENUM for bogus TEXTURE_SRGB_DECODE_EXT params.

Browse Source 
Fixes dEQP-GLES31.functional.debug.negative_coverage.get_error.shader.srgb_decode_samplerparameter{f,fv,i,Iiv,Iuiv,iv}.

Reviewed-by: Jason Ekstrand <jason@jlekstrand.net>
Reviewed-by: Iago Toral Quiroga <itoral@igalia.com>
This commit is contained in:
Kenneth Graunke
2017-07-12 19:49:55 -07:00
parent f33d8af7aa
commit 42c64b5f87
1 changed files with 12 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/mesa/main/samplerobj.c
View File

@@ -780,8 +780,19 @@ set_sampler_srgb_decode(struct gl_context *ctx,
if (samp->sRGBDecode == param) if (samp->sRGBDecode == param)
return GL_FALSE; return GL_FALSE;
/* The EXT_texture_sRGB_decode spec says:
*
* "INVALID_ENUM is generated if the <pname> 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 <param> 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) if (param != GL_DECODE_EXT && param != GL_SKIP_DECODE_EXT)
return INVALID_VALUE; return INVALID_PARAM;
flush(ctx); flush(ctx);
samp->sRGBDecode = param; samp->sRGBDecode = param;