diff options
| author | Jason Ekstrand <jason.ekstrand@intel.com> | 2016-10-21 12:04:25 -0700 |
|---|---|---|
| committer | Emil Velikov <emil.l.velikov@gmail.com> | 2016-11-01 12:44:10 +0000 |
| commit | 75258017dda55a32dcf3114113f8fccde47a490d (patch) | |
| tree | 927b3049e198efc01e691ae7167bdf99bbbc08d7 /src | |
| parent | 875534e14c1ceccc22fbf18003ad2a5b44407a38 (diff) | |
| download | external_mesa3d-75258017dda55a32dcf3114113f8fccde47a490d.zip external_mesa3d-75258017dda55a32dcf3114113f8fccde47a490d.tar.gz external_mesa3d-75258017dda55a32dcf3114113f8fccde47a490d.tar.bz2 | |
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>
(cherry picked from commit ab92480272bc34d943d28506cc36759e141b4371)
Diffstat (limited to 'src')
| -rw-r--r-- | src/intel/blorp/blorp.c | 10 | ||||
| -rw-r--r-- | src/intel/blorp/blorp_blit.c | 4 | ||||
| -rw-r--r-- | src/intel/blorp/blorp_clear.c | 4 | ||||
| -rw-r--r-- | 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 08afffe..d3cda6d 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 8ecfaa3..feec6f4 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); /** \} */ |