From 5e3733fadf08178fca7c9f20a0f4783f940383aa Mon Sep 17 00:00:00 2001 From: Brian Paul Date: Sun, 21 Nov 2010 10:05:47 -0700 Subject: [PATCH] mesa: fix get_texture_dimensions() for texture array targets Fixes http://bugs.freedesktop.org/show_bug.cgi?id=31779 --- src/mesa/main/teximage.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/mesa/main/teximage.c b/src/mesa/main/teximage.c index b3ce5d9..060f34b 100644 --- a/src/mesa/main/teximage.c +++ b/src/mesa/main/teximage.c @@ -888,23 +888,19 @@ _mesa_max_texture_levels(struct gl_context *ctx, GLenum target) /** - * Return number of dimenions per image for the given texture target. + * Return number of dimensions per mipmap level for the given texture target. */ static GLint get_texture_dimensions(GLenum target) { switch (target) { case GL_TEXTURE_1D: - case GL_TEXTURE_1D_ARRAY: case GL_PROXY_TEXTURE_1D: - case GL_PROXY_TEXTURE_1D_ARRAY: return 1; case GL_TEXTURE_2D: - case GL_TEXTURE_2D_ARRAY: case GL_TEXTURE_RECTANGLE: case GL_TEXTURE_CUBE_MAP: case GL_PROXY_TEXTURE_2D: - case GL_PROXY_TEXTURE_2D_ARRAY: case GL_PROXY_TEXTURE_RECTANGLE: case GL_PROXY_TEXTURE_CUBE_MAP: case GL_TEXTURE_CUBE_MAP_POSITIVE_X: @@ -913,9 +909,13 @@ get_texture_dimensions(GLenum target) case GL_TEXTURE_CUBE_MAP_NEGATIVE_Y: case GL_TEXTURE_CUBE_MAP_POSITIVE_Z: case GL_TEXTURE_CUBE_MAP_NEGATIVE_Z: + case GL_TEXTURE_1D_ARRAY: + case GL_PROXY_TEXTURE_1D_ARRAY: return 2; case GL_TEXTURE_3D: case GL_PROXY_TEXTURE_3D: + case GL_TEXTURE_2D_ARRAY: + case GL_PROXY_TEXTURE_2D_ARRAY: return 3; default: _mesa_problem(NULL, "invalid target 0x%x in get_texture_dimensions()", -- 2.7.4