intel/blorp: Rename compile_nir_shader to compile_fs

Signed-off-by: Jason Ekstrand <jason@jlekstrand.net>
Reviewed-by: Topi Pohjolainen <topi.pohjolainen@intel.com>

diff --git a/src/intel/blorp/blorp.c b/src/intel/blorp/blorp.c
index 8905cfa387357181ff45a600eb02cebf62a0ffb4..b495619df27a4709f421c402353dd16253130e51 100644 (file)
--- a/src/intel/blorp/blorp.c
+++ b/src/intel/blorp/blorp.c
@@ -165,11 +165,11 @@ nir_uniform_type_size(const struct glsl_type *type)
 }
 
 const unsigned *
-brw_blorp_compile_nir_shader(struct blorp_context *blorp, struct nir_shader *nir,
-                             const struct brw_wm_prog_key *wm_key,
-                             bool use_repclear,
-                             struct brw_blorp_prog_data *prog_data,
-                             unsigned *program_size)
+blorp_compile_fs(struct blorp_context *blorp, struct nir_shader *nir,
+                 const struct brw_wm_prog_key *wm_key,
+                 bool use_repclear,
+                 struct brw_blorp_prog_data *prog_data,
+                 unsigned *program_size)
 {
    const struct brw_compiler *compiler = blorp->compiler;
 

diff --git a/src/intel/blorp/blorp_blit.c b/src/intel/blorp/blorp_blit.c
index 9357a72a355c3a965a8ed2f81b7f881b94bfaca4..9e32236672a00c1cdd9d1e690e8960604e514530 100644 (file)
--- a/src/intel/blorp/blorp_blit.c
+++ b/src/intel/blorp/blorp_blit.c
@@ -1248,8 +1248,8 @@ brw_blorp_get_blit_kernel(struct blorp_context *blorp,
    wm_key.tex.msaa_16 = prog_key->tex_samples == 16;
    wm_key.multisample_fbo = prog_key->rt_samples > 1;
 
-   program = brw_blorp_compile_nir_shader(blorp, nir, &wm_key, false,
-                                          &prog_data, &program_size);
+   program = blorp_compile_fs(blorp, nir, &wm_key, false,
+                              &prog_data, &program_size);
 
    blorp->upload_shader(blorp, prog_key, sizeof(*prog_key),
                         program, program_size,

diff --git a/src/intel/blorp/blorp_clear.c b/src/intel/blorp/blorp_clear.c
index f93278937dbf82b1fdc41ac79877a1426af3d20c..d1ff3588b17d458c22afd8237bf03300268352dc 100644 (file)
--- a/src/intel/blorp/blorp_clear.c
+++ b/src/intel/blorp/blorp_clear.c
@@ -76,8 +76,8 @@ blorp_params_get_clear_kernel(struct blorp_context *blorp,
    struct brw_blorp_prog_data prog_data;
    unsigned program_size;
    const unsigned *program =
-      brw_blorp_compile_nir_shader(blorp, b.shader, &wm_key, use_replicated_data,
-                                   &prog_data, &program_size);
+      blorp_compile_fs(blorp, b.shader, &wm_key, use_replicated_data,
+                       &prog_data, &program_size);
 
    blorp->upload_shader(blorp, &blorp_key, sizeof(blorp_key),
                         program, program_size,

diff --git a/src/intel/blorp/blorp_priv.h b/src/intel/blorp/blorp_priv.h
index 1fbedce92d56eb11b17eb2ad490d7601e9a06290..bcfd01d83383b8649f0898a156f4ee58f7919083 100644 (file)
--- a/src/intel/blorp/blorp_priv.h
+++ b/src/intel/blorp/blorp_priv.h
@@ -310,11 +310,11 @@ struct brw_blorp_blit_prog_key
 void brw_blorp_init_wm_prog_key(struct brw_wm_prog_key *wm_key);
 
 const unsigned *
-brw_blorp_compile_nir_shader(struct blorp_context *blorp, struct nir_shader *nir,
-                             const struct brw_wm_prog_key *wm_key,
-                             bool use_repclear,
-                             struct brw_blorp_prog_data *prog_data,
-                             unsigned *program_size);
+blorp_compile_fs(struct blorp_context *blorp, struct nir_shader *nir,
+                 const struct brw_wm_prog_key *wm_key,
+                 bool use_repclear,
+                 struct brw_blorp_prog_data *prog_data,
+                 unsigned *program_size);
 
 /** \} */