AlexIndustrial/mesa
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

r300g: allow resolutions up to 1280x1024 with AA optimizations on 1-pipe cards

Browse Source 
because single-pipe cards have bigger CMASK RAM
This commit is contained in:
Marek Olšák
2013-01-20 16:52:17 +01:00
parent b7cb655298
commit 7bfbf5b287
2 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/gallium/drivers/r300/r300_chipset.h
-1
View File
@@ -30,7 +30,6 @@
#define RV530_HIZ_LIMIT 15360
/* rv3xx have only one pipe */
#define PIPE_CMASK_SIZE 4096
#define PIPE_ZMASK_SIZE 4096
#define RV3xx_ZMASK_SIZE 5120
src/gallium/drivers/r300/r300_texture_desc.c
+6 -2
View File
@@ -414,7 +414,7 @@ static void r300_setup_cmask_properties(struct r300_screen *screen,
{
static unsigned cmask_align_x[4] = {16, 32, 48, 32};
static unsigned cmask_align_y[4] = {16, 16, 16, 32};
unsigned pipes, stride, cmask_num_dw;
unsigned pipes, stride, cmask_num_dw, cmask_max_size;
/* We need an AA colorbuffer, no mipmaps. */
if (tex->b.b.nr_samples <= 1 ||
@@ -436,6 +436,10 @@ static void r300_setup_cmask_properties(struct r300_screen *screen,
/* CMASK is part of raster pipes. The number of Z pipes doesn't matter. */
pipes = screen->info.r300_num_gb_pipes;
/* The single-pipe cards have 5120 dwords of CMASK RAM,
* the other cards have 4096 dwords of CMASK RAM per pipe. */
cmask_max_size = pipes == 1 ? 5120 : pipes * 4096;
stride = r300_stride_to_width(tex->b.b.format,
tex->tex.stride_in_bytes[0]);
stride = align(stride, 16);
@@ -446,7 +450,7 @@ static void r300_setup_cmask_properties(struct r300_screen *screen,
cmask_align_y[pipes-1]);
/* Check the CMASK size against the CMASK memory limit. */
if (cmask_num_dw <= PIPE_CMASK_SIZE * pipes) {
if (cmask_num_dw <= cmask_max_size) {
tex->tex.cmask_dwords = cmask_num_dw;
tex->tex.cmask_stride_in_pixels =
util_align_npot(stride, cmask_align_x[pipes-1]);