From: Nicolai Hähnle Date: Fri, 1 Jul 2016 14:18:34 +0000 (+0200) Subject: winsys/amdgpu: avoid flushed depth when possible X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=660cd3de4acf5ae8ccef2bc5d367de98d9ac0e27;p=mesa.git winsys/amdgpu: avoid flushed depth when possible If a depth/stencil texture has no mipmaps, we can always get a layout that is compatible with DB and TC. Reviewed-by: Marek Olšák --- diff --git a/src/gallium/winsys/amdgpu/drm/amdgpu_surface.c b/src/gallium/winsys/amdgpu/drm/amdgpu_surface.c index cafa75da0b4..615d5a2da14 100644 --- a/src/gallium/winsys/amdgpu/drm/amdgpu_surface.c +++ b/src/gallium/winsys/amdgpu/drm/amdgpu_surface.c @@ -373,10 +373,15 @@ static int amdgpu_surface_init(struct radeon_winsys *rws, 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. + /* noStencil = 0 can result in a depth part that is incompatible with + * mipmapped texturing. So set noStencil = 1 when mipmaps are requested (in + * this case, we may end up setting stencil_adjusted). + * + * TODO: update addrlib to a newer version, remove this, and + * use flags.matchStencilTileCfg = 1 as an alternative fix. */ - AddrSurfInfoIn.flags.noStencil = 1; + if (surf->last_level > 0) + AddrSurfInfoIn.flags.noStencil = 1; /* Set preferred macrotile parameters. This is usually required * for shared resources. This is for 2D tiling only. */