diff options
| author | Nicolai Hähnle <[email protected]> | 2017-10-05 19:39:33 +0200 |
|---|---|---|
| committer | Nicolai Hähnle <[email protected]> | 2017-10-11 23:16:20 +0200 |
| commit | 0e26e767d2f13397d862b9a8fb921610a721cf19 (patch) | |
| tree | aebfde06e44314f6dd8fdf1176c0e684507d4082 /src/mesa/state_tracker/st_texture.h | |
| parent | bce3055c69b9fddf951fa1d80fc5894570fc00a3 (diff) | |
st/glsl_to_tgsi: ignore GL_TEXTURE_SRGB_DECODE_EXT for samplers used with texelFetch*()
See the comment for the relevant spec quote.
Fixes dEQP-GLES31.functional.srgb_texture_decode.skip_decode.srgba8.texel_fetch
v2: note the interaction between ARB_bindless_texture and EXT_texture_sRGB_decode
as a TODO
Reviewed-by: Kenneth Graunke <[email protected]>
Reviewed-by: Marek Olšák <[email protected]>
Diffstat (limited to 'src/mesa/state_tracker/st_texture.h')
| -rw-r--r-- | src/mesa/state_tracker/st_texture.h | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/src/mesa/state_tracker/st_texture.h b/src/mesa/state_tracker/st_texture.h index 4f41aac53cf..8b549b86085 100644 --- a/src/mesa/state_tracker/st_texture.h +++ b/src/mesa/state_tracker/st_texture.h @@ -56,8 +56,8 @@ struct st_sampler_view { /** The glsl version of the shader seen during validation */ bool glsl130_or_later; - /** The value of the sampler's sRGBDecode state during validation */ - GLenum sRGBDecode; + /** Derived from the sampler's sRGBDecode state during validation */ + bool srgb_skip_decode; }; @@ -309,7 +309,8 @@ st_convert_sampler_from_unit(const struct st_context *st, void st_update_single_texture(struct st_context *st, struct pipe_sampler_view **sampler_view, - GLuint texUnit, bool glsl130_or_later); + GLuint texUnit, bool glsl130_or_later, + bool ignore_srgb_decode); void st_make_bound_samplers_resident(struct st_context *st, |