From: Jason Ekstrand <jason.ekstrand@intel.com>
Date: Thu, 27 Aug 2015 00:55:45 +0000 (-0700)
Subject: HACK: Don't call nir_setup_uniforms
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=efc2cce01f7e938932b03e5e14f7ea0b8a63f734;p=mesa.git

HACK: Don't call nir_setup_uniforms

We're doing our own uniform setup and we don't need to call into the entire
GL stack to mess with things.
---

diff --git a/src/mesa/drivers/dri/i965/brw_fs_nir.cpp b/src/mesa/drivers/dri/i965/brw_fs_nir.cpp
index 6272b61a98b..cd2b850581e 100644
--- a/src/mesa/drivers/dri/i965/brw_fs_nir.cpp
+++ b/src/mesa/drivers/dri/i965/brw_fs_nir.cpp
@@ -42,7 +42,8 @@ fs_visitor::emit_nir_code()
     */
    nir_setup_inputs(nir);
    nir_setup_outputs(nir);
-   nir_setup_uniforms(nir);
+   uniforms = nir->num_uniforms;
+   //nir_setup_uniforms(nir);
    nir_emit_system_values(nir);
 
    /* get the main function and emit it */