gallium: the other drivers don't support ARB_buffer_storage
[mesa.git] / src / gallium / drivers / r600 / r600_llvm.c
index 0fa6ab17fe6d8443ab5bb4e8230785633f7ea70e..e395bf6359b774805d0bb4c9cefbcfebeecb5d86 100644 (file)
@@ -7,6 +7,7 @@
 #include "util/u_double_list.h"
 #include "util/u_memory.h"
 
+#include "evergreend.h"
 #include "r600_asm.h"
 #include "r600_sq.h"
 #include "r600_opcodes.h"
 
 #define CONSTANT_BUFFER_0_ADDR_SPACE 8
 #define CONSTANT_BUFFER_1_ADDR_SPACE (CONSTANT_BUFFER_0_ADDR_SPACE + R600_UCP_CONST_BUFFER)
+#define CONSTANT_TXQ_BUFFER (CONSTANT_BUFFER_0_ADDR_SPACE + R600_TXQ_CONST_BUFFER)
+#define LLVM_R600_BUFFER_INFO_CONST_BUFFER \
+       (CONSTANT_BUFFER_0_ADDR_SPACE + R600_BUFFER_INFO_CONST_BUFFER)
+
+static LLVMValueRef llvm_load_const_buffer(
+       struct lp_build_tgsi_context * bld_base,
+       LLVMValueRef OffsetValue,
+       unsigned ConstantAddressSpace)
+{
+       LLVMValueRef offset[2] = {
+               LLVMConstInt(LLVMInt64TypeInContext(bld_base->base.gallivm->context), 0, false),
+               OffsetValue
+       };
+
+       LLVMTypeRef const_ptr_type = LLVMPointerType(LLVMArrayType(LLVMVectorType(bld_base->base.elem_type, 4), 1024),
+                                                       ConstantAddressSpace);
+       LLVMValueRef const_ptr = LLVMBuildIntToPtr(bld_base->base.gallivm->builder, lp_build_const_int32(bld_base->base.gallivm, 0), const_ptr_type, "");
+       LLVMValueRef ptr = LLVMBuildGEP(bld_base->base.gallivm->builder, const_ptr, offset, 2, "");
+       return LLVMBuildLoad(bld_base->base.gallivm->builder, ptr, "");
+}
 
 static LLVMValueRef llvm_fetch_const(
        struct lp_build_tgsi_context * bld_base,
@@ -28,24 +49,17 @@ static LLVMValueRef llvm_fetch_const(
        enum tgsi_opcode_type type,
        unsigned swizzle)
 {
-       LLVMValueRef offset[2] = {
-               LLVMConstInt(LLVMInt64TypeInContext(bld_base->base.gallivm->context), 0, false),
-               lp_build_const_int32(bld_base->base.gallivm, reg->Register.Index)
-       };
+       LLVMValueRef offset = lp_build_const_int32(bld_base->base.gallivm, reg->Register.Index);
        if (reg->Register.Indirect) {
                struct lp_build_tgsi_soa_context *bld = lp_soa_context(bld_base);
-               LLVMValueRef index = LLVMBuildLoad(bld_base->base.gallivm->builder, bld->addr[reg->Indirect.Index][reg->Indirect.SwizzleX], "");
-               offset[1] = LLVMBuildAdd(bld_base->base.gallivm->builder, offset[1], index, "");
+               LLVMValueRef index = LLVMBuildLoad(bld_base->base.gallivm->builder, bld->addr[reg->Indirect.Index][reg->Indirect.Swizzle], "");
+               offset = LLVMBuildAdd(bld_base->base.gallivm->builder, offset, index, "");
        }
        unsigned ConstantAddressSpace = CONSTANT_BUFFER_0_ADDR_SPACE ;
        if (reg->Register.Dimension) {
                ConstantAddressSpace += reg->Dimension.Index;
        }
-       LLVMTypeRef const_ptr_type = LLVMPointerType(LLVMArrayType(LLVMVectorType(bld_base->base.elem_type, 4), 1024),
-                                                       ConstantAddressSpace);
-       LLVMValueRef const_ptr = LLVMBuildIntToPtr(bld_base->base.gallivm->builder, lp_build_const_int32(bld_base->base.gallivm, 0), const_ptr_type, "");
-       LLVMValueRef ptr = LLVMBuildGEP(bld_base->base.gallivm->builder, const_ptr, offset, 2, "");
-       LLVMValueRef cvecval = LLVMBuildLoad(bld_base->base.gallivm->builder, ptr, "");
+       LLVMValueRef cvecval = llvm_load_const_buffer(bld_base, offset, ConstantAddressSpace);
        LLVMValueRef cval = LLVMBuildExtractElement(bld_base->base.gallivm->builder, cvecval, lp_build_const_int32(bld_base->base.gallivm, swizzle), "");
        return bitcast(bld_base, type, cval);
 }
@@ -63,6 +77,11 @@ static void llvm_load_system_value(
        default: assert(!"unknown system value");
        }
 
+#if HAVE_LLVM >= 0x0304
+       ctx->system_values[index] = LLVMBuildExtractElement(ctx->gallivm.builder,
+               LLVMGetParam(ctx->main_fn, 0), lp_build_const_int32(&(ctx->gallivm), chan),
+               "");
+#else
        LLVMValueRef reg = lp_build_const_int32(
                        ctx->soa.bld_base.base.gallivm, chan);
        ctx->system_values[index] = build_intrinsic(
@@ -70,19 +89,49 @@ static void llvm_load_system_value(
                        "llvm.R600.load.input",
                        ctx->soa.bld_base.base.elem_type, &reg, 1,
                        LLVMReadNoneAttribute);
+#endif
 }
 
-static LLVMValueRef llvm_fetch_system_value(
-               struct lp_build_tgsi_context * bld_base,
-               const struct tgsi_full_src_register *reg,
-               enum tgsi_opcode_type type,
-               unsigned swizzle)
+#if HAVE_LLVM >= 0x0304
+static LLVMValueRef
+llvm_load_input_vector(
+       struct radeon_llvm_context * ctx, unsigned location, unsigned ijregs,
+       boolean interp)
 {
-       struct radeon_llvm_context * ctx = radeon_llvm_context(bld_base);
-       LLVMValueRef cval = ctx->system_values[reg->Register.Index];
-       return bitcast(bld_base, type, cval);
+               LLVMTypeRef VecType;
+               LLVMValueRef Args[3] = {
+                       lp_build_const_int32(&(ctx->gallivm), location)
+               };
+               unsigned ArgCount = 1;
+               if (interp) {
+                       VecType = LLVMVectorType(ctx->soa.bld_base.base.elem_type, 2);
+                       LLVMValueRef IJIndex = LLVMGetParam(ctx->main_fn, ijregs / 2);
+                       Args[ArgCount++] = LLVMBuildExtractElement(ctx->gallivm.builder, IJIndex,
+                               lp_build_const_int32(&(ctx->gallivm), 2 * (ijregs % 2)), "");
+                       Args[ArgCount++] = LLVMBuildExtractElement(ctx->gallivm.builder, IJIndex,
+                               lp_build_const_int32(&(ctx->gallivm), 2 * (ijregs % 2) + 1), "");
+                       LLVMValueRef HalfVec[2] = {
+                               build_intrinsic(ctx->gallivm.builder, "llvm.R600.interp.xy",
+                                       VecType, Args, ArgCount, LLVMReadNoneAttribute),
+                               build_intrinsic(ctx->gallivm.builder, "llvm.R600.interp.zw",
+                                       VecType, Args, ArgCount, LLVMReadNoneAttribute)
+                       };
+                       LLVMValueRef MaskInputs[4] = {
+                               lp_build_const_int32(&(ctx->gallivm), 0),
+                               lp_build_const_int32(&(ctx->gallivm), 1),
+                               lp_build_const_int32(&(ctx->gallivm), 2),
+                               lp_build_const_int32(&(ctx->gallivm), 3)
+                       };
+                       LLVMValueRef Mask = LLVMConstVector(MaskInputs, 4);
+                       return LLVMBuildShuffleVector(ctx->gallivm.builder, HalfVec[0], HalfVec[1],
+                               Mask, "");
+               } else {
+                       VecType = LLVMVectorType(ctx->soa.bld_base.base.elem_type, 4);
+                       return build_intrinsic(ctx->gallivm.builder, "llvm.R600.interp.const",
+                               VecType, Args, ArgCount, LLVMReadNoneAttribute);
+               }
 }
-
+#else
 static LLVMValueRef
 llvm_load_input_helper(
        struct radeon_llvm_context * ctx,
@@ -107,7 +156,22 @@ llvm_load_input_helper(
        return build_intrinsic(bb->gallivm->builder, intrinsic,
                bb->elem_type, &arg[0], arg_count, LLVMReadNoneAttribute);
 }
+#endif
 
+#if HAVE_LLVM >= 0x0304
+static LLVMValueRef
+llvm_face_select_helper(
+       struct radeon_llvm_context * ctx,
+       LLVMValueRef face, LLVMValueRef front_color, LLVMValueRef back_color)
+{
+       const struct lp_build_context * bb = &ctx->soa.bld_base.base;
+       LLVMValueRef is_front = LLVMBuildFCmp(
+               bb->gallivm->builder, LLVMRealUGT, face,
+               lp_build_const_float(bb->gallivm, 0.0f),        "");
+       return LLVMBuildSelect(bb->gallivm->builder, is_front,
+               front_color, back_color, "");
+}
+#else
 static LLVMValueRef
 llvm_face_select_helper(
        struct radeon_llvm_context * ctx,
@@ -121,6 +185,7 @@ llvm_face_select_helper(
        return LLVMBuildSelect(bb->gallivm->builder, is_front,
                front_color, back_color, "");
 }
+#endif
 
 static void llvm_load_input(
        struct radeon_llvm_context * ctx,
@@ -129,11 +194,55 @@ static void llvm_load_input(
 {
        const struct r600_shader_io * input = &ctx->r600_inputs[input_index];
        unsigned chan;
+#if HAVE_LLVM < 0x0304
        unsigned interp = 0;
        int ij_index;
+#endif
        int two_side = (ctx->two_side && input->name == TGSI_SEMANTIC_COLOR);
        LLVMValueRef v;
+#if HAVE_LLVM >= 0x0304
+       boolean require_interp_intrinsic = ctx->chip_class >= EVERGREEN &&
+               ctx->type == TGSI_PROCESSOR_FRAGMENT;
+#endif
 
+#if HAVE_LLVM >= 0x0304
+       if (require_interp_intrinsic && input->spi_sid) {
+               v = llvm_load_input_vector(ctx, input->lds_pos, input->ij_index,
+                       (input->interpolate > 0));
+       } else
+               v = LLVMGetParam(ctx->main_fn, input->gpr);
+
+       if (two_side) {
+               struct r600_shader_io * back_input =
+                       &ctx->r600_inputs[input->back_color_input];
+               LLVMValueRef v2;
+               LLVMValueRef face = LLVMGetParam(ctx->main_fn, ctx->face_gpr);
+               face = LLVMBuildExtractElement(ctx->gallivm.builder, face,
+                       lp_build_const_int32(&(ctx->gallivm), 0), "");
+
+               if (require_interp_intrinsic && back_input->spi_sid)
+                       v2 = llvm_load_input_vector(ctx, back_input->lds_pos,
+                               back_input->ij_index, (back_input->interpolate > 0));
+               else
+                       v2 = LLVMGetParam(ctx->main_fn, back_input->gpr);
+               v = llvm_face_select_helper(ctx, face, v, v2);
+       }
+
+       for (chan = 0; chan < 4; chan++) {
+               unsigned soa_index = radeon_llvm_reg_index_soa(input_index, chan);
+
+               ctx->inputs[soa_index] = LLVMBuildExtractElement(ctx->gallivm.builder, v,
+                       lp_build_const_int32(&(ctx->gallivm), chan), "");
+
+               if (input->name == TGSI_SEMANTIC_POSITION &&
+                               ctx->type == TGSI_PROCESSOR_FRAGMENT && chan == 3) {
+               /* RCP for fragcoord.w */
+               ctx->inputs[soa_index] = LLVMBuildFDiv(ctx->gallivm.builder,
+                               lp_build_const_float(&(ctx->gallivm), 1.0f),
+                               ctx->inputs[soa_index], "");
+       }
+}
+#else
        if (ctx->chip_class >= EVERGREEN && ctx->type == TGSI_PROCESSOR_FRAGMENT &&
                        input->spi_sid) {
                interp = 1;
@@ -174,11 +283,13 @@ static void llvm_load_input(
 
                ctx->inputs[soa_index] = v;
        }
+#endif
 }
 
 static void llvm_emit_prologue(struct lp_build_tgsi_context * bld_base)
 {
        struct radeon_llvm_context * ctx = radeon_llvm_context(bld_base);
+       radeon_llvm_shader_type(ctx->main_fn, ctx->type);
 
 }
 
@@ -259,14 +370,8 @@ static void llvm_emit_epilogue(struct lp_build_tgsi_context * bld_base)
                                LLVMValueRef adjusted_elements[4];
                                for (reg_index = 0; reg_index < 2; reg_index ++) {
                                        for (chan = 0; chan < TGSI_NUM_CHANNELS; chan++) {
-                                               LLVMValueRef offset[2] = {
-                                                       LLVMConstInt(LLVMInt64TypeInContext(bld_base->base.gallivm->context), 0, false),
-                                                       lp_build_const_int32(bld_base->base.gallivm, reg_index * 4 + chan)
-                                               };
-                                               LLVMTypeRef const_ptr_type = LLVMPointerType(LLVMArrayType(LLVMVectorType(bld_base->base.elem_type, 4), 1024), CONSTANT_BUFFER_1_ADDR_SPACE);
-                                               LLVMValueRef const_ptr = LLVMBuildIntToPtr(bld_base->base.gallivm->builder, lp_build_const_int32(bld_base->base.gallivm, 0), const_ptr_type, "");
-                                               LLVMValueRef ptr = LLVMBuildGEP(bld_base->base.gallivm->builder, const_ptr, offset, 2, "");
-                                               LLVMValueRef base_vector = LLVMBuildLoad(bld_base->base.gallivm->builder, ptr, "");
+                                               LLVMValueRef offset = lp_build_const_int32(bld_base->base.gallivm, reg_index * 4 + chan);
+                                               LLVMValueRef base_vector = llvm_load_const_buffer(bld_base, offset, CONSTANT_BUFFER_1_ADDR_SPACE);
                                                args[0] = output;
                                                args[1] = base_vector;
                                                adjusted_elements[chan] = build_intrinsic(base->gallivm->builder,
@@ -408,21 +513,31 @@ static void llvm_emit_tex(
        struct lp_build_emit_data * emit_data)
 {
        struct gallivm_state * gallivm = bld_base->base.gallivm;
-       LLVMValueRef args[6];
+       LLVMValueRef args[7];
        unsigned c, sampler_src;
+       struct radeon_llvm_context * ctx = radeon_llvm_context(bld_base);
 
        if (emit_data->inst->Texture.Texture == TGSI_TEXTURE_BUFFER) {
                switch (emit_data->inst->Instruction.Opcode) {
                case TGSI_OPCODE_TXQ: {
-                       LLVMValueRef offset[2] = {
-                               LLVMConstInt(LLVMInt64TypeInContext(bld_base->base.gallivm->context), 0, false),
-                               lp_build_const_int32(bld_base->base.gallivm, 1)
-                       };
-                       LLVMTypeRef const_ptr_type = LLVMPointerType(LLVMArrayType(LLVMVectorType(bld_base->base.elem_type, 4), 1024),
-                                                                       R600_BUFFER_INFO_CONST_BUFFER);
-                       LLVMValueRef const_ptr = LLVMBuildIntToPtr(bld_base->base.gallivm->builder, lp_build_const_int32(bld_base->base.gallivm, 0), const_ptr_type, "");
-                       LLVMValueRef ptr = LLVMBuildGEP(bld_base->base.gallivm->builder, const_ptr, offset, 2, "");
-                       LLVMValueRef cvecval = LLVMBuildLoad(bld_base->base.gallivm->builder, ptr, "");
+                       struct radeon_llvm_context * ctx = radeon_llvm_context(bld_base);
+                       ctx->uses_tex_buffers = true;
+                       bool isEgPlus = (ctx->chip_class >= EVERGREEN);
+                       LLVMValueRef offset = lp_build_const_int32(bld_base->base.gallivm,
+                               isEgPlus ? 0 : 1);
+                       LLVMValueRef cvecval = llvm_load_const_buffer(bld_base, offset,
+                               LLVM_R600_BUFFER_INFO_CONST_BUFFER);
+                       if (!isEgPlus) {
+                               LLVMValueRef maskval[4] = {
+                                       lp_build_const_int32(gallivm, 1),
+                                       lp_build_const_int32(gallivm, 2),
+                                       lp_build_const_int32(gallivm, 3),
+                                       lp_build_const_int32(gallivm, 0),
+                               };
+                               LLVMValueRef mask = LLVMConstVector(maskval, 4);
+                               cvecval = LLVMBuildShuffleVector(gallivm->builder, cvecval, cvecval,
+                                       mask, "");
+                       }
                        emit_data->output[0] = cvecval;
                        return;
                }
@@ -432,6 +547,35 @@ static void llvm_emit_tex(
                        emit_data->output[0] = build_intrinsic(gallivm->builder,
                                                        "llvm.R600.load.texbuf",
                                                        emit_data->dst_type, args, 2, LLVMReadNoneAttribute);
+                       if (ctx->chip_class >= EVERGREEN)
+                               return;
+                       ctx->uses_tex_buffers = true;
+                       LLVMDumpValue(emit_data->output[0]);
+                       emit_data->output[0] = LLVMBuildBitCast(gallivm->builder,
+                               emit_data->output[0], LLVMVectorType(bld_base->base.int_elem_type, 4),
+                               "");
+                       LLVMValueRef Mask = llvm_load_const_buffer(bld_base,
+                               lp_build_const_int32(gallivm, 0),
+                               LLVM_R600_BUFFER_INFO_CONST_BUFFER);
+                       Mask = LLVMBuildBitCast(gallivm->builder, Mask,
+                               LLVMVectorType(bld_base->base.int_elem_type, 4), "");
+                       emit_data->output[0] = lp_build_emit_llvm_binary(bld_base, TGSI_OPCODE_AND,
+                               emit_data->output[0],
+                               Mask);
+                       LLVMValueRef WComponent = LLVMBuildExtractElement(gallivm->builder,
+                               emit_data->output[0], lp_build_const_int32(gallivm, 3), "");
+                       Mask = llvm_load_const_buffer(bld_base, lp_build_const_int32(gallivm, 1),
+                               LLVM_R600_BUFFER_INFO_CONST_BUFFER);
+                       Mask = LLVMBuildExtractElement(gallivm->builder, Mask,
+                               lp_build_const_int32(gallivm, 0), "");
+                       Mask = LLVMBuildBitCast(gallivm->builder, Mask,
+                               bld_base->base.int_elem_type, "");
+                       WComponent = lp_build_emit_llvm_binary(bld_base, TGSI_OPCODE_OR,
+                               WComponent, Mask);
+                       emit_data->output[0] = LLVMBuildInsertElement(gallivm->builder,
+                               emit_data->output[0], WComponent, lp_build_const_int32(gallivm, 3), "");
+                       emit_data->output[0] = LLVMBuildBitCast(gallivm->builder,
+                               emit_data->output[0], LLVMVectorType(bld_base->base.elem_type, 4), "");
                }
                        return;
                default:
@@ -439,11 +583,45 @@ static void llvm_emit_tex(
                }
        }
 
+       if (emit_data->inst->Instruction.Opcode == TGSI_OPCODE_TEX ||
+               emit_data->inst->Instruction.Opcode == TGSI_OPCODE_TXP) {
+               LLVMValueRef Vector[4] = {
+                       LLVMBuildExtractElement(gallivm->builder, emit_data->args[0],
+                               lp_build_const_int32(gallivm, 0), ""),
+                       LLVMBuildExtractElement(gallivm->builder, emit_data->args[0],
+                               lp_build_const_int32(gallivm, 1), ""),
+                       LLVMBuildExtractElement(gallivm->builder, emit_data->args[0],
+                               lp_build_const_int32(gallivm, 2), ""),
+                       LLVMBuildExtractElement(gallivm->builder, emit_data->args[0],
+                               lp_build_const_int32(gallivm, 3), ""),
+               };
+               switch (emit_data->inst->Texture.Texture) {
+               case TGSI_TEXTURE_2D:
+               case TGSI_TEXTURE_RECT:
+                       Vector[2] = Vector[3] = LLVMGetUndef(bld_base->base.elem_type);
+                       break;
+               case TGSI_TEXTURE_1D:
+                       Vector[1] = Vector[2] = Vector[3] = LLVMGetUndef(bld_base->base.elem_type);
+                       break;
+               default:
+                       break;
+               }
+               args[0] = lp_build_gather_values(gallivm, Vector, 4);
+       } else {
+               args[0] = emit_data->args[0];
+       }
+
        assert(emit_data->arg_count + 2 <= Elements(args));
 
-       for (c = 0; c < emit_data->arg_count; ++c)
+       for (c = 1; c < emit_data->arg_count; ++c)
                args[c] = emit_data->args[c];
 
+       if (emit_data->inst->Instruction.Opcode == TGSI_OPCODE_TXF) {
+               args[1] = LLVMBuildShl(gallivm->builder, args[1], lp_build_const_int32(gallivm, 1), "");
+               args[2] = LLVMBuildShl(gallivm->builder, args[2], lp_build_const_int32(gallivm, 1), "");
+               args[3] = LLVMBuildShl(gallivm->builder, args[3], lp_build_const_int32(gallivm, 1), "");
+       }
+
        sampler_src = emit_data->inst->Instruction.NumSrcRegs-1;
 
        args[c++] = lp_build_const_int32(gallivm,
@@ -453,9 +631,72 @@ static void llvm_emit_tex(
        args[c++] = lp_build_const_int32(gallivm,
                                        emit_data->inst->Texture.Texture);
 
+       if (emit_data->inst->Instruction.Opcode == TGSI_OPCODE_TXF &&
+               (emit_data->inst->Texture.Texture == TGSI_TEXTURE_2D_MSAA ||
+               emit_data->inst->Texture.Texture == TGSI_TEXTURE_2D_ARRAY_MSAA)) {
+
+               switch (emit_data->inst->Texture.Texture) {
+               case TGSI_TEXTURE_2D_MSAA:
+                       args[6] = lp_build_const_int32(gallivm, TGSI_TEXTURE_2D);
+                       break;
+               case TGSI_TEXTURE_2D_ARRAY_MSAA:
+                       args[6] = lp_build_const_int32(gallivm, TGSI_TEXTURE_2D_ARRAY);
+                       break;
+               default:
+                       break;
+               }
+
+               if (ctx->has_compressed_msaa_texturing) {
+                       LLVMValueRef ldptr_args[10] = {
+                               args[0], // Coord
+                               args[1], // Offset X
+                               args[2], // Offset Y
+                               args[3], // Offset Z
+                               args[4],
+                               args[5],
+                               lp_build_const_int32(gallivm, 1),
+                               lp_build_const_int32(gallivm, 1),
+                               lp_build_const_int32(gallivm, 1),
+                               lp_build_const_int32(gallivm, 1)
+                       };
+                       LLVMValueRef ptr = build_intrinsic(gallivm->builder,
+                               "llvm.R600.ldptr",
+                               emit_data->dst_type, ldptr_args, 10, LLVMReadNoneAttribute);
+                       LLVMValueRef Tmp = LLVMBuildExtractElement(gallivm->builder, args[0],
+                               lp_build_const_int32(gallivm, 3), "");
+                       Tmp = LLVMBuildMul(gallivm->builder, Tmp,
+                               lp_build_const_int32(gallivm, 4), "");
+                       LLVMValueRef ResX = LLVMBuildExtractElement(gallivm->builder, ptr,
+                               lp_build_const_int32(gallivm, 0), "");
+                       ResX = LLVMBuildBitCast(gallivm->builder, ResX,
+                               bld_base->base.int_elem_type, "");
+                       Tmp = LLVMBuildLShr(gallivm->builder, ResX, Tmp, "");
+                       Tmp = LLVMBuildAnd(gallivm->builder, Tmp,
+                               lp_build_const_int32(gallivm, 0xF), "");
+                       args[0] = LLVMBuildInsertElement(gallivm->builder, args[0], Tmp,
+                               lp_build_const_int32(gallivm, 3), "");
+                       args[c++] = lp_build_const_int32(gallivm,
+                               emit_data->inst->Texture.Texture);
+               }
+       }
+
        emit_data->output[0] = build_intrinsic(gallivm->builder,
                                        action->intr_name,
                                        emit_data->dst_type, args, c, LLVMReadNoneAttribute);
+
+       if (emit_data->inst->Instruction.Opcode == TGSI_OPCODE_TXQ &&
+               ((emit_data->inst->Texture.Texture == TGSI_TEXTURE_CUBE_ARRAY ||
+               emit_data->inst->Texture.Texture == TGSI_TEXTURE_SHADOWCUBE_ARRAY)))
+               if (emit_data->inst->Dst[0].Register.WriteMask & 4) {
+                       LLVMValueRef offset = lp_build_const_int32(bld_base->base.gallivm, 0);
+                       LLVMValueRef ZLayer = LLVMBuildExtractElement(gallivm->builder,
+                               llvm_load_const_buffer(bld_base, offset, CONSTANT_TXQ_BUFFER),
+                               lp_build_const_int32(gallivm, 0), "");
+
+                       emit_data->output[0] = LLVMBuildInsertElement(gallivm->builder, emit_data->output[0], ZLayer, lp_build_const_int32(gallivm, 2), "");
+                       struct radeon_llvm_context * ctx = radeon_llvm_context(bld_base);
+                       ctx->has_txq_cube_array_z_comp = true;
+               }
 }
 
 static void emit_cndlt(
@@ -523,13 +764,24 @@ LLVMModuleRef r600_tgsi_llvm(
        struct tgsi_shader_info shader_info;
        struct lp_build_tgsi_context * bld_base = &ctx->soa.bld_base;
        radeon_llvm_context_init(ctx);
+#if HAVE_LLVM >= 0x0304
+       LLVMTypeRef Arguments[32];
+       unsigned ArgumentsCount = 0;
+       for (unsigned i = 0; i < ctx->inputs_count; i++)
+               Arguments[ArgumentsCount++] = LLVMVectorType(bld_base->base.elem_type, 4);
+       radeon_llvm_create_func(ctx, Arguments, ArgumentsCount);
+       for (unsigned i = 0; i < ctx->inputs_count; i++) {
+               LLVMValueRef P = LLVMGetParam(ctx->main_fn, i);
+               LLVMAddAttribute(P, LLVMInRegAttribute);
+       }
+#else
        radeon_llvm_create_func(ctx, NULL, 0);
+#endif
        tgsi_scan_shader(tokens, &shader_info);
 
        bld_base->info = &shader_info;
        bld_base->userdata = ctx;
        bld_base->emit_fetch_funcs[TGSI_FILE_CONSTANT] = llvm_fetch_const;
-       bld_base->emit_fetch_funcs[TGSI_FILE_SYSTEM_VALUE] = llvm_fetch_system_value;
        bld_base->emit_prologue = llvm_emit_prologue;
        bld_base->emit_epilogue = llvm_emit_epilogue;
        ctx->userdata = ctx;
@@ -561,79 +813,61 @@ LLVMModuleRef r600_tgsi_llvm(
        return ctx->gallivm.module;
 }
 
-const char * r600_llvm_gpu_string(enum radeon_family family)
-{
-       const char * gpu_family;
-
-       switch (family) {
-       case CHIP_R600:
-       case CHIP_RV610:
-       case CHIP_RV630:
-       case CHIP_RV620:
-       case CHIP_RV635:
-       case CHIP_RV670:
-       case CHIP_RS780:
-       case CHIP_RS880:
-               gpu_family = "r600";
-               break;
-       case CHIP_RV710:
-               gpu_family = "rv710";
-               break;
-       case CHIP_RV730:
-               gpu_family = "rv730";
-               break;
-       case CHIP_RV740:
-       case CHIP_RV770:
-               gpu_family = "rv770";
-               break;
-       case CHIP_PALM:
-       case CHIP_CEDAR:
-               gpu_family = "cedar";
-               break;
-       case CHIP_SUMO:
-       case CHIP_SUMO2:
-       case CHIP_REDWOOD:
-               gpu_family = "redwood";
-               break;
-       case CHIP_JUNIPER:
-               gpu_family = "juniper";
-               break;
-       case CHIP_HEMLOCK:
-       case CHIP_CYPRESS:
-               gpu_family = "cypress";
-               break;
-       case CHIP_BARTS:
-               gpu_family = "barts";
-               break;
-       case CHIP_TURKS:
-               gpu_family = "turks";
-               break;
-       case CHIP_CAICOS:
-               gpu_family = "caicos";
-               break;
-       case CHIP_CAYMAN:
-        case CHIP_ARUBA:
-               gpu_family = "cayman";
-               break;
-       default:
-               gpu_family = "";
-               fprintf(stderr, "Chip not supported by r600 llvm "
-                       "backend, please file a bug at bugs.freedesktop.org\n");
-               break;
-       }
-       return gpu_family;
-}
+/* We need to define these R600 registers here, because we can't include
+ * evergreend.h and r600d.h.
+ */
+#define R_028868_SQ_PGM_RESOURCES_VS                 0x028868
+#define R_028850_SQ_PGM_RESOURCES_PS                 0x028850
 
 unsigned r600_llvm_compile(
        LLVMModuleRef mod,
-       unsigned char ** inst_bytes,
-       unsigned * inst_byte_count,
        enum radeon_family family,
+       struct r600_bytecode *bc,
+       boolean *use_kill,
        unsigned dump)
 {
-       const char * gpu_family = r600_llvm_gpu_string(family);
-       return radeon_llvm_compile(mod, inst_bytes, inst_byte_count,
-                                                       gpu_family, dump);
+       unsigned r;
+       struct radeon_llvm_binary binary;
+       const char * gpu_family = r600_get_llvm_processor_name(family);
+       unsigned i;
+
+       memset(&binary, 0, sizeof(struct radeon_llvm_binary));
+       r = radeon_llvm_compile(mod, &binary, gpu_family, dump);
+
+       assert(binary.code_size % 4 == 0);
+       bc->bytecode = CALLOC(1, binary.code_size);
+       memcpy(bc->bytecode, binary.code, binary.code_size);
+       bc->ndw = binary.code_size / 4;
+
+       for (i = 0; i < binary.config_size; i+= 8) {
+               unsigned reg =
+                       util_le32_to_cpu(*(uint32_t*)(binary.config + i));
+               unsigned value =
+                       util_le32_to_cpu(*(uint32_t*)(binary.config + i + 4));
+               switch (reg) {
+               /* R600 / R700 */
+               case R_028850_SQ_PGM_RESOURCES_PS:
+               case R_028868_SQ_PGM_RESOURCES_VS:
+               /* Evergreen / Northern Islands */
+               case R_028844_SQ_PGM_RESOURCES_PS:
+               case R_028860_SQ_PGM_RESOURCES_VS:
+               case R_0288D4_SQ_PGM_RESOURCES_LS:
+                       bc->ngpr = G_028844_NUM_GPRS(value);
+                       bc->nstack = G_028844_STACK_SIZE(value);
+                       break;
+               case R_02880C_DB_SHADER_CONTROL:
+                       *use_kill = G_02880C_KILL_ENABLE(value);
+                       break;
+               case CM_R_0288E8_SQ_LDS_ALLOC:
+                       bc->nlds_dw = value;
+                       break;
+               }
+       }
+
+       FREE(binary.code);
+       FREE(binary.config);
+
+       return r;
 }
 
 #endif