fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2025-12-24 02:20:11 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

mesa: fix fallback texture for cube map array

Browse source 
mesa was creating a cube map array texture with just one layer, which is
not legal. This caused an assertion failure when using that texture later
in llvmpipe (when enabling cube map arrays) since it verifies the number
of layers in the view is divisible by 6 (the sampling code might well crash
randomly otherwise) with piglit glsl-resource-not-bound CubeArray -fbo -auto.

v2: use appropriately sized texel array...

Reviewed-by: Ian Romanick <ian.d.romanick@intel.com> (v1)
This commit is contained in:
Roland Scheidegger 2014-08-28 15:54:52 +02:00
parent 7c73ee677f
commit 85d4cc4790
1 changed files with 10 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
src/mesa/main/texobj.c
View file

@ -772,18 +772,21 @@ _mesa_get_fallback_texture(struct gl_context *ctx, gl_texture_index tex)
{
if (!ctx->Shared->FallbackTex[tex]) {
/* create fallback texture now */
const GLsizei width = 1, height = 1, depth = 1;
GLubyte texel[4];
const GLsizei width = 1, height = 1;
GLsizei depth = 1;
GLubyte texel[24];
struct gl_texture_object *texObj;
struct gl_texture_image *texImage;
mesa_format texFormat;
GLuint dims, face, numFaces = 1;
GLenum target;
texel[0] =
texel[1] =
texel[2] = 0x0;
texel[3] = 0xff;
for (face = 0; face < 6; face++) {
texel[4*face + 0] =
texel[4*face + 1] =
texel[4*face + 2] = 0x0;
texel[4*face + 3] = 0xff;
}
switch (tex) {
case TEXTURE_2D_ARRAY_INDEX:
@ -822,6 +825,7 @@ _mesa_get_fallback_texture(struct gl_context *ctx, gl_texture_index tex)
case TEXTURE_CUBE_ARRAY_INDEX:
dims = 3;
target = GL_TEXTURE_CUBE_MAP_ARRAY;
depth = 6;
break;
case TEXTURE_EXTERNAL_INDEX:
dims = 2;