radeonsi: use SPI_SHADER_COL_FORMAT fields instead of export_16bpc

[mesa.git] / src / gallium / drivers / radeon / radeon_llvm_util.c

diff --git a/src/gallium/drivers/radeon/radeon_llvm_util.c b/src/gallium/drivers/radeon/radeon_llvm_util.c
index 2ace91ff4dc413102a38b5409fe88fb14c435b5b..0dfd9ad4867988e840c1ee0dc142375361c7dd90 100644 (file)
--- a/src/gallium/drivers/radeon/radeon_llvm_util.c
+++ b/src/gallium/drivers/radeon/radeon_llvm_util.c
@@ -34,7 +34,7 @@
 #include <llvm-c/Transforms/PassManagerBuilder.h>
 
 LLVMModuleRef radeon_llvm_parse_bitcode(LLVMContextRef ctx,
-                                                       const unsigned char * bitcode, unsigned bitcode_len)
+                                                       const char * bitcode, unsigned bitcode_len)
 {
        LLVMMemoryBufferRef buf;
        LLVMModuleRef module;
@@ -47,7 +47,7 @@ LLVMModuleRef radeon_llvm_parse_bitcode(LLVMContextRef ctx,
 }
 
 unsigned radeon_llvm_get_num_kernels(LLVMContextRef ctx,
-                               const unsigned char *bitcode, unsigned bitcode_len)
+                               const char *bitcode, unsigned bitcode_len)
 {
        LLVMModuleRef mod = radeon_llvm_parse_bitcode(ctx, bitcode, bitcode_len);
        return LLVMGetNamedMetadataNumOperands(mod, "opencl.kernels");
@@ -88,7 +88,7 @@ static void radeon_llvm_optimize(LLVMModuleRef mod)
 }
 
 LLVMModuleRef radeon_llvm_get_kernel_module(LLVMContextRef ctx, unsigned index,
-               const unsigned char *bitcode, unsigned bitcode_len)
+               const char *bitcode, unsigned bitcode_len)
 {
        LLVMModuleRef mod;
        unsigned num_kernels;
@@ -100,13 +100,17 @@ LLVMModuleRef radeon_llvm_get_kernel_module(LLVMContextRef ctx, unsigned index,
        kernel_metadata = MALLOC(num_kernels * sizeof(LLVMValueRef));
        LLVMGetNamedMetadataOperands(mod, "opencl.kernels", kernel_metadata);
        for (i = 0; i < num_kernels; i++) {
-               LLVMValueRef kernel_signature, kernel_function;
+               LLVMValueRef kernel_signature, *kernel_function;
+               unsigned num_kernel_md_operands;
                if (i == index) {
                        continue;
                }
                kernel_signature = kernel_metadata[i];
-               LLVMGetMDNodeOperands(kernel_signature, &kernel_function);
-               LLVMDeleteFunction(kernel_function);
+               num_kernel_md_operands = LLVMGetMDNodeNumOperands(kernel_signature);
+               kernel_function = MALLOC(num_kernel_md_operands * sizeof (LLVMValueRef));
+               LLVMGetMDNodeOperands(kernel_signature, kernel_function);
+               LLVMDeleteFunction(*kernel_function);
+               FREE(kernel_function);
        }
        FREE(kernel_metadata);
        radeon_llvm_optimize(mod);