From: Jason Ekstrand <jason.ekstrand@intel.com>
Date: Tue, 17 Nov 2015 06:26:42 +0000 (-0800)
Subject: HACK/i965: Disable assign_var_locations on uniforms
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=42b4417031eda1496db782d117c563ffae7929ea;p=mesa.git

HACK/i965: Disable assign_var_locations on uniforms

This conflicts with the way we're doing uniforms in Vulkan.
---

diff --git a/src/mesa/drivers/dri/i965/brw_nir.c b/src/mesa/drivers/dri/i965/brw_nir.c
index 91358d8f389..10e92735210 100644
--- a/src/mesa/drivers/dri/i965/brw_nir.c
+++ b/src/mesa/drivers/dri/i965/brw_nir.c
@@ -298,9 +298,9 @@ brw_lower_nir(nir_shader *nir,
 
    OPT_V(brw_nir_lower_inputs, devinfo, is_scalar);
    OPT_V(brw_nir_lower_outputs, is_scalar);
-   nir_assign_var_locations(&nir->uniforms,
-                            &nir->num_uniforms,
-                            is_scalar ? type_size_scalar : type_size_vec4);
+   //nir_assign_var_locations(&nir->uniforms,
+   //                         &nir->num_uniforms,
+   //                         is_scalar ? type_size_scalar : type_size_vec4);
    OPT_V(nir_lower_io, nir_var_all, is_scalar ? type_size_scalar : type_size_vec4);
 
    if (shader_prog) {