Mesa (master): radeonsi: pass the GS shader directly to si_generate_gs_copy_shader

[Marek Olšák]

Module: Mesa
Branch: master
Commit: 68d36c0bb532987db27a596408e0326f20ca0365
URL:    
http://cgit.freedesktop.org/mesa/mesa/commit/?id=68d36c0bb532987db27a596408e0326f20ca0365

Author: Marek Olšák <marek.ol...@amd.com>
Date:   Tue Sep 30 18:15:17 2014 +0200

radeonsi: pass the GS shader directly to si_generate_gs_copy_shader

Reviewed-by: Michel Dänzer <michel.daen...@amd.com>

---

 src/gallium/drivers/radeonsi/si_shader.c |    6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/gallium/drivers/radeonsi/si_shader.c 
b/src/gallium/drivers/radeonsi/si_shader.c
index 286014c..4e8f80f 100644
--- a/src/gallium/drivers/radeonsi/si_shader.c
+++ b/src/gallium/drivers/radeonsi/si_shader.c
@@ -2701,14 +2701,13 @@ int si_compile_llvm(struct si_screen *sscreen, struct 
si_shader *shader,
 /* Generate code for the hardware VS shader stage to go with a geometry shader 
*/
 static int si_generate_gs_copy_shader(struct si_screen *sscreen,
                                      struct si_shader_context *si_shader_ctx,
-                                     bool dump)
+                                     struct si_shader *gs, bool dump)
 {
        struct gallivm_state *gallivm = &si_shader_ctx->radeon_bld.gallivm;
        struct lp_build_tgsi_context *bld_base = 
&si_shader_ctx->radeon_bld.soa.bld_base;
        struct lp_build_context *base = &bld_base->base;
        struct lp_build_context *uint = &bld_base->uint_bld;
        struct si_shader *shader = si_shader_ctx->shader;
-       struct si_shader *gs = si_shader_ctx->shader->selector->current;
        struct si_shader_output_values *outputs;
        LLVMValueRef t_list_ptr, t_list;
        LLVMValueRef args[9];
@@ -2910,7 +2909,8 @@ int si_shader_create(struct si_screen *sscreen, struct 
si_shader *shader)
                shader->gs_copy_shader->selector = shader->selector;
                shader->gs_copy_shader->key = shader->key;
                si_shader_ctx.shader = shader->gs_copy_shader;
-               if ((r = si_generate_gs_copy_shader(sscreen, &si_shader_ctx, 
dump))) {
+               if ((r = si_generate_gs_copy_shader(sscreen, &si_shader_ctx,
+                                                   shader, dump))) {
                        free(shader->gs_copy_shader);
                        shader->gs_copy_shader = NULL;
                        goto out;

_______________________________________________
mesa-commit mailing list
mesa-commit@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/mesa-commit