fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2025-12-23 22:00:13 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

r600g: remove redundant parameter in r600_init_surface

Browse source
This commit is contained in:
Marek Olšák 2012-11-13 00:33:34 +01:00
parent e7dde5c8fb
commit f5ac60152b
1 changed files with 4 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/gallium/drivers/r600/r600_texture.c
View file

@ -69,7 +69,7 @@ static int r600_init_surface(struct r600_screen *rscreen,
struct radeon_surface *surface, struct radeon_surface *surface,
const struct pipe_resource *ptex, const struct pipe_resource *ptex,
unsigned array_mode, unsigned array_mode,
bool is_transfer, bool is_flushed_depth) bool is_flushed_depth)
{ {
const struct util_format_description *desc = const struct util_format_description *desc =
util_format_description(ptex->format); util_format_description(ptex->format);
@ -87,8 +87,7 @@ static int r600_init_surface(struct r600_screen *rscreen,
surface->array_size = 1; surface->array_size = 1;
surface->last_level = ptex->last_level; surface->last_level = ptex->last_level;
if (rscreen->chip_class >= EVERGREEN && if (rscreen->chip_class >= EVERGREEN && !is_flushed_depth &&
!is_transfer && !is_flushed_depth &&
ptex->format == PIPE_FORMAT_Z32_FLOAT_S8X24_UINT) { ptex->format == PIPE_FORMAT_Z32_FLOAT_S8X24_UINT) {
surface->bpe = 4; /* stencil is allocated separately on evergreen */ surface->bpe = 4; /* stencil is allocated separately on evergreen */
} else { } else {
@ -148,7 +147,7 @@ static int r600_init_surface(struct r600_screen *rscreen,
surface->flags |= RADEON_SURF_SCANOUT; surface->flags |= RADEON_SURF_SCANOUT;
} }
if (!is_transfer && !is_flushed_depth && is_depth) { if (!is_flushed_depth && is_depth) {
surface->flags |= RADEON_SURF_ZBUFFER; surface->flags |= RADEON_SURF_ZBUFFER;
if (is_stencil) { if (is_stencil) {
@ -513,7 +512,6 @@ struct pipe_resource *r600_texture_create(struct pipe_screen *screen,
array_mode = V_038000_ARRAY_LINEAR_ALIGNED; array_mode = V_038000_ARRAY_LINEAR_ALIGNED;
r = r600_init_surface(rscreen, &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); templ->flags & R600_RESOURCE_FLAG_FLUSHED_DEPTH);
if (r) { if (r) {
return NULL; return NULL;
@ -603,7 +601,7 @@ struct pipe_resource *r600_texture_from_handle(struct pipe_screen *screen,
else else
array_mode = 0; array_mode = 0;
r = r600_init_surface(rscreen, &surface, templ, array_mode, false, false); r = r600_init_surface(rscreen, &surface, templ, array_mode, false);
if (r) { if (r) {
return NULL; return NULL;
} }