From 370bd3ba471ad173a694083c59cd43d431721a06 Mon Sep 17 00:00:00 2001 From: Yevhenii Kolesnikov Date: Fri, 26 Jun 2020 13:40:43 +0300 Subject: [PATCH] nine: fix incorrect calculation of layer count for 3D textures Volume textures don't have a concept of "layers" v1: set last_layer to zero for 3D textures (Axel Davy) Cc: Signed-off-by: Yevhenii Kolesnikov Reviewed-by: Axel Davy Part-of: (cherry picked from commit 845a50ee2525c6cc4e6160eda1826c0670e0daaf) --- .pick_status.json | 2 +- src/gallium/state_trackers/nine/basetexture9.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.pick_status.json b/.pick_status.json index 201d15b7c6e..2a0e39f0b15 100644 --- a/.pick_status.json +++ b/.pick_status.json @@ -2722,7 +2722,7 @@ "description": "nine: fix incorrect calculation of layer count for 3D textures", "nominated": true, "nomination_type": 0, - "resolution": 0, + "resolution": 1, "master_sha": null, "because_sha": null }, diff --git a/src/gallium/state_trackers/nine/basetexture9.c b/src/gallium/state_trackers/nine/basetexture9.c index c59bda5d295..f9772fd45f6 100644 --- a/src/gallium/state_trackers/nine/basetexture9.c +++ b/src/gallium/state_trackers/nine/basetexture9.c @@ -563,7 +563,7 @@ NineBaseTexture9_UpdateSamplerView( struct NineBaseTexture9 *This, templ.format = resource->format; templ.u.tex.first_layer = 0; templ.u.tex.last_layer = resource->target == PIPE_TEXTURE_3D ? - resource->depth0 - 1 : resource->array_size - 1; + 0 : resource->array_size - 1; templ.u.tex.first_level = 0; templ.u.tex.last_level = resource->last_level; templ.swizzle_r = swizzle[0];