summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJason Ekstrand <jason.ekstrand@intel.com>2015-10-20 16:21:09 -0700
committerJason Ekstrand <jason.ekstrand@intel.com>2015-10-21 14:20:32 -0700
commit72148de217786473bb2bb02b99f49fd28bdda0e2 (patch)
treea1439d8e6c445184a89d33fb8d766c2c1811f4c6
parent8e8b527b27b5b31f88e85e9878652a11c7fa5ca4 (diff)
i965/gs: Move the mem_ctx argument to brw_compile_gs
This makes it better match the other brw_compile_* functions. Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
-rw-r--r--src/mesa/drivers/dri/i965/brw_compiler.h2
-rw-r--r--src/mesa/drivers/dri/i965/brw_gs.c4
-rw-r--r--src/mesa/drivers/dri/i965/brw_vec4_gs_visitor.cpp2
3 files changed, 4 insertions, 4 deletions
diff --git a/src/mesa/drivers/dri/i965/brw_compiler.h b/src/mesa/drivers/dri/i965/brw_compiler.h
index 11c485d2f08..8c10495caa6 100644
--- a/src/mesa/drivers/dri/i965/brw_compiler.h
+++ b/src/mesa/drivers/dri/i965/brw_compiler.h
@@ -615,10 +615,10 @@ struct brw_gs_compile
*/
const unsigned *
brw_compile_gs(const struct brw_compiler *compiler, void *log_data,
+ void *mem_ctx,
struct brw_gs_compile *c,
const struct nir_shader *shader,
struct gl_shader_program *shader_prog,
- void *mem_ctx,
int shader_time_index,
unsigned *final_assembly_size,
char **error_str);
diff --git a/src/mesa/drivers/dri/i965/brw_gs.c b/src/mesa/drivers/dri/i965/brw_gs.c
index 02f506de3b6..ae7f2422e8c 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_compile_gs(brw->intelScreen->compiler, brw, &c,
+ brw_compile_gs(brw->intelScreen->compiler, brw, mem_ctx, &c,
shader->Program->nir, prog,
- mem_ctx, st_index, &program_size, &error_str);
+ 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_gs_visitor.cpp b/src/mesa/drivers/dri/i965/brw_vec4_gs_visitor.cpp
index a715cf5a6cb..47f2dd89e4d 100644
--- a/src/mesa/drivers/dri/i965/brw_vec4_gs_visitor.cpp
+++ b/src/mesa/drivers/dri/i965/brw_vec4_gs_visitor.cpp
@@ -598,10 +598,10 @@ vec4_gs_visitor::gs_end_primitive()
extern "C" const unsigned *
brw_compile_gs(const struct brw_compiler *compiler, void *log_data,
+ void *mem_ctx,
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)