[Mesa-dev] [PATCH 16/17] i965: Rename brw_foo_emit to brw_compile_foo
Jason Ekstrand
jason at jlekstrand.net
Thu Oct 8 17:22:48 PDT 2015
---
src/mesa/drivers/dri/i965/brw_cs.c | 6 +++---
src/mesa/drivers/dri/i965/brw_cs.h | 16 ++++++++--------
src/mesa/drivers/dri/i965/brw_fs.cpp | 18 +++++++++---------
src/mesa/drivers/dri/i965/brw_gs.c | 6 +++---
src/mesa/drivers/dri/i965/brw_vec4.cpp | 18 +++++++++---------
src/mesa/drivers/dri/i965/brw_vec4_gs_visitor.cpp | 16 ++++++++--------
src/mesa/drivers/dri/i965/brw_vec4_gs_visitor.h | 17 +++++++++--------
src/mesa/drivers/dri/i965/brw_vs.c | 8 ++++----
src/mesa/drivers/dri/i965/brw_vs.h | 18 +++++++++---------
src/mesa/drivers/dri/i965/brw_wm.c | 2 +-
src/mesa/drivers/dri/i965/brw_wm.h | 2 +-
11 files changed, 64 insertions(+), 63 deletions(-)
diff --git a/src/mesa/drivers/dri/i965/brw_cs.c b/src/mesa/drivers/dri/i965/brw_cs.c
index 12e7509..263d224 100644
--- a/src/mesa/drivers/dri/i965/brw_cs.c
+++ b/src/mesa/drivers/dri/i965/brw_cs.c
@@ -106,9 +106,9 @@ brw_codegen_cs_prog(struct brw_context *brw,
st_index = brw_get_shader_time_index(brw, prog, &cp->program.Base, ST_CS);
char *error_str;
- program = brw_cs_emit(brw->intelScreen->compiler, brw, mem_ctx,
- key, &prog_data, cp->program.Base.nir,
- st_index, &program_size, &error_str);
+ program = brw_compile_cs(brw->intelScreen->compiler, brw, mem_ctx,
+ key, &prog_data, cp->program.Base.nir,
+ st_index, &program_size, &error_str);
if (program == NULL) {
prog->LinkStatus = false;
ralloc_strcat(&prog->InfoLog, error_str);
diff --git a/src/mesa/drivers/dri/i965/brw_cs.h b/src/mesa/drivers/dri/i965/brw_cs.h
index 1a9613e..aac519f 100644
--- a/src/mesa/drivers/dri/i965/brw_cs.h
+++ b/src/mesa/drivers/dri/i965/brw_cs.h
@@ -42,14 +42,14 @@ brw_upload_cs_prog(struct brw_context *brw);
struct nir_shader;
const unsigned *
-brw_cs_emit(const struct brw_compiler *compiler, void *log_data,
- void *mem_ctx,
- const struct brw_cs_prog_key *key,
- struct brw_cs_prog_data *prog_data,
- const struct nir_shader *shader,
- int shader_time_index,
- unsigned *final_assembly_size,
- char **error_str);
+brw_compile_cs(const struct brw_compiler *compiler, void *log_data,
+ void *mem_ctx,
+ const struct brw_cs_prog_key *key,
+ struct brw_cs_prog_data *prog_data,
+ const struct nir_shader *shader,
+ int shader_time_index,
+ unsigned *final_assembly_size,
+ char **error_str);
void
brw_cs_fill_local_id_payload(const struct brw_cs_prog_data *cs_prog_data,
diff --git a/src/mesa/drivers/dri/i965/brw_fs.cpp b/src/mesa/drivers/dri/i965/brw_fs.cpp
index 0e39b50..23d6a3a 100644
--- a/src/mesa/drivers/dri/i965/brw_fs.cpp
+++ b/src/mesa/drivers/dri/i965/brw_fs.cpp
@@ -5199,7 +5199,7 @@ computed_depth_mode(const nir_shader *shader)
}
const unsigned *
-brw_wm_fs_emit(const struct brw_compiler *compiler, void *log_data,
+brw_compile_fs(const struct brw_compiler *compiler, void *log_data,
void *mem_ctx,
const struct brw_wm_prog_key *key,
struct brw_wm_prog_data *prog_data,
@@ -5354,14 +5354,14 @@ fs_visitor::emit_cs_work_group_id_setup()
}
const unsigned *
-brw_cs_emit(const struct brw_compiler *compiler, void *log_data,
- void *mem_ctx,
- const struct brw_cs_prog_key *key,
- struct brw_cs_prog_data *prog_data,
- const nir_shader *shader,
- int shader_time_index,
- unsigned *final_assembly_size,
- char **error_str)
+brw_compile_cs(const struct brw_compiler *compiler, void *log_data,
+ void *mem_ctx,
+ const struct brw_cs_prog_key *key,
+ struct brw_cs_prog_data *prog_data,
+ const nir_shader *shader,
+ int shader_time_index,
+ unsigned *final_assembly_size,
+ char **error_str)
{
prog_data->local_size[0] = shader->info.cs.local_size[0];
prog_data->local_size[1] = shader->info.cs.local_size[1];
diff --git a/src/mesa/drivers/dri/i965/brw_gs.c b/src/mesa/drivers/dri/i965/brw_gs.c
index 469a6fb..10a7f28 100644
--- a/src/mesa/drivers/dri/i965/brw_gs.c
+++ b/src/mesa/drivers/dri/i965/brw_gs.c
@@ -303,9 +303,9 @@ brw_codegen_gs_prog(struct brw_context *brw,
unsigned program_size;
char *error_str;
const unsigned *program =
- brw_gs_emit(brw->intelScreen->compiler, brw, &c,
- shader->Program->nir, prog,
- mem_ctx, st_index, &program_size, &error_str);
+ brw_compile_gs(brw->intelScreen->compiler, brw, &c,
+ shader->Program->nir, prog,
+ mem_ctx, st_index, &program_size, &error_str);
if (program == NULL) {
ralloc_free(mem_ctx);
return false;
diff --git a/src/mesa/drivers/dri/i965/brw_vec4.cpp b/src/mesa/drivers/dri/i965/brw_vec4.cpp
index d6549de..5336590 100644
--- a/src/mesa/drivers/dri/i965/brw_vec4.cpp
+++ b/src/mesa/drivers/dri/i965/brw_vec4.cpp
@@ -1937,15 +1937,15 @@ extern "C" {
* Returns the final assembly and the program's size.
*/
const unsigned *
-brw_vs_emit(const struct brw_compiler *compiler, void *log_data,
- void *mem_ctx,
- const struct brw_vs_prog_key *key,
- struct brw_vs_prog_data *prog_data,
- const nir_shader *shader,
- gl_clip_plane *clip_planes,
- int shader_time_index,
- unsigned *final_assembly_size,
- char **error_str)
+brw_compile_vs(const struct brw_compiler *compiler, void *log_data,
+ void *mem_ctx,
+ const struct brw_vs_prog_key *key,
+ struct brw_vs_prog_data *prog_data,
+ const nir_shader *shader,
+ gl_clip_plane *clip_planes,
+ int shader_time_index,
+ unsigned *final_assembly_size,
+ char **error_str)
{
const unsigned *assembly = NULL;
diff --git a/src/mesa/drivers/dri/i965/brw_vec4_gs_visitor.cpp b/src/mesa/drivers/dri/i965/brw_vec4_gs_visitor.cpp
index 173a8c4..890b97a 100644
--- a/src/mesa/drivers/dri/i965/brw_vec4_gs_visitor.cpp
+++ b/src/mesa/drivers/dri/i965/brw_vec4_gs_visitor.cpp
@@ -599,14 +599,14 @@ vec4_gs_visitor::gs_end_primitive()
}
extern "C" const unsigned *
-brw_gs_emit(const struct brw_compiler *compiler, void *log_data,
- struct brw_gs_compile *c,
- const nir_shader *shader,
- struct gl_shader_program *shader_prog,
- void *mem_ctx,
- int shader_time_index,
- unsigned *final_assembly_size,
- char **error_str)
+brw_compile_gs(const struct brw_compiler *compiler, void *log_data,
+ struct brw_gs_compile *c,
+ const nir_shader *shader,
+ struct gl_shader_program *shader_prog,
+ void *mem_ctx,
+ int shader_time_index,
+ unsigned *final_assembly_size,
+ char **error_str)
{
if (compiler->devinfo->gen >= 7) {
/* Compile the geometry shader in DUAL_OBJECT dispatch mode, if we can do
diff --git a/src/mesa/drivers/dri/i965/brw_vec4_gs_visitor.h b/src/mesa/drivers/dri/i965/brw_vec4_gs_visitor.h
index e9ced7f..df33e94 100644
--- a/src/mesa/drivers/dri/i965/brw_vec4_gs_visitor.h
+++ b/src/mesa/drivers/dri/i965/brw_vec4_gs_visitor.h
@@ -51,14 +51,15 @@ struct brw_gs_compile
extern "C" {
#endif
-const unsigned *brw_gs_emit(const struct brw_compiler *compiler, void *log_data,
- struct brw_gs_compile *c,
- const nir_shader *shader,
- struct gl_shader_program *shader_prog,
- void *mem_ctx,
- int shader_time_index,
- unsigned *final_assembly_size,
- char **error_str);
+const unsigned *brw_compile_gs(const struct brw_compiler *compiler,
+ void *log_data,
+ struct brw_gs_compile *c,
+ const nir_shader *shader,
+ struct gl_shader_program *shader_prog,
+ void *mem_ctx,
+ int shader_time_index,
+ unsigned *final_assembly_size,
+ char **error_str);
#ifdef __cplusplus
} /* extern "C" */
diff --git a/src/mesa/drivers/dri/i965/brw_vs.c b/src/mesa/drivers/dri/i965/brw_vs.c
index f54c9a3..3b3eb8b 100644
--- a/src/mesa/drivers/dri/i965/brw_vs.c
+++ b/src/mesa/drivers/dri/i965/brw_vs.c
@@ -181,10 +181,10 @@ brw_codegen_vs_prog(struct brw_context *brw,
/* Emit GEN4 code.
*/
char *error_str;
- program = brw_vs_emit(brw->intelScreen->compiler, brw, mem_ctx, key,
- &prog_data, vp->program.Base.nir,
- brw_select_clip_planes(&brw->ctx),
- st_index, &program_size, &error_str);
+ program = brw_compile_vs(brw->intelScreen->compiler, brw, mem_ctx, key,
+ &prog_data, vp->program.Base.nir,
+ brw_select_clip_planes(&brw->ctx),
+ st_index, &program_size, &error_str);
if (program == NULL) {
if (prog) {
prog->LinkStatus = false;
diff --git a/src/mesa/drivers/dri/i965/brw_vs.h b/src/mesa/drivers/dri/i965/brw_vs.h
index fa6642c..8058bad 100644
--- a/src/mesa/drivers/dri/i965/brw_vs.h
+++ b/src/mesa/drivers/dri/i965/brw_vs.h
@@ -56,15 +56,15 @@ extern "C" {
struct nir_shader;
-const unsigned *brw_vs_emit(const struct brw_compiler *compiler, void *log_data,
- void *mem_ctx,
- const struct brw_vs_prog_key *key,
- struct brw_vs_prog_data *prog_data,
- const struct nir_shader *shader,
- gl_clip_plane *clip_planes,
- int shader_time_index,
- unsigned *final_assembly_size,
- char **error_str);
+const unsigned *brw_compile_vs(const struct brw_compiler *compiler, void *log_data,
+ void *mem_ctx,
+ const struct brw_vs_prog_key *key,
+ struct brw_vs_prog_data *prog_data,
+ const struct nir_shader *shader,
+ gl_clip_plane *clip_planes,
+ int shader_time_index,
+ unsigned *final_assembly_size,
+ char **error_str);
void brw_vs_debug_recompile(struct brw_context *brw,
struct gl_shader_program *prog,
const struct brw_vs_prog_key *key);
diff --git a/src/mesa/drivers/dri/i965/brw_wm.c b/src/mesa/drivers/dri/i965/brw_wm.c
index 91bda35..0602f6e 100644
--- a/src/mesa/drivers/dri/i965/brw_wm.c
+++ b/src/mesa/drivers/dri/i965/brw_wm.c
@@ -133,7 +133,7 @@ brw_codegen_wm_prog(struct brw_context *brw,
}
char *error_str = NULL;
- program = brw_wm_fs_emit(brw->intelScreen->compiler, brw, mem_ctx,
+ program = brw_compile_fs(brw->intelScreen->compiler, brw, mem_ctx,
key, &prog_data, fp->program.Base.nir,
&fp->program.Base, st_index8, st_index16,
brw->use_rep_send, &program_size, &error_str);
diff --git a/src/mesa/drivers/dri/i965/brw_wm.h b/src/mesa/drivers/dri/i965/brw_wm.h
index ac22bee..7e4bf35 100644
--- a/src/mesa/drivers/dri/i965/brw_wm.h
+++ b/src/mesa/drivers/dri/i965/brw_wm.h
@@ -68,7 +68,7 @@ struct nir_shader;
*
* Returns the final assembly and the program's size.
*/
-const unsigned *brw_wm_fs_emit(const struct brw_compiler *compiler,
+const unsigned *brw_compile_fs(const struct brw_compiler *compiler,
void *log_data,
void *mem_ctx,
const struct brw_wm_prog_key *key,
--
2.5.0.400.gff86faf
More information about the mesa-dev
mailing list