Mesa (master): winsys/amdgpu: set flags correctly when allocating depth-stencil buffers
Marek Olšák
mareko at kemper.freedesktop.org
Wed Jun 1 15:35:50 UTC 2016
Module: Mesa
Branch: master
Commit: ea68215c545ba9600d20718a372707be8e0f3905
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=ea68215c545ba9600d20718a372707be8e0f3905
Author: Marek Olšák <marek.olsak at amd.com>
Date: Thu May 19 20:10:10 2016 +0200
winsys/amdgpu: set flags correctly when allocating depth-stencil buffers
This mimics Vulkan. It also documents how to fix stencil texturing.
Reviewed-by: Michel Dänzer <michel.daenzer at amd.com>
---
src/gallium/winsys/amdgpu/drm/amdgpu_surface.c | 10 ++++++++--
1 file changed, 8 insertions(+), 2 deletions(-)
diff --git a/src/gallium/winsys/amdgpu/drm/amdgpu_surface.c b/src/gallium/winsys/amdgpu/drm/amdgpu_surface.c
index 9da4faf..d68c688 100644
--- a/src/gallium/winsys/amdgpu/drm/amdgpu_surface.c
+++ b/src/gallium/winsys/amdgpu/drm/amdgpu_surface.c
@@ -337,7 +337,6 @@ static int amdgpu_surface_init(struct radeon_winsys *rws,
AddrSurfInfoIn.flags.color = !(surf->flags & RADEON_SURF_Z_OR_SBUFFER);
AddrSurfInfoIn.flags.depth = (surf->flags & RADEON_SURF_ZBUFFER) != 0;
- AddrSurfInfoIn.flags.stencil = (surf->flags & RADEON_SURF_SBUFFER) != 0;
AddrSurfInfoIn.flags.cube = type == RADEON_SURF_TYPE_CUBEMAP;
AddrSurfInfoIn.flags.display = (surf->flags & RADEON_SURF_SCANOUT) != 0;
AddrSurfInfoIn.flags.pow2Pad = surf->last_level > 0;
@@ -346,7 +345,12 @@ static int amdgpu_surface_init(struct radeon_winsys *rws,
!(surf->flags & RADEON_SURF_SCANOUT) &&
!compressed && AddrDccIn.numSamples <= 1;
- /* This disables incorrect calculations (hacks) in addrlib. */
+ AddrSurfInfoIn.flags.noStencil = (surf->flags & RADEON_SURF_SBUFFER) == 0;
+ AddrSurfInfoIn.flags.compressZ = AddrSurfInfoIn.flags.depth;
+
+ /* TODO: update addrlib to a newer version, remove this, and
+ * set flags.matchStencilTileCfg = 1 to fix stencil texturing.
+ */
AddrSurfInfoIn.flags.noStencil = 1;
/* Set preferred macrotile parameters. This is usually required
@@ -413,6 +417,8 @@ static int amdgpu_surface_init(struct radeon_winsys *rws,
/* Calculate texture layout information for stencil. */
if (surf->flags & RADEON_SURF_SBUFFER) {
AddrSurfInfoIn.bpp = 8;
+ AddrSurfInfoIn.flags.depth = 0;
+ AddrSurfInfoIn.flags.stencil = 1;
/* This will be ignored if AddrSurfInfoIn.pTileInfo is NULL. */
AddrTileInfoIn.tileSplitBytes = surf->stencil_tile_split;
More information about the mesa-commit
mailing list