diff options
| author | Marek Olšák <[email protected]> | 2012-07-29 17:10:00 +0200 |
|---|---|---|
| committer | Marek Olšák <[email protected]> | 2012-08-04 13:53:07 +0200 |
| commit | ea72351a919c594e7f40e901dca42aebb866f8a6 (patch) | |
| tree | 12eabaa48c08836b2bbc0eefebd1d3f065e21fc6 /src | |
| parent | c8ff737a18672c86f4ec01b25b4893550667b17c (diff) | |
r600g: correct texture memory size for Z32F_S8X24 on evergreen
Diffstat (limited to 'src')
| -rw-r--r-- | src/gallium/drivers/r600/r600_texture.c | 23 |
1 files changed, 16 insertions, 7 deletions
diff --git a/src/gallium/drivers/r600/r600_texture.c b/src/gallium/drivers/r600/r600_texture.c index 4cf9cb832bd..5e99a04a3eb 100644 --- a/src/gallium/drivers/r600/r600_texture.c +++ b/src/gallium/drivers/r600/r600_texture.c @@ -232,7 +232,8 @@ static void r600_texture_set_array_mode(struct pipe_screen *screen, } } -static int r600_init_surface(struct radeon_surface *surface, +static int r600_init_surface(struct r600_screen *rscreen, + struct radeon_surface *surface, const struct pipe_resource *ptex, unsigned array_mode, bool is_transfer, bool is_flushed_depth) @@ -252,11 +253,19 @@ static int r600_init_surface(struct radeon_surface *surface, surface->blk_d = 1; surface->array_size = 1; surface->last_level = ptex->last_level; - surface->bpe = util_format_get_blocksize(ptex->format); - /* align byte per element on dword */ - if (surface->bpe == 3) { - surface->bpe = 4; + + if (rscreen->chip_class >= EVERGREEN && + !is_transfer && !is_flushed_depth && + ptex->format == PIPE_FORMAT_Z32_FLOAT_S8X24_UINT) { + surface->bpe = 4; /* stencil is allocated separately on evergreen */ + } else { + surface->bpe = util_format_get_blocksize(ptex->format); + /* align byte per element on dword */ + if (surface->bpe == 3) { + surface->bpe = 4; + } } + surface->nsamples = 1; surface->flags = 0; switch (array_mode) { @@ -647,7 +656,7 @@ struct pipe_resource *r600_texture_create(struct pipe_screen *screen, } } - r = r600_init_surface(&surface, templ, array_mode, + r = r600_init_surface(rscreen, &surface, templ, array_mode, templ->flags & R600_RESOURCE_FLAG_TRANSFER, templ->flags & R600_RESOURCE_FLAG_FLUSHED_DEPTH); if (r) { @@ -730,7 +739,7 @@ struct pipe_resource *r600_texture_from_handle(struct pipe_screen *screen, else array_mode = 0; - r = r600_init_surface(&surface, templ, array_mode, false, false); + r = r600_init_surface(rscreen, &surface, templ, array_mode, false, false); if (r) { return NULL; } |