OpenHarmony/third_party_mesa3d
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

lavapipe: when in doubt, swizzle the swizzle

Browse Source 
instead of swizzling.

Fixes a bunch of broken depth/stencil swizzling tests in CTS
dEQP-VK.pipeline.monolithic.sampler.border_swizzle.s8_uint_stencil.argb.transparent_black.gather_0.no_swizzle_hint

v2: kusma had nicer ideas.

Fixes: 7826648e14 ("lavapipe: fix depth texturing swizzle")
Reviewed-by: Erik Faye-Lund <erik.faye-lund@collabora.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/23428>
This commit is contained in:
Dave Airlie
2023-06-05 17:34:20 +10:00
committed by Marge Bot
parent 7059aa2f84
commit 48745d58e2
1 changed files with 15 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
src/gallium/frontends/lavapipe/lvp_image.c
View File

@@ -174,14 +174,17 @@ lvp_DestroyImage(VkDevice _device, VkImage _image,
#include "util/u_sampler.h"
#include "util/u_inlines.h"
#define fix_depth_swizzle(x) do { \
if (x > PIPE_SWIZZLE_X && x < PIPE_SWIZZLE_0) \
x = PIPE_SWIZZLE_0; \
} while (0)
#define fix_depth_swizzle_a(x) do { \
if (x > PIPE_SWIZZLE_X && x < PIPE_SWIZZLE_0) \
x = PIPE_SWIZZLE_1; \
} while (0)
static inline char conv_depth_swiz(char swiz) {
switch (swiz) {
case PIPE_SWIZZLE_Y:
case PIPE_SWIZZLE_Z:
return PIPE_SWIZZLE_0;
case PIPE_SWIZZLE_W:
return PIPE_SWIZZLE_1;
default:
return swiz;
}
}
static struct pipe_sampler_view *
lvp_create_samplerview(struct pipe_context *pctx, struct lvp_image_view *iv)
@@ -225,10 +228,10 @@ lvp_create_samplerview(struct pipe_context *pctx, struct lvp_image_view *iv)
*/
if (iv->vk.aspects == VK_IMAGE_ASPECT_DEPTH_BIT ||
iv->vk.aspects == VK_IMAGE_ASPECT_STENCIL_BIT) {
fix_depth_swizzle(templ.swizzle_r);
fix_depth_swizzle(templ.swizzle_g);
fix_depth_swizzle(templ.swizzle_b);
fix_depth_swizzle_a(templ.swizzle_a);
templ.swizzle_r = conv_depth_swiz(templ.swizzle_r);
templ.swizzle_g = conv_depth_swiz(templ.swizzle_g);
templ.swizzle_b = conv_depth_swiz(templ.swizzle_b);
templ.swizzle_a = conv_depth_swiz(templ.swizzle_a);
}
return pctx->create_sampler_view(pctx, iv->image->bo, &templ);