From a847a121a790f3308b8b1f25e43864515dccf80d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marek=20Ol=C5=A1=C3=A1k?= Date: Mon, 16 May 2011 03:10:40 +0200 Subject: [PATCH] r300g: rs690 hack --- src/gallium/drivers/r300/r300_texture_desc.c | 12 +++++++----- 1 files changed, 7 insertions(+), 5 deletions(-) diff --git a/src/gallium/drivers/r300/r300_texture_desc.c b/src/gallium/drivers/r300/r300_texture_desc.c index c9a68b7..1e4a19a 100644 --- a/src/gallium/drivers/r300/r300_texture_desc.c +++ b/src/gallium/drivers/r300/r300_texture_desc.c @@ -39,11 +39,11 @@ unsigned r300_get_pixel_alignment(enum pipe_format format, { /* Macro: linear linear linear Micro: linear tiled square-tiled */ - {{ 32, 1}, { 8, 4}, { 0, 0}}, /* 8 bits per pixel */ - {{ 16, 1}, { 8, 2}, { 4, 4}}, /* 16 bits per pixel */ - {{ 8, 1}, { 4, 2}, { 0, 0}}, /* 32 bits per pixel */ - {{ 4, 1}, { 2, 2}, { 0, 0}}, /* 64 bits per pixel */ - {{ 2, 1}, { 0, 0}, { 0, 0}} /* 128 bits per pixel */ + {{ 64, 1}, {16, 4}, { 0, 0}}, /* 8 bits per pixel */ + {{ 32, 1}, {16, 2}, { 8, 4}}, /* 16 bits per pixel */ + {{ 16, 1}, { 8, 2}, { 0, 0}}, /* 32 bits per pixel */ + {{ 8, 1}, { 4, 2}, { 0, 0}}, /* 64 bits per pixel */ + {{ 4, 1}, { 0, 0}, { 0, 0}} /* 128 bits per pixel */ }, { /* Macro: tiled tiled tiled @@ -60,6 +60,8 @@ unsigned r300_get_pixel_alignment(enum pipe_format format, unsigned tile = 0; unsigned pixsize = util_format_get_blocksize(format); + is_rs690 = FALSE; + assert(macrotile <= RADEON_LAYOUT_TILED); assert(microtile <= RADEON_LAYOUT_SQUARETILED); assert(pixsize <= 16); -- 1.7.4.1