From: Marek Olšák Date: Fri, 19 Aug 2011 20:57:56 +0000 (+0200) Subject: r600g: don't allocate separate depth and stencil for transfer textures on EG X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=db71537f01e0e6fd19e90bda6cfd727bb18832df;p=mesa.git r600g: don't allocate separate depth and stencil for transfer textures on EG The state tracker expects depth and stencil pixels interleaved. Evergreen can bind an interleaved depth-stencil resource as a colorbuffer, but not as a zbuffer. The hardware can do the interleaving for us when decompressing. --- diff --git a/src/gallium/drivers/r600/r600_texture.c b/src/gallium/drivers/r600/r600_texture.c index 5681dd88e50..e41fe11ac97 100644 --- a/src/gallium/drivers/r600/r600_texture.c +++ b/src/gallium/drivers/r600/r600_texture.c @@ -394,7 +394,8 @@ r600_texture_create_object(struct pipe_screen *screen, rtex->real_format = base->format; /* We must split depth and stencil into two separate buffers on Evergreen. */ - if (r600_get_family_class(((struct r600_screen*)screen)->radeon) >= EVERGREEN && + if (!(base->flags & R600_RESOURCE_FLAG_TRANSFER) && + r600_get_family_class(((struct r600_screen*)screen)->radeon) >= EVERGREEN && util_format_is_depth_and_stencil(base->format)) { struct pipe_resource stencil; unsigned stencil_pitch_override = 0;