From 59562e9ba5330cb2033757a582fe7f449140af46 Mon Sep 17 00:00:00 2001 From: Brian Paul Date: Mon, 29 Sep 2014 10:17:15 -0600 Subject: [PATCH] softpipe: don't special case PIPE_TEXTURE_CUBE in softpipe_resource_layout() As with the previous patch for llvmpipe. Reviewed-by: Ilia Mirkin --- 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 c2df71e41a5..e1ea5df24ca 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; -- 2.30.2