fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-02-15 04:30:29 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

intel: fix small compressed texture upload

Browse source 
need to round up height for _mesa_copy_rect otherwise
textures with height smaller than 4 won't get copied to the miptree at all
Also fix up the confusing debug output (don't output unitialized values,
and output if data is present and the compressed flag)
This commit is contained in:
Roland Scheidegger 2009-04-16 17:39:43 +02:00
parent 666702baec
commit 69cbf3c686
1 changed files with 5 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
src/mesa/drivers/dri/intel/intel_tex_image.c
View file

@ -315,7 +315,7 @@ intelTexImage(GLcontext * ctx,
GLint postConvWidth = width;
GLint postConvHeight = height;
GLint texelBytes, sizeInBytes;
GLuint dstRowStride, srcRowStride = texImage->RowStride;
GLuint dstRowStride = 0, srcRowStride = texImage->RowStride;
GLboolean needs_map;
DBG("%s target %s level %d %dx%dx%d border %d\n", __FUNCTION__,
@ -516,8 +516,9 @@ intelTexImage(GLcontext * ctx,
}
DBG("Upload image %dx%dx%d row_len %d "
"pitch %d\n",
width, height, depth, width * texelBytes, dstRowStride);
"pitch %d pixels %d compressed %d\n",
width, height, depth, width * texelBytes, dstRowStride,
pixels ? 1 : 0, compressed);
/* Copy data. Would like to know when it's ok for us to eg. use
* the blitter to copy. Or, use the hardware to do the format
@ -530,7 +531,7 @@ intelTexImage(GLcontext * ctx,
_mesa_copy_rect(texImage->Data, dst->cpp, dst->pitch,
0, 0,
intelImage->mt->level[level].width,
intelImage->mt->level[level].height/4,
(intelImage->mt->level[level].height+3)/4,
pixels,
srcRowStride,
0, 0);