From 6cc5334e42c29e019b3d2a641034bac0983edfdc Mon Sep 17 00:00:00 2001 From: Tom Stellard Date: Fri, 18 Jul 2014 14:40:50 -0400 Subject: [PATCH] radeonsi/compute: Bump number of user sgprs for LLVM 3.5 MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Reviewed-by: Marek Olšák --- src/gallium/drivers/radeonsi/si_compute.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/src/gallium/drivers/radeonsi/si_compute.c b/src/gallium/drivers/radeonsi/si_compute.c index 3a9f00f..a7d61e7 100644 --- a/src/gallium/drivers/radeonsi/si_compute.c +++ b/src/gallium/drivers/radeonsi/si_compute.c @@ -32,6 +32,11 @@ #include "radeon_llvm_util.h" #define MAX_GLOBAL_BUFFERS 20 +#if HAVE_LLVM < 0x0305 +#define NUM_USER_SGPRS 2 +#else +#define NUM_USER_SGPRS 4 +#endif struct si_pipe_compute { struct si_context *ctx; @@ -132,7 +137,7 @@ static void si_launch_grid( uint32_t *kernel_args; uint64_t kernel_args_va; uint64_t shader_va; - unsigned arg_user_sgpr_count = 2; + unsigned arg_user_sgpr_count = NUM_USER_SGPRS; unsigned i; struct si_pipe_shader *shader = &program->kernels[pc]; unsigned lds_blocks; -- 2.7.4