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

nvk: Refactor image intrinsic lowering a bit

Browse Source 
This makes lower_msaa_image_intrin do all of the lowering for MSAA
images.  It's a tiny bit of duplicated code but it'll make more sense
when we work buffer views in the next commit.

Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/30580>
This commit is contained in:
Faith Ekstrand
2024-08-06 15:09:42 -05:00
committed by Marge Bot
parent 93b30bb353
commit 8cafd2667f
1 changed files with 14 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/nouveau/vulkan/nvk_nir_lower_descriptors.c
+14 -7
View File
@@ -864,13 +864,18 @@ load_resource_deref_desc(nir_builder *b,
}
static void
lower_msaa_image_intrin(nir_builder *b, nir_intrinsic_instr *intrin)
lower_msaa_image_intrin(nir_builder *b, nir_intrinsic_instr *intrin,
const struct lower_descriptors_ctx *ctx)
{
assert(nir_intrinsic_image_dim(intrin) == GLSL_SAMPLER_DIM_MS);
b->cursor = nir_before_instr(&intrin->instr);
nir_deref_instr *deref = nir_src_as_deref(intrin->src[0]);
nir_def *desc = load_resource_deref_desc(b, 1, 32, deref, 0, ctx);
nir_def *img_index = nir_ubitfield_extract_imm(b, desc, 0, 20);
nir_rewrite_image_intrinsic(intrin, img_index, true);
nir_def *desc = intrin->src[0].ssa;
nir_def *sw_log2 = nir_ubitfield_extract_imm(b, desc, 20, 2);
nir_def *sh_log2 = nir_ubitfield_extract_imm(b, desc, 22, 2);
@@ -941,13 +946,15 @@ static bool
lower_image_intrin(nir_builder *b, nir_intrinsic_instr *intrin,
const struct lower_descriptors_ctx *ctx)
{
b->cursor = nir_before_instr(&intrin->instr);
nir_deref_instr *deref = nir_src_as_deref(intrin->src[0]);
nir_def *desc = load_resource_deref_desc(b, 1, 32, deref, 0, ctx);
nir_rewrite_image_intrinsic(intrin, desc, true);
if (nir_intrinsic_image_dim(intrin) == GLSL_SAMPLER_DIM_MS)
lower_msaa_image_intrin(b, intrin);
if (glsl_get_sampler_dim(deref->type) == GLSL_SAMPLER_DIM_MS) {
lower_msaa_image_intrin(b, intrin, ctx);
} else {
b->cursor = nir_before_instr(&intrin->instr);
nir_def *desc = load_resource_deref_desc(b, 1, 32, deref, 0, ctx);
nir_rewrite_image_intrinsic(intrin, desc, true);
}
return true;
}