Mesa (master): intel/blorp: Rename compile_nir_shader to compile_fs
Jason Ekstrand
jekstrand at kemper.freedesktop.org
Fri Oct 28 05:53:09 UTC 2016
Module: Mesa
Branch: master
Commit: ab92480272bc34d943d28506cc36759e141b4371
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=ab92480272bc34d943d28506cc36759e141b4371
Author: Jason Ekstrand <jason.ekstrand at intel.com>
Date: Fri Oct 21 12:04:25 2016 -0700
intel/blorp: Rename compile_nir_shader to compile_fs
Signed-off-by: Jason Ekstrand <jason at jlekstrand.net>
Reviewed-by: Topi Pohjolainen <topi.pohjolainen at intel.com>
---
src/intel/blorp/blorp.c | 10 +++++-----
src/intel/blorp/blorp_blit.c | 4 ++--
src/intel/blorp/blorp_clear.c | 4 ++--
src/intel/blorp/blorp_priv.h | 10 +++++-----
4 files changed, 14 insertions(+), 14 deletions(-)
diff --git a/src/intel/blorp/blorp.c b/src/intel/blorp/blorp.c
index 8905cfa..b495619 100644
--- 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 9357a72..9e32236 100644
--- 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 f932789..d1ff358 100644
--- 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 1fbedce..bcfd01d 100644
--- 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);
/** \} */
More information about the mesa-commit
mailing list