i965: Combine GL_TEXTURE_CUBE_MAP_ARRAY case with the other array cases.

These do the exact same thing; combining them is tidier.

Signed-off-by: Kenneth Graunke <kenneth@whitecape.org>
Reviewed-by: Ian Romanick <ian.d.romanick@intel.com>

diff --git a/src/mesa/drivers/dri/i965/brw_tex_layout.c b/src/mesa/drivers/dri/i965/brw_tex_layout.c
index fc929f855a5e462ca733d7cd858cb02a80b987f2..17720578c79e8d1f48aa794afe5ee8918cc04f6f 100644 (file)
--- a/src/mesa/drivers/dri/i965/brw_tex_layout.c
+++ b/src/mesa/drivers/dri/i965/brw_tex_layout.c
@@ -150,10 +150,6 @@ void
 brw_miptree_layout(struct intel_context *intel, struct intel_mipmap_tree *mt)
 {
    switch (mt->target) {
-   case GL_TEXTURE_CUBE_MAP_ARRAY:
-      brw_miptree_layout_texture_array(intel, mt);
-      break;
-
    case GL_TEXTURE_CUBE_MAP:
       if (intel->gen >= 5) {
         /* On Ironlake, cube maps are finally represented as just a series of
@@ -171,9 +167,10 @@ brw_miptree_layout(struct intel_context *intel, struct intel_mipmap_tree *mt)
       brw_miptree_layout_texture_3d(intel, mt);
       break;
 
-   case GL_TEXTURE_2D_ARRAY:
    case GL_TEXTURE_1D_ARRAY:
+   case GL_TEXTURE_2D_ARRAY:
    case GL_TEXTURE_2D_MULTISAMPLE_ARRAY:
+   case GL_TEXTURE_CUBE_MAP_ARRAY:
       brw_miptree_layout_texture_array(intel, mt);
       break;