From: Kenneth Graunke <kenneth@whitecape.org>
Date: Fri, 9 Nov 2018 19:56:15 +0000 (-0800)
Subject: iris: drop iris_setup_push_uniform_range
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=1ef68d77c06993d44bd44e0fc48abeb1a848e597;p=mesa.git

iris: drop iris_setup_push_uniform_range

it doesn't do anything, we have no params.  I guess I thought there
would be some, but they all get dead code eliminated even if we try
to make them exist in the first place.
---

diff --git a/src/gallium/drivers/iris/iris_program.c b/src/gallium/drivers/iris/iris_program.c
index 348ff05b44b..e2dcc73dab9 100644
--- a/src/gallium/drivers/iris/iris_program.c
+++ b/src/gallium/drivers/iris/iris_program.c
@@ -532,29 +532,6 @@ iris_setup_uniforms(const struct brw_compiler *compiler,
    *out_num_system_values = num_system_values;
 }
 
-/**
- * If we still have regular uniforms as push constants after the backend
- * compilation, set up a UBO range for them.  This will be used to fill
- * out the 3DSTATE_CONSTANT_* packets which cause the data to be pushed.
- */
-static void
-iris_setup_push_uniform_range(const struct brw_compiler *compiler,
-                              struct brw_stage_prog_data *prog_data)
-{
-   // XXX: I don't think this code does anything at all.
-
-   if (prog_data->nr_params) {
-      for (int i = 3; i > 0; i--)
-         prog_data->ubo_ranges[i] = prog_data->ubo_ranges[i - 1];
-
-      prog_data->ubo_ranges[0] = (struct brw_ubo_range) {
-         .block = 0,
-         .start = 0,
-         .length = DIV_ROUND_UP(prog_data->nr_params, 8),
-      };
-   }
-}
-
 /**
  * Compile a vertex shader, and upload the assembly.
  */
@@ -610,8 +587,6 @@ iris_compile_vs(struct iris_context *ice,
       return false;
    }
 
-   iris_setup_push_uniform_range(compiler, prog_data);
-
    uint32_t *so_decls =
       ice->vtbl.create_so_decl_list(&ish->stream_output,
                                     &vue_prog_data->vue_map);
@@ -751,8 +726,6 @@ iris_compile_tcs(struct iris_context *ice,
       return false;
    }
 
-   iris_setup_push_uniform_range(compiler, prog_data);
-
    iris_upload_and_bind_shader(ice, IRIS_CACHE_TCS, key, program, prog_data,
                                NULL, system_values, num_system_values);
 
@@ -828,8 +801,6 @@ iris_compile_tes(struct iris_context *ice,
       return false;
    }
 
-   iris_setup_push_uniform_range(compiler, prog_data);
-
    uint32_t *so_decls =
       ice->vtbl.create_so_decl_list(&ish->stream_output,
                                     &vue_prog_data->vue_map);
@@ -902,8 +873,6 @@ iris_compile_gs(struct iris_context *ice,
       return false;
    }
 
-   iris_setup_push_uniform_range(compiler, prog_data);
-
    uint32_t *so_decls =
       ice->vtbl.create_so_decl_list(&ish->stream_output,
                                     &vue_prog_data->vue_map);
@@ -980,8 +949,6 @@ iris_compile_fs(struct iris_context *ice,
 
    //brw_alloc_stage_scratch(brw, &brw->wm.base, prog_data.base.total_scratch);
 
-   iris_setup_push_uniform_range(compiler, prog_data);
-
    iris_upload_and_bind_shader(ice, IRIS_CACHE_FS, key, program, prog_data,
                                NULL, system_values, num_system_values);