summaryrefslogtreecommitdiffstats
path: root/src/gallium/drivers
diff options
context:
space:
mode:
authorTom Stellard <[email protected]>2014-07-18 14:40:50 -0400
committerTom Stellard <[email protected]>2014-07-21 10:00:09 -0400
commit6cc5334e42c29e019b3d2a641034bac0983edfdc (patch)
tree48e60f988d2dcb91a0bc0b5daa06ed34dd826de2 /src/gallium/drivers
parent81385f7596ab3c336fb16b00864893421462b3fb (diff)
radeonsi/compute: Bump number of user sgprs for LLVM 3.5
Reviewed-by: Marek Olšák <[email protected]>
Diffstat (limited to 'src/gallium/drivers')
-rw-r--r--src/gallium/drivers/radeonsi/si_compute.c7
1 files changed, 6 insertions, 1 deletions
diff --git a/src/gallium/drivers/radeonsi/si_compute.c b/src/gallium/drivers/radeonsi/si_compute.c
index 3a9f00fd41d..a7d61e7f7b8 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;