diff options
| author | Alan Hourihane <[email protected]> | 2013-03-06 18:14:01 +0000 |
|---|---|---|
| committer | Ian Romanick <[email protected]> | 2013-03-25 14:15:59 -0700 |
| commit | d095747749b2e19aecceac54662df6effe89711d (patch) | |
| tree | 92b99c76454a634942c293099899f0ff12ffd018 /src/mesa/main/samplerobj.c | |
| parent | cbbea7cc58e7061c9fb361a0e375397b80dcfeb4 (diff) | |
mesa: fix glGetInteger*(GL_SAMPLER_BINDING).
If the sampler object has been deleted on another context, an
alternative context may reference the old sampler. So ensure the sampler
object still exists.
Note: this is a candidate for the stable branch.
Signed-off-by: Alan Hourihane <[email protected]>
Reviewed-by: Brian Paul <[email protected]>
(cherry picked from commit 5984a911f9dda3f7421bdec604d30d0dfe2cea5e)
Diffstat (limited to 'src/mesa/main/samplerobj.c')
| -rw-r--r-- | src/mesa/main/samplerobj.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/mesa/main/samplerobj.c b/src/mesa/main/samplerobj.c index 4664cc34053..5cff329367b 100644 --- a/src/mesa/main/samplerobj.c +++ b/src/mesa/main/samplerobj.c @@ -40,7 +40,7 @@ #include "main/samplerobj.h" -static struct gl_sampler_object * +struct gl_sampler_object * _mesa_lookup_samplerobj(struct gl_context *ctx, GLuint name) { if (name == 0) |