From: Matt Turner <mattst88@gmail.com>
Date: Thu, 9 Mar 2017 19:01:53 +0000 (-0800)
Subject: i965: Return progress from brw_nir_lower_uniforms().
X-Git-Tag: upstream/17.1.0~1059
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=e0f8daeb86df73cdd76e7ae4b06203d84367d6e0;p=platform%2Fupstream%2Fmesa.git

i965: Return progress from brw_nir_lower_uniforms().

Reviewed-by: Jason Ekstrand <jason@jlekstrand.net>
---

diff --git a/src/mesa/drivers/dri/i965/brw_program.c b/src/mesa/drivers/dri/i965/brw_program.c
index 57c4cd4..e1f9896 100644
--- a/src/mesa/drivers/dri/i965/brw_program.c
+++ b/src/mesa/drivers/dri/i965/brw_program.c
@@ -47,17 +47,17 @@
 #include "brw_defines.h"
 #include "intel_batchbuffer.h"
 
-static void
+static bool
 brw_nir_lower_uniforms(nir_shader *nir, bool is_scalar)
 {
    if (is_scalar) {
       nir_assign_var_locations(&nir->uniforms, &nir->num_uniforms,
                                type_size_scalar_bytes);
-      nir_lower_io(nir, nir_var_uniform, type_size_scalar_bytes, 0);
+      return nir_lower_io(nir, nir_var_uniform, type_size_scalar_bytes, 0);
    } else {
       nir_assign_var_locations(&nir->uniforms, &nir->num_uniforms,
                                type_size_vec4_bytes);
-      nir_lower_io(nir, nir_var_uniform, type_size_vec4_bytes, 0);
+      return nir_lower_io(nir, nir_var_uniform, type_size_vec4_bytes, 0);
    }
 }