diff options
| -rw-r--r-- | src/gallium/auxiliary/draw/draw_llvm.c | 24 | ||||
| -rw-r--r-- | src/gallium/drivers/llvmpipe/lp_jit.c | 12 |
2 files changed, 6 insertions, 30 deletions
diff --git a/src/gallium/auxiliary/draw/draw_llvm.c b/src/gallium/auxiliary/draw/draw_llvm.c index 7bf9d5e5d7a..4058e1194b0 100644 --- a/src/gallium/auxiliary/draw/draw_llvm.c +++ b/src/gallium/auxiliary/draw/draw_llvm.c @@ -123,14 +123,10 @@ create_jit_texture_type(struct gallivm_state *gallivm, const char *struct_name) elem_types[DRAW_JIT_TEXTURE_BORDER_COLOR] = LLVMArrayType(LLVMFloatTypeInContext(gallivm->context), 4); -#if HAVE_LLVM >= 0x0300 - texture_type = LLVMStructCreateNamed(gallivm->context, struct_name); - LLVMStructSetBody(texture_type, elem_types, - Elements(elem_types), 0); -#else texture_type = LLVMStructTypeInContext(gallivm->context, elem_types, Elements(elem_types), 0); +#if HAVE_LLVM < 0x0300 LLVMAddTypeName(gallivm->module, struct_name, texture_type); /* Make sure the target's struct layout cache doesn't return @@ -201,13 +197,9 @@ create_jit_context_type(struct gallivm_state *gallivm, elem_types[3] = LLVMPointerType(float_type, 0); /* viewport */ elem_types[4] = LLVMArrayType(texture_type, PIPE_MAX_VERTEX_SAMPLERS); /* textures */ -#if HAVE_LLVM >= 0x0300 - context_type = LLVMStructCreateNamed(gallivm->context, struct_name); - LLVMStructSetBody(context_type, elem_types, - Elements(elem_types), 0); -#else context_type = LLVMStructTypeInContext(gallivm->context, elem_types, Elements(elem_types), 0); +#if HAVE_LLVM < 0x0300 LLVMAddTypeName(gallivm->module, struct_name, context_type); LLVMInvalidateStructLayout(gallivm->target, context_type); @@ -244,13 +236,9 @@ create_jit_vertex_buffer_type(struct gallivm_state *gallivm, const char *struct_ elem_types[2] = elem_types[3] = LLVMPointerType(LLVMInt8TypeInContext(gallivm->context), 0); /* vs_constants */ -#if HAVE_LLVM >= 0x0300 - vb_type = LLVMStructCreateNamed(gallivm->context, struct_name); - LLVMStructSetBody(vb_type, elem_types, - Elements(elem_types), 0); -#else vb_type = LLVMStructTypeInContext(gallivm->context, elem_types, Elements(elem_types), 0); +#if HAVE_LLVM < 0x0300 LLVMAddTypeName(gallivm->module, struct_name, vb_type); LLVMInvalidateStructLayout(gallivm->target, vb_type); @@ -285,13 +273,9 @@ create_jit_vertex_header(struct gallivm_state *gallivm, int data_elems) elem_types[DRAW_JIT_VERTEX_PRE_CLIP_POS] = LLVMArrayType(LLVMFloatTypeInContext(gallivm->context), 4); elem_types[DRAW_JIT_VERTEX_DATA] = LLVMArrayType(elem_types[1], data_elems); -#if HAVE_LLVM >= 0x0300 - vertex_header = LLVMStructCreateNamed(gallivm->context, struct_name); - LLVMStructSetBody(vertex_header, elem_types, - Elements(elem_types), 0); -#else vertex_header = LLVMStructTypeInContext(gallivm->context, elem_types, Elements(elem_types), 0); +#if HAVE_LLVM < 0x0300 LLVMAddTypeName(gallivm->module, struct_name, vertex_header); LLVMInvalidateStructLayout(gallivm->target, vertex_header); diff --git a/src/gallium/drivers/llvmpipe/lp_jit.c b/src/gallium/drivers/llvmpipe/lp_jit.c index ce92a80721a..eb1db84e4b8 100644 --- a/src/gallium/drivers/llvmpipe/lp_jit.c +++ b/src/gallium/drivers/llvmpipe/lp_jit.c @@ -68,13 +68,9 @@ lp_jit_create_types(struct llvmpipe_context *lp) elem_types[LP_JIT_TEXTURE_BORDER_COLOR] = LLVMArrayType(LLVMFloatTypeInContext(lc), 4); -#if HAVE_LLVM >= 0x0300 - texture_type = LLVMStructCreateNamed(gallivm->context, "texture"); - LLVMStructSetBody(texture_type, elem_types, - Elements(elem_types), 0); -#else texture_type = LLVMStructTypeInContext(lc, elem_types, Elements(elem_types), 0); +#if HAVE_LLVM < 0x0300 LLVMAddTypeName(gallivm->module, "texture", texture_type); LLVMInvalidateStructLayout(gallivm->target, texture_type); @@ -134,14 +130,10 @@ lp_jit_create_types(struct llvmpipe_context *lp) elem_types[LP_JIT_CTX_TEXTURES] = LLVMArrayType(texture_type, PIPE_MAX_SAMPLERS); -#if HAVE_LLVM >= 0x0300 - context_type = LLVMStructCreateNamed(gallivm->context, "context"); - LLVMStructSetBody(context_type, elem_types, - Elements(elem_types), 0); -#else context_type = LLVMStructTypeInContext(lc, elem_types, Elements(elem_types), 0); +#if HAVE_LLVM < 0x0300 LLVMInvalidateStructLayout(gallivm->target, context_type); LLVMAddTypeName(gallivm->module, "context", context_type); |