r600g: fix ínitialization of non_disp_tiling flag
This fixes a regression caused by e64633e8c3
This commit is contained in:
parent
b893bbf438
commit
c7d91a6f13
|
@ -515,10 +515,6 @@ r600_texture_create_object(struct pipe_screen *screen,
|
||||||
/* don't include stencil-only formats which we don't support for rendering */
|
/* don't include stencil-only formats which we don't support for rendering */
|
||||||
rtex->is_depth = util_format_has_depth(util_format_description(rtex->resource.b.b.format));
|
rtex->is_depth = util_format_has_depth(util_format_description(rtex->resource.b.b.format));
|
||||||
|
|
||||||
/* Tiled depth textures utilize the non-displayable tile order.
|
|
||||||
* Applies to R600-Cayman. */
|
|
||||||
rtex->non_disp_tiling = rtex->is_depth && rtex->surface.level[0].mode >= RADEON_SURF_MODE_1D;
|
|
||||||
|
|
||||||
rtex->surface = *surface;
|
rtex->surface = *surface;
|
||||||
r = r600_setup_surface(screen, rtex, pitch_in_bytes_override);
|
r = r600_setup_surface(screen, rtex, pitch_in_bytes_override);
|
||||||
if (r) {
|
if (r) {
|
||||||
|
@ -526,6 +522,11 @@ r600_texture_create_object(struct pipe_screen *screen,
|
||||||
return NULL;
|
return NULL;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/* Tiled depth textures utilize the non-displayable tile order.
|
||||||
|
* This must be done after r600_setup_surface.
|
||||||
|
* Applies to R600-Cayman. */
|
||||||
|
rtex->non_disp_tiling = rtex->is_depth && rtex->surface.level[0].mode >= RADEON_SURF_MODE_1D;
|
||||||
|
|
||||||
if (base->nr_samples > 1 && !rtex->is_depth && !buf) {
|
if (base->nr_samples > 1 && !rtex->is_depth && !buf) {
|
||||||
r600_texture_allocate_fmask(rscreen, rtex);
|
r600_texture_allocate_fmask(rscreen, rtex);
|
||||||
r600_texture_allocate_cmask(rscreen, rtex);
|
r600_texture_allocate_cmask(rscreen, rtex);
|
||||||
|
|
Loading…
Reference in New Issue