diff options
| author | Alan Hourihane <alanh@vmware.com> | 2013-03-06 18:14:01 +0000 |
|---|---|---|
| committer | Alan Hourihane <alanh@vmware.com> | 2013-03-07 10:13:40 +0000 |
| commit | 5984a911f9dda3f7421bdec604d30d0dfe2cea5e (patch) | |
| tree | d37f550efb1a6e3b51321bd972b9c0f37ff9185e /src/mesa/main/samplerobj.c | |
| parent | eddf33f7112f569d119b677b0a41129350572198 (diff) | |
| download | external_mesa3d-5984a911f9dda3f7421bdec604d30d0dfe2cea5e.zip external_mesa3d-5984a911f9dda3f7421bdec604d30d0dfe2cea5e.tar.gz external_mesa3d-5984a911f9dda3f7421bdec604d30d0dfe2cea5e.tar.bz2 | |
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 <alanh@vmware.com>
Reviewed-by: Brian Paul <brianp@vmware.com>
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 4664cc3..5cff329 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) |