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

radeonsi: Depth/stencil fixes. 

Adapted from r600g commit 018e3f75d6.

Signed-off-by: Michel Dänzer <michel.daenzer@amd.com>
This commit is contained in:
Michel Dänzer 2012-11-13 17:57:07 +01:00 committed by Michel Dänzer
parent 1a616c1009
commit 20f651d003
2 changed files with 22 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/gallium/drivers/radeonsi/r600_resource.h
View File

@ -26,7 +26,8 @@
#include "util/u_transfer.h" #include "util/u_transfer.h"
/* flag to indicate a resource is to be used as a transfer so should not be tiled */ /* flag to indicate a resource is to be used as a transfer so should not be tiled */
#define R600_RESOURCE_FLAG_TRANSFER PIPE_RESOURCE_FLAG_DRV_PRIV #define R600_RESOURCE_FLAG_TRANSFER PIPE_RESOURCE_FLAG_DRV_PRIV
#define R600_RESOURCE_FLAG_FLUSHED_DEPTH (PIPE_RESOURCE_FLAG_DRV_PRIV << 1)
/* Texture transfer. */ /* Texture transfer. */
struct r600_transfer { struct r600_transfer {

28
src/gallium/drivers/radeonsi/r600_texture.c
View File

@ -75,8 +75,16 @@ static unsigned r600_texture_get_offset(struct r600_resource_texture *rtex,
static int r600_init_surface(struct radeon_surface *surface, static int r600_init_surface(struct radeon_surface *surface,
const struct pipe_resource *ptex, const struct pipe_resource *ptex,
unsigned array_mode, bool is_transfer) unsigned array_mode,
bool is_transfer, bool is_flushed_depth)
{ {
const struct util_format_description *desc =
util_format_description(ptex->format);
bool is_depth, is_stencil;
is_depth = util_format_has_depth(desc);
is_stencil = util_format_has_stencil(desc);
surface->npix_x = ptex->width0; surface->npix_x = ptex->width0;
surface->npix_y = ptex->height0; surface->npix_y = ptex->height0;
surface->npix_z = ptex->depth0; surface->npix_z = ptex->depth0;
@ -136,11 +144,14 @@ static int r600_init_surface(struct radeon_surface *surface,
if (ptex->bind & PIPE_BIND_SCANOUT) { if (ptex->bind & PIPE_BIND_SCANOUT) {
surface->flags |= RADEON_SURF_SCANOUT; surface->flags |= RADEON_SURF_SCANOUT;
} }
if (util_format_is_depth_and_stencil(ptex->format) && !is_transfer) {
surface->flags |= RADEON_SURF_ZBUFFER;
surface->flags |= RADEON_SURF_SBUFFER;
}
if (!is_transfer && !is_flushed_depth && is_depth) {
surface->flags |= RADEON_SURF_ZBUFFER;
if (is_stencil) {
surface->flags |= RADEON_SURF_SBUFFER;
}
}
return 0; return 0;
} }
@ -510,7 +521,8 @@ struct pipe_resource *si_texture_create(struct pipe_screen *screen,
#endif #endif
r = r600_init_surface(&surface, templ, array_mode, r = r600_init_surface(&surface, templ, array_mode,
templ->flags & R600_RESOURCE_FLAG_TRANSFER); templ->flags & R600_RESOURCE_FLAG_TRANSFER,
templ->flags & R600_RESOURCE_FLAG_FLUSHED_DEPTH);
if (r) { if (r) {
return NULL; return NULL;
} }
@ -591,7 +603,7 @@ struct pipe_resource *si_texture_from_handle(struct pipe_screen *screen,
else else
array_mode = V_009910_ARRAY_LINEAR_ALIGNED; array_mode = V_009910_ARRAY_LINEAR_ALIGNED;
r = r600_init_surface(&surface, templ, array_mode, 0); r = r600_init_surface(&surface, templ, array_mode, false, false);
if (r) { if (r) {
return NULL; return NULL;
} }
@ -618,7 +630,7 @@ int r600_texture_depth_flush(struct pipe_context *ctx,
resource.nr_samples = texture->nr_samples; resource.nr_samples = texture->nr_samples;
resource.usage = PIPE_USAGE_DYNAMIC; resource.usage = PIPE_USAGE_DYNAMIC;
resource.bind = texture->bind | PIPE_BIND_DEPTH_STENCIL; resource.bind = texture->bind | PIPE_BIND_DEPTH_STENCIL;
resource.flags = R600_RESOURCE_FLAG_TRANSFER | texture->flags; resource.flags = R600_RESOURCE_FLAG_TRANSFER | R600_RESOURCE_FLAG_FLUSHED_DEPTH | texture->flags;
rtex->flushed_depth_texture = (struct r600_resource_texture *)ctx->screen->resource_create(ctx->screen, &resource); rtex->flushed_depth_texture = (struct r600_resource_texture *)ctx->screen->resource_create(ctx->screen, &resource);
if (rtex->flushed_depth_texture == NULL) { if (rtex->flushed_depth_texture == NULL) {