i965: Rename brw_foo_emit to brw_compile_foo

Reviewed-by: Topi Pohjolainen <topi.pohjolainen@intel.com>

diff --git a/src/mesa/drivers/dri/i965/brw_cs.c b/src/mesa/drivers/dri/i965/brw_cs.c
index 12e75097f8bb3e00856ce03153c1fa8910e29e80..263d224e8829357273d862201c3702796add825c 100644 (file)
--- 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 1a9613e30395f935365afcbd85ec1e2888d29151..aac519f1fd19d921e1db7358e390f47d93e8faac 100644 (file)
--- 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 2d162b8ae993eb25896a378203a3682e19ea6b68..3c767ce58f017c9c832df07e2ec2634ab3c8f2a2 100644 (file)
--- a/src/mesa/drivers/dri/i965/brw_fs.cpp
+++ b/src/mesa/drivers/dri/i965/brw_fs.cpp
@@ -5177,7 +5177,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,
@@ -5334,14 +5334,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 469a6fbcc7f43789e7f28b30f019c75afa175130..10a7f28fdab876c252c691fa995966c84540a816 100644 (file)
--- 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 1b3bce820977cc96ad4b926b46d6269413c27c03..ca4d23a490c9d448d848e0a2363cce0079b98455 100644 (file)
--- a/src/mesa/drivers/dri/i965/brw_vec4.cpp
+++ b/src/mesa/drivers/dri/i965/brw_vec4.cpp
@@ -1920,16 +1920,16 @@ 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,
-            bool use_legacy_snorm_formula,
-            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,
+               bool use_legacy_snorm_formula,
+               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 8fc6a08f38618078587cfcfe73c577ae41479d08..a715cf5a6cb901a6f6cfb2ec9ded02479d2737f6 100644 (file)
--- a/src/mesa/drivers/dri/i965/brw_vec4_gs_visitor.cpp
+++ b/src/mesa/drivers/dri/i965/brw_vec4_gs_visitor.cpp
@@ -597,14 +597,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 e9ced7f04f8a4d2b8ae080cde17a0325682b09e4..df33e941d24f8fcb0dd2e9a744d5adafc18ac89b 100644 (file)
--- 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 353c5a049681cee5a7adcfd5890184352cd94b71..4129046325743bc6d8407de99ff579bc4a17b8af 100644 (file)
--- a/src/mesa/drivers/dri/i965/brw_vs.c
+++ b/src/mesa/drivers/dri/i965/brw_vs.c
@@ -203,11 +203,11 @@ 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),
-                         !_mesa_is_gles3(&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),
+                            !_mesa_is_gles3(&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 b65dd3b6012821b8a6d2373eda9b4474e5ea550a..aebb76f7bd0d5340afecf3d920fd0083580c41ee 100644 (file)
--- a/src/mesa/drivers/dri/i965/brw_vs.h
+++ b/src/mesa/drivers/dri/i965/brw_vs.h
@@ -56,16 +56,16 @@ 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,
-                            bool use_legacy_snorm_formula,
-                            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,
+                               bool use_legacy_snorm_formula,
+                               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 93f13445349e27d7122430fe12b835f7c8106c19..5c49db9e63eeeb7ae38ab590ef641fb3f625ed15 100644 (file)
--- 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 ac22bee11ade32104a64d4073dcf2499731f0ce1..7e4bf35d089fd98d2da32084d66bea0ca1a4918a 100644 (file)
--- 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,