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

Revert "r600g: work around ddx over alignment" 

This reverts commit d8287bac1f.

Cause more issue than it fix. Need to think of a proper solution.
This commit is contained in:
Jerome Glisse 2012-12-19 09:56:17 -05:00
parent d8287bac1f
commit 50880314e3
1 changed files with 3 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/gallium/drivers/r600/r600_texture.c
View File

@ -89,8 +89,7 @@ static int r600_init_surface(struct r600_screen *rscreen,
struct radeon_surface *surface,
const struct pipe_resource *ptex,
unsigned array_mode,
bool is_flushed_depth,
bool from_ddx)
bool is_flushed_depth)
{
const struct util_format_description *desc =
util_format_description(ptex->format);
@ -108,10 +107,6 @@ static int r600_init_surface(struct r600_screen *rscreen,
surface->array_size = 1;
surface->last_level = ptex->last_level;
if (from_ddx) {
surface->npix_y = align(surface->npix_y, 8);
}
if (rscreen->chip_class >= EVERGREEN && !is_flushed_depth &&
ptex->format == PIPE_FORMAT_Z32_FLOAT_S8X24_UINT) {
surface->bpe = 4; /* stencil is allocated separately on evergreen */
@ -544,8 +539,7 @@ struct pipe_resource *r600_texture_create(struct pipe_screen *screen,
}
r = r600_init_surface(rscreen, &surface, templ, array_mode,
templ->flags & R600_RESOURCE_FLAG_FLUSHED_DEPTH,
false);
templ->flags & R600_RESOURCE_FLAG_FLUSHED_DEPTH);
if (r) {
return NULL;
}
@ -633,7 +627,7 @@ struct pipe_resource *r600_texture_from_handle(struct pipe_screen *screen,
else
array_mode = V_038000_ARRAY_LINEAR_ALIGNED;
r = r600_init_surface(rscreen, &surface, templ, array_mode, false, true);
r = r600_init_surface(rscreen, &surface, templ, array_mode, false);
if (r) {
return NULL;
}