fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-01-10 23:20:14 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

radeon: fix compressed mipmapped textures

Browse source 
Tested on r300 only, other cards may require adjusting texture_compressed_row_align.
This commit is contained in:
Maciej Cencora 2009-11-21 15:56:23 +01:00
parent df87877636
commit d20b79172d
2 changed files with 28 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/mesa/drivers/dri/radeon/radeon_common_context.c
View file

@ -262,7 +262,7 @@ GLboolean radeonInitContext(radeonContextPtr radeon,
else
radeon->texture_row_align = 32;
radeon->texture_rect_row_align = 64;
radeon->texture_compressed_row_align = 64;
radeon->texture_compressed_row_align = 32;
}
radeon_init_dma(radeon);

47
src/mesa/drivers/dri/radeon/radeon_mipmap_tree.c
View file

@ -37,26 +37,35 @@
#include "main/texobj.h"
#include "radeon_texture.h"
static GLuint radeon_compressed_texture_size(GLcontext *ctx,
GLsizei width, GLsizei height, GLsizei depth,
gl_format mesaFormat)
static unsigned get_aligned_compressed_row_stride(
gl_format format,
unsigned width,
unsigned minStride)
{
GLuint size = _mesa_format_image_size(mesaFormat, width, height, depth);
const unsigned blockSize = _mesa_get_format_bytes(format);
unsigned blockWidth, blockHeight, numXBlocks;
if (mesaFormat == MESA_FORMAT_RGB_DXT1 ||
mesaFormat == MESA_FORMAT_RGBA_DXT1) {
if (width + 3 < 8) /* width one block */
size = size * 4;
else if (width + 3 < 16)
size = size * 2;
} else {
/* DXT3/5, 16 bytes per block */
// WARN_ONCE("DXT 3/5 suffers from multitexturing problems!\n");
if (width + 3 < 8)
size = size * 2;
_mesa_get_format_block_size(format, &blockWidth, &blockHeight);
numXBlocks = (width + blockWidth - 1) / blockWidth;
while (numXBlocks * blockSize < minStride)
{
++numXBlocks;
}
return size;
return numXBlocks * blockSize;
}
static unsigned get_compressed_image_size(
gl_format format,
unsigned rowStride,
unsigned height)
{
unsigned blockWidth, blockHeight;
_mesa_get_format_block_size(format, &blockWidth, &blockHeight);
return rowStride * ((height + blockHeight - 1) / blockHeight);
}
/**
@ -74,10 +83,8 @@ static void compute_tex_image_offset(radeonContextPtr rmesa, radeon_mipmap_tree
/* Find image size in bytes */
if (_mesa_is_format_compressed(mt->mesaFormat)) {
/* TODO: Is this correct? Need test cases for compressed textures! */
row_align = rmesa->texture_compressed_row_align - 1;
lvl->rowstride = (_mesa_format_row_stride(mt->mesaFormat, lvl->width) + row_align) & ~row_align;
lvl->size = radeon_compressed_texture_size(rmesa->glCtx, lvl->width, lvl->height, lvl->depth, mt->mesaFormat);
lvl->rowstride = get_aligned_compressed_row_stride(mt->mesaFormat, lvl->width, rmesa->texture_compressed_row_align);
lvl->size = get_compressed_image_size(mt->mesaFormat, lvl->rowstride, lvl->height);
} else if (mt->target == GL_TEXTURE_RECTANGLE_NV) {
row_align = rmesa->texture_rect_row_align - 1;
lvl->rowstride = (_mesa_format_row_stride(mt->mesaFormat, lvl->width) + row_align) & ~row_align;