From d0cbd39a5cf2645734b95fdc1cc6debfd4578646 Mon Sep 17 00:00:00 2001
From: Enrico Galli <enrico.galli@intel.com>
Date: Tue, 25 May 2021 14:41:33 -0700
Subject: [PATCH] microsoft/spirv_to_dxil: Add drive_location assignment

Acked-by: Erik Faye-Lund <erik.faye-lund@collabora.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/10989>
---
 src/microsoft/spirv_to_dxil/spirv_to_dxil.c | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/src/microsoft/spirv_to_dxil/spirv_to_dxil.c b/src/microsoft/spirv_to_dxil/spirv_to_dxil.c
index c5462dd..e1a5fd5 100644
--- a/src/microsoft/spirv_to_dxil/spirv_to_dxil.c
+++ b/src/microsoft/spirv_to_dxil/spirv_to_dxil.c
@@ -131,6 +131,16 @@ spirv_to_dxil(const uint32_t *words, size_t word_count,
 
    nir_shader_gather_info(nir, nir_shader_get_entrypoint(nir));
 
+   nir->info.inputs_read =
+      dxil_reassign_driver_locations(nir, nir_var_shader_in, 0);
+
+   if (stage != MESA_SHADER_FRAGMENT) {
+      nir->info.outputs_written =
+         dxil_reassign_driver_locations(nir, nir_var_shader_out, 0);
+   } else {
+      dxil_sort_ps_outputs(nir);
+   }
+
    struct nir_to_dxil_options opts = {.vulkan_environment = true};
 
    struct blob dxil_blob;
-- 
2.7.4