Mesa (9.2): mesa: fix multisampling proxy textures not being queryable

Ian Romanick idr at kemper.freedesktop.org
Tue Aug 6 16:22:50 UTC 2013


Module: Mesa
Branch: 9.2
Commit: 030ada7a509d4ffb26746336bf4da4030ce847fe
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=030ada7a509d4ffb26746336bf4da4030ce847fe

Author: Mikko Juola <mikjuo at gmail.com>
Date:   Tue Jul 30 20:39:00 2013 +0300

mesa: fix multisampling proxy textures not being queryable

The code that checks if some texture target is valid for
glGetTexLevelParameter*() was not programmed to check for multisampling
proxy textures.  This made it impossible(?) to use the proxy textures
for their intended purpose as glGetTexLevelParameter*() would just fail
on you.

Reviewed-by: Brian Paul <brianp at vmware.com>

Cc: mesa-stable at lists.freedesktop.org
(cherry picked from commit 8624a514c21e00ec51d4d9d2f4aee315378357ae)

---

 src/mesa/main/texparam.c |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)

diff --git a/src/mesa/main/texparam.c b/src/mesa/main/texparam.c
index 141cbe3..3210995 100644
--- a/src/mesa/main/texparam.c
+++ b/src/mesa/main/texparam.c
@@ -1048,6 +1048,8 @@ legal_get_tex_level_parameter_target(struct gl_context *ctx, GLenum target)
       return ctx->API == API_OPENGL_CORE && ctx->Version >= 31;
    case GL_TEXTURE_2D_MULTISAMPLE:
    case GL_TEXTURE_2D_MULTISAMPLE_ARRAY:
+   case GL_PROXY_TEXTURE_2D_MULTISAMPLE:
+   case GL_PROXY_TEXTURE_2D_MULTISAMPLE_ARRAY:
       return ctx->Extensions.ARB_texture_multisample;
    default:
       return GL_FALSE;




More information about the mesa-commit mailing list