Mesa (gallium-0.1): mesa: add missing cases for texture array targets

Brian Paul brianp at kemper.freedesktop.org
Wed Dec 17 21:09:19 UTC 2008


Module: Mesa
Branch: gallium-0.1
Commit: 35bb2aa96a2499860869c0d307b599b3033b5264
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=35bb2aa96a2499860869c0d307b599b3033b5264

Author: Brian Paul <brian.paul at tungstengraphics.com>
Date:   Wed Dec 17 13:17:15 2008 -0700

mesa: add missing cases for texture array targets

---

 src/mesa/main/texenvprogram.c |   16 ++++++++++------
 1 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/src/mesa/main/texenvprogram.c b/src/mesa/main/texenvprogram.c
index c279956..0294c10 100644
--- a/src/mesa/main/texenvprogram.c
+++ b/src/mesa/main/texenvprogram.c
@@ -179,13 +179,17 @@ static GLuint translate_mode( GLenum mode )
 #define TEXTURE_UNKNOWN_INDEX 7
 static GLuint translate_tex_src_bit( GLbitfield bit )
 {
+   /* make sure number of switch cases is correct */
+   assert(NUM_TEXTURE_TARGETS == 7);
    switch (bit) {
-   case TEXTURE_1D_BIT:   return TEXTURE_1D_INDEX;
-   case TEXTURE_2D_BIT:   return TEXTURE_2D_INDEX;
-   case TEXTURE_RECT_BIT: return TEXTURE_RECT_INDEX;
-   case TEXTURE_3D_BIT:   return TEXTURE_3D_INDEX;
-   case TEXTURE_CUBE_BIT: return TEXTURE_CUBE_INDEX;
-   default: return TEXTURE_UNKNOWN_INDEX;
+   case TEXTURE_1D_BIT:         return TEXTURE_1D_INDEX;
+   case TEXTURE_2D_BIT:         return TEXTURE_2D_INDEX;
+   case TEXTURE_3D_BIT:         return TEXTURE_3D_INDEX;
+   case TEXTURE_CUBE_BIT:       return TEXTURE_CUBE_INDEX;
+   case TEXTURE_RECT_BIT:       return TEXTURE_RECT_INDEX;
+   case TEXTURE_1D_ARRAY_BIT:   return TEXTURE_1D_ARRAY_INDEX;
+   case TEXTURE_2D_ARRAY_BIT:   return TEXTURE_2D_ARRAY_INDEX;
+   default:                     return TEXTURE_UNKNOWN_INDEX;
    }
 }
 




More information about the mesa-commit mailing list