fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-05-09 04:38:03 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

llvmpipe: remove special case for PIPE_TEXTURE_CUBE in llvmpipe_texture_layout()

Browse source 
layers (aka array_size) should be 6 for cube textures so we don't need
to special-case it.  But add an assertion just to be safe.

Reviewed-by: Ilia Mirkin <imirkin@alum.mit.edu>
This commit is contained in:
Brian Paul 2014-09-29 10:15:28 -06:00
parent 8269bfdb83
commit 3d77b80d80
1 changed files with 6 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
src/gallium/drivers/llvmpipe/lp_texture.c
View file

@ -132,12 +132,15 @@ llvmpipe_texture_layout(struct llvmpipe_screen *screen,
lpr->img_stride[level] = lpr->row_stride[level] * nblocksy;
/* Number of 3D image slices, cube faces or texture array layers */
if (lpr->base.target == PIPE_TEXTURE_CUBE)
num_slices = 6;
else if (lpr->base.target == PIPE_TEXTURE_3D)
if (lpr->base.target == PIPE_TEXTURE_CUBE) {
assert(layers == 6);
}
if (lpr->base.target == PIPE_TEXTURE_3D)
num_slices = depth;
else if (lpr->base.target == PIPE_TEXTURE_1D_ARRAY ||
lpr->base.target == PIPE_TEXTURE_2D_ARRAY ||
lpr->base.target == PIPE_TEXTURE_CUBE ||
lpr->base.target == PIPE_TEXTURE_CUBE_ARRAY)
num_slices = layers;
else