[Mesa-dev] [PATCH 4/4] softpipe: don't special case PIPE_TEXTURE_CUBE in softpipe_resource_layout()

[Brian Paul]

As with the previous patch for llvmpipe.
---
 src/gallium/drivers/softpipe/sp_texture.c |    5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/gallium/drivers/softpipe/sp_texture.c b/src/gallium/drivers/softpipe/sp_texture.c
index c2df71e..e1ea5df 100644
--- a/src/gallium/drivers/softpipe/sp_texture.c
+++ b/src/gallium/drivers/softpipe/sp_texture.c
@@ -68,8 +68,9 @@ softpipe_resource_layout(struct pipe_screen *screen,
       nblocksy = util_format_get_nblocksy(pt->format, height);
 
       if (pt->target == PIPE_TEXTURE_CUBE)
-         slices = 6;
-      else if (pt->target == PIPE_TEXTURE_3D)
+         assert(pt->array_size == 6);
+
+      if (pt->target == PIPE_TEXTURE_3D)
          slices = depth;
       else
          slices = pt->array_size;
-- 
1.7.10.4