diff options
| author | Mikko Juola <mikjuo@gmail.com> | 2013-07-30 06:29:54 +0300 |
|---|---|---|
| committer | Brian Paul <brianp@vmware.com> | 2013-07-31 07:26:50 -0600 |
| commit | 3f3f66fd94c1790de1b97839e58e35c47836c836 (patch) | |
| tree | 7087200ea7c2604fd3188cbc4dd3a4415bc66894 /src/mesa/main/texstorage.c | |
| parent | de7e3741ebca9fb794b890e00b5fed5b2bbb62a2 (diff) | |
| download | external_mesa3d-3f3f66fd94c1790de1b97839e58e35c47836c836.zip external_mesa3d-3f3f66fd94c1790de1b97839e58e35c47836c836.tar.gz external_mesa3d-3f3f66fd94c1790de1b97839e58e35c47836c836.tar.bz2 | |
mesa: fix proxy textures not working with default texture binding
When working with the glTexStorage*() functions, the error checking
checks that a non-default (i.e., non-zero) texture is currently bound.
However, this check made glTexStorage*() functions fail with proxy
textures when the default texture is bound. Proxy textures do not care
about the current texture bindings so for them this check should not
be done.
Reviewed-by: Brian Paul <brianp@vmware.com>
Cc: mesa-stable@lists.freedesktop.org
Diffstat (limited to 'src/mesa/main/texstorage.c')
| -rw-r--r-- | src/mesa/main/texstorage.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/mesa/main/texstorage.c b/src/mesa/main/texstorage.c index 0a53726..7798897 100644 --- a/src/mesa/main/texstorage.c +++ b/src/mesa/main/texstorage.c @@ -335,7 +335,7 @@ tex_storage_error_check(struct gl_context *ctx, GLuint dims, GLenum target, /* non-default texture object check */ texObj = _mesa_get_current_tex_object(ctx, target); - if (!texObj || (texObj->Name == 0)) { + if (!_mesa_is_proxy_texture(target) && (!texObj || (texObj->Name == 0))) { _mesa_error(ctx, GL_INVALID_OPERATION, "glTexStorage%uD(texture object 0)", dims); return GL_TRUE; |