Mesa (main): zink: fix gl_SampleMaskIn spirv generation
GitLab Mirror
gitlab-mirror at kemper.freedesktop.org
Tue Oct 26 23:46:54 UTC 2021
Module: Mesa
Branch: main
Commit: 8899f6a19857d533d62945889c413b55cea5223c
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=8899f6a19857d533d62945889c413b55cea5223c
Author: Mike Blumenkrantz <michael.blumenkrantz at gmail.com>
Date: Fri Oct 22 13:47:16 2021 -0400
zink: fix gl_SampleMaskIn spirv generation
the uint[1] -> uint dance is only relevant on the first load, so move
the variable type shuffling inside the create block to avoid breaking successive
loads
fixes #5543
cc: mesa-stable
Reviewed-by: Dave Airlie <airlied at redhat.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/13488>
---
src/gallium/drivers/zink/nir_to_spirv/nir_to_spirv.c | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/src/gallium/drivers/zink/nir_to_spirv/nir_to_spirv.c b/src/gallium/drivers/zink/nir_to_spirv/nir_to_spirv.c
index 22d4525cfba..6a8c8eca156 100644
--- a/src/gallium/drivers/zink/nir_to_spirv/nir_to_spirv.c
+++ b/src/gallium/drivers/zink/nir_to_spirv/nir_to_spirv.c
@@ -2368,12 +2368,12 @@ static void
emit_load_uint_input(struct ntv_context *ctx, nir_intrinsic_instr *intr, SpvId *var_id, const char *var_name, SpvBuiltIn builtin)
{
SpvId var_type = spirv_builder_type_uint(&ctx->builder, 32);
- if (builtin == SpvBuiltInSampleMask) {
- /* gl_SampleMaskIn is an array[1] in spirv... */
- var_type = spirv_builder_type_array(&ctx->builder, var_type, emit_uint_const(ctx, 32, 1));
- spirv_builder_emit_array_stride(&ctx->builder, var_type, sizeof(uint32_t));
- }
if (!*var_id) {
+ if (builtin == SpvBuiltInSampleMask) {
+ /* gl_SampleMaskIn is an array[1] in spirv... */
+ var_type = spirv_builder_type_array(&ctx->builder, var_type, emit_uint_const(ctx, 32, 1));
+ spirv_builder_emit_array_stride(&ctx->builder, var_type, sizeof(uint32_t));
+ }
*var_id = create_builtin_var(ctx, var_type,
SpvStorageClassInput,
var_name,
More information about the mesa-commit
mailing list