LLVM >= 3.5.1 will be requried in order to enable PIPE_SHADER_IR_NATIVE
for compute shaders.
---
configure.ac | 4 ++++
src/gallium/drivers/radeonsi/si_compute.c | 4 ----
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/configure.ac b/configure.ac
index bad1528..832517d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1886,6 +1886,10 @@ radeon_llvm_check() {
LLVM_REQUIRED_VERSION_MAJOR="3"
LLVM_REQUIRED_VERSION_MINOR="4"
LLVM_REQUIRED_VERSION_PATCH="2"
+ if test "x$enable_opencl" = xyes; then
+ LLVM_REQUIRED_VERSION_MINOR="5"
+ LLVM_REQUIRED_VERSION_PATCH="1"
+ fi
if test "${LLVM_VERSION_INT}${LLVM_VERSION_PATCH}" -lt
"${LLVM_REQUIRED_VERSION_MAJOR}0${LLVM_REQUIRED_VERSION_MINOR}${LLVM_REQUIRED_VERSION_PATCH}";
then
AC_MSG_ERROR([LLVM
$LLVM_REQUIRED_VERSION_MAJOR.$LLVM_REQUIRED_VERSION_MINOR.$LLVM_REQUIRED_VERSION_PATCH
or newer is required for $1])
fi
diff --git a/src/gallium/drivers/radeonsi/si_compute.c
b/src/gallium/drivers/radeonsi/si_compute.c
index be64418..490845b 100644
--- a/src/gallium/drivers/radeonsi/si_compute.c
+++ b/src/gallium/drivers/radeonsi/si_compute.c
@@ -32,11 +32,7 @@
#include "radeon/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_compute {
struct si_context *ctx;
--
1.8.5.5
_______________________________________________
mesa-dev mailing list
mesa-dev@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/mesa-dev
