diff options
| author | Brian Paul <[email protected]> | 2011-04-10 12:44:46 -0600 |
|---|---|---|
| committer | Brian Paul <[email protected]> | 2011-04-10 13:12:49 -0600 |
| commit | ecfaab88b2577bd0395bc05d75a036126806a9c4 (patch) | |
| tree | 5abb78f767f546778d551a57f7f2cfe20c479f50 /src/mesa/main/texfetch.c | |
| parent | 1cbd3a1cc734df16610a59dc49cdb42c70dc3270 (diff) | |
mesa: move sampler state into new gl_sampler_object type
gl_texture_object contains an instance of this type for the regular
texture object sampling state. glGenSamplers() generates new instances
of gl_sampler_object which can override that state with glBindSampler().
Diffstat (limited to 'src/mesa/main/texfetch.c')
| -rw-r--r-- | src/mesa/main/texfetch.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/mesa/main/texfetch.c b/src/mesa/main/texfetch.c index b2181af2931..caabc19bb17 100644 --- a/src/mesa/main/texfetch.c +++ b/src/mesa/main/texfetch.c @@ -975,7 +975,7 @@ _mesa_set_fetch_functions(struct gl_texture_image *texImage, GLuint dims) ASSERT(dims == 1 || dims == 2 || dims == 3); - if (texImage->TexObject->sRGBDecode == GL_SKIP_DECODE_EXT && + if (texImage->TexObject->Sampler.sRGBDecode == GL_SKIP_DECODE_EXT && _mesa_get_format_color_encoding(format) == GL_SRGB) { format = _mesa_get_srgb_format_linear(format); } |