Mesa (main): microsoft/compiler: Fix Layer type

GitLab Mirror gitlab-mirror at kemper.freedesktop.org
Wed Jun 15 22:47:33 UTC 2022


Module: Mesa
Branch: main
Commit: 9c45ee3f86dab8dbbe34a428a489b2fbe697234d
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=9c45ee3f86dab8dbbe34a428a489b2fbe697234d

Author: Boris Brezillon <boris.brezillon at collabora.com>
Date:   Tue Jun 14 22:23:18 2022 +0200

microsoft/compiler: Fix Layer type

DXIL wants a uint, but we get passed an int.

Reviewed-by: Jesse Natalie <jenatali at microsoft.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/17039>

---

 src/microsoft/compiler/nir_to_dxil.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/microsoft/compiler/nir_to_dxil.c b/src/microsoft/compiler/nir_to_dxil.c
index 095d9f35115..7cec75b32b8 100644
--- a/src/microsoft/compiler/nir_to_dxil.c
+++ b/src/microsoft/compiler/nir_to_dxil.c
@@ -5730,11 +5730,11 @@ nir_to_dxil(struct nir_shader *s, const struct nir_to_dxil_options *opts,
    if (s->info.stage <= MESA_SHADER_FRAGMENT) {
       uint64_t in_mask =
          s->info.stage == MESA_SHADER_VERTEX ?
-         0 : (VARYING_BIT_PRIMITIVE_ID | VARYING_BIT_VIEWPORT);
+         0 : (VARYING_BIT_PRIMITIVE_ID | VARYING_BIT_VIEWPORT | VARYING_BIT_LAYER);
       uint64_t out_mask =
          s->info.stage == MESA_SHADER_FRAGMENT ?
          ((1ull << FRAG_RESULT_STENCIL) | (1ull << FRAG_RESULT_SAMPLE_MASK)) :
-         (VARYING_BIT_PRIMITIVE_ID | VARYING_BIT_VIEWPORT);
+         (VARYING_BIT_PRIMITIVE_ID | VARYING_BIT_VIEWPORT | VARYING_BIT_LAYER);
 
       NIR_PASS_V(s, dxil_nir_fix_io_uint_type, in_mask, out_mask);
    }



More information about the mesa-commit mailing list