XXX:Fixessi-compute-v3

5 files changed, 6 insertions, 9 deletions

diff --git a/src/gallium/drivers/radeon/radeon_llvm_util.c b/src/gallium/drivers/radeon/radeon_llvm_util.c
index b2ecb1a959f..2582d9cf118 100644
--- a/src/gallium/drivers/radeon/radeon_llvm_util.c
+++ b/src/gallium/drivers/radeon/radeon_llvm_util.c
@@ -30,7 +30,7 @@
 #include <llvm-c/BitReader.h>
 #include <llvm-c/Core.h>
 
-static LLVMModuleRef radeon_llvm_parse_bitcode(const unsigned char * bitcode,
+LLVMModuleRef radeon_llvm_parse_bitcode(const unsigned char * bitcode,
 							unsigned bitcode_len)
 {
 	LLVMMemoryBufferRef buf;
diff --git a/src/gallium/drivers/radeon/radeon_llvm_util.h b/src/gallium/drivers/radeon/radeon_llvm_util.h
index 7db25bbf0ed..b85164885dd 100644
--- a/src/gallium/drivers/radeon/radeon_llvm_util.h
+++ b/src/gallium/drivers/radeon/radeon_llvm_util.h
@@ -29,6 +29,8 @@
 
 #include <llvm-c/Core.h>
 
+LLVMModuleRef radeon_llvm_parse_bitcode(const unsigned char * bitcode,
+							unsigned bitcode_len);
 unsigned radeon_llvm_get_num_kernels(const unsigned char *bitcode, unsigned bitcode_len);
 LLVMModuleRef radeon_llvm_get_kernel_module(unsigned index,
 			const unsigned char *bitcode, unsigned bitcode_len);
diff --git a/src/gallium/drivers/radeonsi/Makefile.am b/src/gallium/drivers/radeonsi/Makefile.am
index 1c6a43b577c..e771d318525 100644
--- a/src/gallium/drivers/radeonsi/Makefile.am
+++ b/src/gallium/drivers/radeonsi/Makefile.am
@@ -32,7 +32,5 @@ AM_CPPFLAGS = \
 	$(GALLIUM_CFLAGS)
 AM_CFLAGS = $(LLVM_CFLAGS)
 
-AM_CXXFLAGS = $(LLVM_CXXFLAGS)
-
-libradeonsi_la_SOURCES = $(C_SOURCES) $(CPP_SOURCES)
+libradeonsi_la_SOURCES = $(C_SOURCES)
 libradeonsi_la_LIBADD = ../radeon/libllvmradeon@VERSION@.la
diff --git a/src/gallium/drivers/radeonsi/Makefile.sources b/src/gallium/drivers/radeonsi/Makefile.sources
index 54a07bc609d..5e1cc4f6aa6 100644
--- a/src/gallium/drivers/radeonsi/Makefile.sources
+++ b/src/gallium/drivers/radeonsi/Makefile.sources
@@ -14,6 +14,3 @@ C_SOURCES := \
 	si_state_streamout.c \
 	si_state_draw.c \
 	si_commands.c
-
-CPP_SOURCES := \
-	$(top_srcdir)/src/gallium/drivers/r600/llvm_wrapper.cpp
diff --git a/src/gallium/drivers/radeonsi/radeonsi_compute.c b/src/gallium/drivers/radeonsi/radeonsi_compute.c
index 0d6c8476d7b..1514ab87ff7 100644
--- a/src/gallium/drivers/radeonsi/radeonsi_compute.c
+++ b/src/gallium/drivers/radeonsi/radeonsi_compute.c
@@ -3,7 +3,7 @@
 #include "radeonsi_pipe.h"
 #include "radeonsi_shader.h"
 
-#include "../r600/llvm_wrapper.h"
+#include "radeon_llvm_util.h"
 
 struct si_pipe_compute {
 	struct r600_context *ctx;
@@ -37,7 +37,7 @@ static void *radeonsi_create_compute_state(
 	program->private_size = cso->req_private_mem;
 	program->input_size = cso->req_input_mem;
 
-	mod = llvm_parse_bitcode(code, header->num_bytes);
+	mod = radeon_llvm_parse_bitcode(code, header->num_bytes);
 	si_compile_llvm(rctx, &program->shader, mod);
 
 	return program;