Reviewed-by: Marek Olšák <marek.ol...@amd.com> Marek
On Fri, Jul 18, 2014 at 9:09 PM, Tom Stellard <thomas.stell...@amd.com> wrote: > --- > 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; > -- > 1.8.1.5 > > _______________________________________________ > mesa-dev mailing list > mesa-dev@lists.freedesktop.org > http://lists.freedesktop.org/mailman/listinfo/mesa-dev _______________________________________________ mesa-dev mailing list mesa-dev@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/mesa-dev