radeonsi: Fix y/z/w component values of TGSI_SEMANTIC_FOG pixel shader inputs
[mesa.git] / src / gallium / drivers / radeonsi / radeonsi_shader.c
index 4f762245b2bbb705dd3e9097c3af924f3fa1ebc3..a1dec1757cb8bf2557f6cef182965e3f9517debf 100644 (file)
 #include "gallivm/lp_bld_const.h"
 #include "gallivm/lp_bld_gather.h"
 #include "gallivm/lp_bld_intr.h"
+#include "gallivm/lp_bld_logic.h"
 #include "gallivm/lp_bld_tgsi.h"
+#include "gallivm/lp_bld_arit.h"
 #include "radeon_llvm.h"
 #include "radeon_llvm_emit.h"
+#include "util/u_memory.h"
 #include "tgsi/tgsi_info.h"
 #include "tgsi/tgsi_parse.h"
 #include "tgsi/tgsi_scan.h"
+#include "tgsi/tgsi_util.h"
 #include "tgsi/tgsi_dump.h"
 
 #include "radeonsi_pipe.h"
 #include <errno.h>
 #include <stdio.h>
 
-/*
-static ps_remap_inputs(
-       struct tgsi_llvm_context * tl_ctx,
-       unsigned tgsi_index,
-       unsigned tgsi_chan)
-{
-       :
-}
-
-struct si_input
-{
-       struct list_head head;
-       unsigned tgsi_index;
-       unsigned tgsi_chan;
-       unsigned order;
-};
-*/
-
-
 struct si_shader_context
 {
        struct radeon_llvm_context radeon_bld;
-       struct r600_context *rctx;
        struct tgsi_parse_context parse;
        struct tgsi_token * tokens;
        struct si_pipe_shader *shader;
        unsigned type; /* TGSI_PROCESSOR_* specifies the type of shader. */
-/*     unsigned num_inputs; */
-/*     struct list_head inputs; */
-/*     unsigned * input_mappings *//* From TGSI to SI hw */
-/*     struct tgsi_shader_info info;*/
+       LLVMValueRef const_md;
+       LLVMValueRef const_resource;
+#if HAVE_LLVM >= 0x0304
+       LLVMValueRef ddxy_lds;
+#endif
+       LLVMValueRef *constants;
+       LLVMValueRef *resources;
+       LLVMValueRef *samplers;
 };
 
 static struct si_shader_context * si_shader_context(
@@ -97,16 +85,9 @@ static struct si_shader_context * si_shader_context(
 
 #define USE_SGPR_MAX_SUFFIX_LEN 5
 #define CONST_ADDR_SPACE 2
+#define LOCAL_ADDR_SPACE 3
 #define USER_SGPR_ADDR_SPACE 8
 
-enum sgpr_type {
-       SGPR_CONST_PTR_F32,
-       SGPR_CONST_PTR_V4I32,
-       SGPR_CONST_PTR_V8I32,
-       SGPR_I32,
-       SGPR_I64
-};
-
 /**
  * Build an LLVM bytecode indexed load using LLVMBuildGEP + LLVMBuildLoad
  *
@@ -120,79 +101,35 @@ enum sgpr_type {
  *
  */
 static LLVMValueRef build_indexed_load(
-       struct gallivm_state * gallivm,
+       struct si_shader_context * si_shader_ctx,
        LLVMValueRef base_ptr,
        LLVMValueRef offset)
 {
+       struct lp_build_context * base = &si_shader_ctx->radeon_bld.soa.bld_base.base;
+
        LLVMValueRef computed_ptr = LLVMBuildGEP(
-               gallivm->builder, base_ptr, &offset, 1, "");
+               base->gallivm->builder, base_ptr, &offset, 1, "");
 
-       return LLVMBuildLoad(gallivm->builder, computed_ptr, "");
+       LLVMValueRef result = LLVMBuildLoad(base->gallivm->builder, computed_ptr, "");
+       LLVMSetMetadata(result, 1, si_shader_ctx->const_md);
+       return result;
 }
 
-/**
- * Load a value stored in one of the user SGPRs
- *
- * @param sgpr This is the sgpr to load the value from.  If you need to load a
- * value that is stored in consecutive SGPR registers (e.g. a 64-bit pointer),
- * then you should pass the index of the first SGPR that holds the value.  For
- * example, if you want to load a pointer that is stored in SGPRs 2 and 3, then
- * use pass 2 for the sgpr parameter.
- *
- * The value of the sgpr parameter must also be aligned to the width of the type
- * being loaded, so that the sgpr parameter is divisible by the dword width of the
- * type.  For example, if the value being loaded is two dwords wide, then the sgpr
- * parameter must be divisible by two.
- */
-static LLVMValueRef use_sgpr(
-       struct gallivm_state * gallivm,
-       enum sgpr_type type,
-       unsigned sgpr)
+static LLVMValueRef get_instance_index(
+       struct radeon_llvm_context * radeon_bld,
+       unsigned divisor)
 {
-       LLVMValueRef sgpr_index;
-       LLVMTypeRef ret_type;
-       LLVMValueRef ptr;
-
-       sgpr_index = lp_build_const_int32(gallivm, sgpr);
-
-       switch (type) {
-       case SGPR_CONST_PTR_F32:
-               assert(sgpr % 2 == 0);
-               ret_type = LLVMFloatTypeInContext(gallivm->context);
-               ret_type = LLVMPointerType(ret_type, CONST_ADDR_SPACE);
-               break;
-
-       case SGPR_I32:
-               ret_type = LLVMInt32TypeInContext(gallivm->context);
-               break;
-
-       case SGPR_I64:
-               assert(sgpr % 2 == 0);
-               ret_type= LLVMInt64TypeInContext(gallivm->context);
-               break;
+       struct gallivm_state * gallivm = radeon_bld->soa.bld_base.base.gallivm;
 
-       case SGPR_CONST_PTR_V4I32:
-               assert(sgpr % 2 == 0);
-               ret_type = LLVMInt32TypeInContext(gallivm->context);
-               ret_type = LLVMVectorType(ret_type, 4);
-               ret_type = LLVMPointerType(ret_type, CONST_ADDR_SPACE);
-               break;
+       LLVMValueRef result = LLVMGetParam(radeon_bld->main_fn, SI_PARAM_INSTANCE_ID);
+       result = LLVMBuildAdd(gallivm->builder, result, LLVMGetParam(
+                       radeon_bld->main_fn, SI_PARAM_START_INSTANCE), "");
 
-       case SGPR_CONST_PTR_V8I32:
-               assert(sgpr % 2 == 0);
-               ret_type = LLVMInt32TypeInContext(gallivm->context);
-               ret_type = LLVMVectorType(ret_type, 8);
-               ret_type = LLVMPointerType(ret_type, CONST_ADDR_SPACE);
-               break;
+       if (divisor > 1)
+               result = LLVMBuildUDiv(gallivm->builder, result,
+                               lp_build_const_int32(gallivm, divisor), "");
 
-       default:
-               assert(!"Unsupported SGPR type in use_sgpr()");
-               return NULL;
-       }
-
-       ret_type = LLVMPointerType(ret_type, USER_SGPR_ADDR_SPACE);
-       ptr = LLVMBuildIntToPtr(gallivm->builder, sgpr_index, ret_type, "");
-       return LLVMBuildLoad(gallivm->builder, ptr, "");
+       return result;
 }
 
 static void declare_input_vs(
@@ -200,45 +137,47 @@ static void declare_input_vs(
        unsigned input_index,
        const struct tgsi_full_declaration *decl)
 {
+       struct lp_build_context * base = &si_shader_ctx->radeon_bld.soa.bld_base.base;
+       unsigned divisor = si_shader_ctx->shader->key.vs.instance_divisors[input_index];
+
+       unsigned chan;
+
        LLVMValueRef t_list_ptr;
        LLVMValueRef t_offset;
        LLVMValueRef t_list;
        LLVMValueRef attribute_offset;
-       LLVMValueRef buffer_index_reg;
+       LLVMValueRef buffer_index;
        LLVMValueRef args[3];
        LLVMTypeRef vec4_type;
        LLVMValueRef input;
-       struct lp_build_context * uint = &si_shader_ctx->radeon_bld.soa.bld_base.uint_bld;
-       struct lp_build_context * base = &si_shader_ctx->radeon_bld.soa.bld_base.base;
-       struct r600_context *rctx = si_shader_ctx->rctx;
-       //struct pipe_vertex_element *velem = &rctx->vertex_elements->elements[input_index];
-       unsigned chan;
 
        /* Load the T list */
-       /* XXX: Communicate with the rest of the driver about which SGPR the T#
-        * list pointer is going to be stored in.  Hard code to SGPR[6:7] for
-        * now */
-       t_list_ptr = use_sgpr(base->gallivm, SGPR_CONST_PTR_V4I32, 6);
+       t_list_ptr = LLVMGetParam(si_shader_ctx->radeon_bld.main_fn, SI_PARAM_VERTEX_BUFFER);
 
        t_offset = lp_build_const_int32(base->gallivm, input_index);
 
-       t_list = build_indexed_load(base->gallivm, t_list_ptr, t_offset);
+       t_list = build_indexed_load(si_shader_ctx, t_list_ptr, t_offset);
 
        /* Build the attribute offset */
        attribute_offset = lp_build_const_int32(base->gallivm, 0);
 
-       /* Load the buffer index is always, which is always stored in VGPR0
-        * for Vertex Shaders */
-       buffer_index_reg = build_intrinsic(base->gallivm->builder,
-               "llvm.SI.vs.load.buffer.index", uint->elem_type, NULL, 0,
-               LLVMReadNoneAttribute);
+       if (divisor) {
+               /* Build index from instance ID, start instance and divisor */
+               si_shader_ctx->shader->shader.uses_instanceid = true;
+               buffer_index = get_instance_index(&si_shader_ctx->radeon_bld, divisor);
+       } else {
+               /* Load the buffer index, which is always stored in VGPR0
+                * for Vertex Shaders */
+               buffer_index = LLVMGetParam(si_shader_ctx->radeon_bld.main_fn, SI_PARAM_VERTEX_ID);
+       }
 
        vec4_type = LLVMVectorType(base->elem_type, 4);
        args[0] = t_list;
        args[1] = attribute_offset;
-       args[2] = buffer_index_reg;
-       input = lp_build_intrinsic(base->gallivm->builder,
-               "llvm.SI.vs.load.input", vec4_type, args, 3);
+       args[2] = buffer_index;
+       input = build_intrinsic(base->gallivm->builder,
+               "llvm.SI.vs.load.input", vec4_type, args, 3,
+               LLVMReadNoneAttribute | LLVMNoUnwindAttribute);
 
        /* Break up the vec4 into individual components */
        for (chan = 0; chan < 4; chan++) {
@@ -256,11 +195,17 @@ static void declare_input_fs(
        unsigned input_index,
        const struct tgsi_full_declaration *decl)
 {
-       const char * intr_name;
-       unsigned chan;
+       struct si_shader *shader = &si_shader_ctx->shader->shader;
        struct lp_build_context * base =
                                &si_shader_ctx->radeon_bld.soa.bld_base.base;
+       struct lp_build_context *uint =
+                               &si_shader_ctx->radeon_bld.soa.bld_base.uint_bld;
        struct gallivm_state * gallivm = base->gallivm;
+       LLVMTypeRef input_type = LLVMFloatTypeInContext(gallivm->context);
+       LLVMValueRef main_fn = si_shader_ctx->radeon_bld.main_fn;
+
+       LLVMValueRef interp_param;
+       const char * intr_name;
 
        /* This value is:
         * [15:0] NewPrimMask (Bit mask for each quad.  It is set it the
@@ -269,67 +214,165 @@ static void declare_input_fs(
         * [32:16] ParamOffset
         *
         */
-       /* XXX: This register number must be identical to the S_00B02C_USER_SGPR
-        * register field value
-        */
-       LLVMValueRef params = use_sgpr(base->gallivm, SGPR_I32, 6);
+       LLVMValueRef params = LLVMGetParam(si_shader_ctx->radeon_bld.main_fn, SI_PARAM_PRIM_MASK);
+       LLVMValueRef attr_number;
+
+       unsigned chan;
+
+       if (decl->Semantic.Name == TGSI_SEMANTIC_POSITION) {
+               for (chan = 0; chan < TGSI_NUM_CHANNELS; chan++) {
+                       unsigned soa_index =
+                               radeon_llvm_reg_index_soa(input_index, chan);
+                       si_shader_ctx->radeon_bld.inputs[soa_index] =
+                               LLVMGetParam(main_fn, SI_PARAM_POS_X_FLOAT + chan);
+
+                       if (chan == 3)
+                               /* RCP for fragcoord.w */
+                               si_shader_ctx->radeon_bld.inputs[soa_index] =
+                                       LLVMBuildFDiv(gallivm->builder,
+                                                     lp_build_const_float(gallivm, 1.0f),
+                                                     si_shader_ctx->radeon_bld.inputs[soa_index],
+                                                     "");
+               }
+               return;
+       }
+
+       if (decl->Semantic.Name == TGSI_SEMANTIC_FACE) {
+               LLVMValueRef face, is_face_positive;
+
+               face = LLVMGetParam(main_fn, SI_PARAM_FRONT_FACE);
 
+               is_face_positive = LLVMBuildFCmp(gallivm->builder,
+                                                LLVMRealUGT, face,
+                                                lp_build_const_float(gallivm, 0.0f),
+                                                "");
 
-       /* XXX: Is this the input_index? */
-       LLVMValueRef attr_number = lp_build_const_int32(gallivm, input_index);
+               si_shader_ctx->radeon_bld.inputs[radeon_llvm_reg_index_soa(input_index, 0)] =
+                       LLVMBuildSelect(gallivm->builder,
+                                       is_face_positive,
+                                       lp_build_const_float(gallivm, 1.0f),
+                                       lp_build_const_float(gallivm, 0.0f),
+                                       "");
+               si_shader_ctx->radeon_bld.inputs[radeon_llvm_reg_index_soa(input_index, 1)] =
+               si_shader_ctx->radeon_bld.inputs[radeon_llvm_reg_index_soa(input_index, 2)] =
+                       lp_build_const_float(gallivm, 0.0f);
+               si_shader_ctx->radeon_bld.inputs[radeon_llvm_reg_index_soa(input_index, 3)] =
+                       lp_build_const_float(gallivm, 1.0f);
+
+               return;
+       }
+
+       shader->input[input_index].param_offset = shader->ninterp++;
+       attr_number = lp_build_const_int32(gallivm,
+                                          shader->input[input_index].param_offset);
 
        /* XXX: Handle all possible interpolation modes */
        switch (decl->Interp.Interpolate) {
        case TGSI_INTERPOLATE_COLOR:
-               /* XXX: Flat shading hangs the GPU */
-               if (si_shader_ctx->rctx->queued.named.rasterizer->flatshade) {
-#if 0
-                       intr_name = "llvm.SI.fs.interp.constant";
-#else
-                       intr_name = "llvm.SI.fs.interp.linear.center";
-#endif
+               if (si_shader_ctx->shader->key.ps.flatshade) {
+                       interp_param = 0;
                } else {
                        if (decl->Interp.Centroid)
-                               intr_name = "llvm.SI.fs.interp.persp.centroid";
+                               interp_param = LLVMGetParam(main_fn, SI_PARAM_PERSP_CENTROID);
                        else
-                               intr_name = "llvm.SI.fs.interp.persp.center";
+                               interp_param = LLVMGetParam(main_fn, SI_PARAM_PERSP_CENTER);
                }
                break;
        case TGSI_INTERPOLATE_CONSTANT:
-               /* XXX: Flat shading hangs the GPU */
-#if 0
-               intr_name = "llvm.SI.fs.interp.constant";
+               interp_param = 0;
                break;
-#endif
        case TGSI_INTERPOLATE_LINEAR:
                if (decl->Interp.Centroid)
-                       intr_name = "llvm.SI.fs.interp.linear.centroid";
+                       interp_param = LLVMGetParam(main_fn, SI_PARAM_LINEAR_CENTROID);
                else
-                       intr_name = "llvm.SI.fs.interp.linear.center";
+                       interp_param = LLVMGetParam(main_fn, SI_PARAM_LINEAR_CENTER);
                break;
        case TGSI_INTERPOLATE_PERSPECTIVE:
                if (decl->Interp.Centroid)
-                       intr_name = "llvm.SI.fs.interp.persp.centroid";
+                       interp_param = LLVMGetParam(main_fn, SI_PARAM_PERSP_CENTROID);
                else
-                       intr_name = "llvm.SI.fs.interp.persp.center";
+                       interp_param = LLVMGetParam(main_fn, SI_PARAM_PERSP_CENTER);
                break;
        default:
                fprintf(stderr, "Warning: Unhandled interpolation mode.\n");
                return;
        }
 
+       intr_name = interp_param ? "llvm.SI.fs.interp" : "llvm.SI.fs.constant";
+
        /* XXX: Could there be more than TGSI_NUM_CHANNELS (4) ? */
-       for (chan = 0; chan < TGSI_NUM_CHANNELS; chan++) {
-               LLVMValueRef args[3];
-               LLVMValueRef llvm_chan = lp_build_const_int32(gallivm, chan);
-               unsigned soa_index = radeon_llvm_reg_index_soa(input_index, chan);
-               LLVMTypeRef input_type = LLVMFloatTypeInContext(gallivm->context);
-               args[0] = llvm_chan;
+       if (decl->Semantic.Name == TGSI_SEMANTIC_COLOR &&
+           si_shader_ctx->shader->key.ps.color_two_side) {
+               LLVMValueRef args[4];
+               LLVMValueRef face, is_face_positive;
+               LLVMValueRef back_attr_number =
+                       lp_build_const_int32(gallivm,
+                                            shader->input[input_index].param_offset + 1);
+
+               face = LLVMGetParam(main_fn, SI_PARAM_FRONT_FACE);
+
+               is_face_positive = LLVMBuildFCmp(gallivm->builder,
+                                                LLVMRealUGT, face,
+                                                lp_build_const_float(gallivm, 0.0f),
+                                                "");
+
+               args[2] = params;
+               args[3] = interp_param;
+               for (chan = 0; chan < TGSI_NUM_CHANNELS; chan++) {
+                       LLVMValueRef llvm_chan = lp_build_const_int32(gallivm, chan);
+                       unsigned soa_index = radeon_llvm_reg_index_soa(input_index, chan);
+                       LLVMValueRef front, back;
+
+                       args[0] = llvm_chan;
+                       args[1] = attr_number;
+                       front = build_intrinsic(base->gallivm->builder, intr_name,
+                                               input_type, args, args[3] ? 4 : 3,
+                                               LLVMReadNoneAttribute | LLVMNoUnwindAttribute);
+
+                       args[1] = back_attr_number;
+                       back = build_intrinsic(base->gallivm->builder, intr_name,
+                                              input_type, args, args[3] ? 4 : 3,
+                                              LLVMReadNoneAttribute | LLVMNoUnwindAttribute);
+
+                       si_shader_ctx->radeon_bld.inputs[soa_index] =
+                               LLVMBuildSelect(gallivm->builder,
+                                               is_face_positive,
+                                               front,
+                                               back,
+                                               "");
+               }
+
+               shader->ninterp++;
+       } else if (decl->Semantic.Name == TGSI_SEMANTIC_FOG) {
+               LLVMValueRef args[4];
+
+               args[0] = uint->zero;
                args[1] = attr_number;
                args[2] = params;
-               si_shader_ctx->radeon_bld.inputs[soa_index] =
-                       lp_build_intrinsic(gallivm->builder, intr_name,
-                                               input_type, args, 3);
+               args[3] = interp_param;
+               si_shader_ctx->radeon_bld.inputs[radeon_llvm_reg_index_soa(input_index, 0)] =
+                       build_intrinsic(base->gallivm->builder, intr_name,
+                                               input_type, args, args[3] ? 4 : 3,
+                                               LLVMReadNoneAttribute | LLVMNoUnwindAttribute);
+               si_shader_ctx->radeon_bld.inputs[radeon_llvm_reg_index_soa(input_index, 1)] =
+               si_shader_ctx->radeon_bld.inputs[radeon_llvm_reg_index_soa(input_index, 2)] =
+                       lp_build_const_float(gallivm, 0.0f);
+               si_shader_ctx->radeon_bld.inputs[radeon_llvm_reg_index_soa(input_index, 3)] =
+                       lp_build_const_float(gallivm, 1.0f);
+       } else {
+               for (chan = 0; chan < TGSI_NUM_CHANNELS; chan++) {
+                       LLVMValueRef args[4];
+                       LLVMValueRef llvm_chan = lp_build_const_int32(gallivm, chan);
+                       unsigned soa_index = radeon_llvm_reg_index_soa(input_index, chan);
+                       args[0] = llvm_chan;
+                       args[1] = attr_number;
+                       args[2] = params;
+                       args[3] = interp_param;
+                       si_shader_ctx->radeon_bld.inputs[soa_index] =
+                               build_intrinsic(base->gallivm->builder, intr_name,
+                                               input_type, args, args[3] ? 4 : 3,
+                                               LLVMReadNoneAttribute | LLVMNoUnwindAttribute);
+               }
        }
 }
 
@@ -349,30 +392,263 @@ static void declare_input(
        }
 }
 
+static void declare_system_value(
+       struct radeon_llvm_context * radeon_bld,
+       unsigned index,
+       const struct tgsi_full_declaration *decl)
+{
+
+       LLVMValueRef value = 0;
+
+       switch (decl->Semantic.Name) {
+       case TGSI_SEMANTIC_INSTANCEID:
+               value = get_instance_index(radeon_bld, 1);
+               break;
+
+       case TGSI_SEMANTIC_VERTEXID:
+               value = LLVMGetParam(radeon_bld->main_fn, SI_PARAM_VERTEX_ID);
+               break;
+
+       default:
+               assert(!"unknown system value");
+               return;
+       }
+
+       radeon_bld->system_values[index] = value;
+}
+
 static LLVMValueRef fetch_constant(
        struct lp_build_tgsi_context * bld_base,
        const struct tgsi_full_src_register *reg,
        enum tgsi_opcode_type type,
        unsigned swizzle)
 {
+       struct si_shader_context *si_shader_ctx = si_shader_context(bld_base);
        struct lp_build_context * base = &bld_base->base;
+       const struct tgsi_ind_register *ireg = &reg->Indirect;
+       unsigned idx;
 
-       LLVMValueRef const_ptr;
-       LLVMValueRef offset;
-       LLVMValueRef load;
+       LLVMValueRef args[2];
+       LLVMValueRef addr;
+       LLVMValueRef result;
+
+       if (swizzle == LP_CHAN_ALL) {
+               unsigned chan;
+               LLVMValueRef values[4];
+               for (chan = 0; chan < TGSI_NUM_CHANNELS; ++chan)
+                       values[chan] = fetch_constant(bld_base, reg, type, chan);
+
+               return lp_build_gather_values(bld_base->base.gallivm, values, 4);
+       }
+
+       idx = reg->Register.Index * 4 + swizzle;
+       if (!reg->Register.Indirect)
+               return bitcast(bld_base, type, si_shader_ctx->constants[idx]);
 
-       /* XXX: Assume the pointer to the constant buffer is being stored in
-        * SGPR[0:1] */
-       const_ptr = use_sgpr(base->gallivm, SGPR_CONST_PTR_F32, 0);
+       args[0] = si_shader_ctx->const_resource;
+       args[1] = lp_build_const_int32(base->gallivm, idx * 4);
+       addr = si_shader_ctx->radeon_bld.soa.addr[ireg->Index][ireg->Swizzle];
+       addr = LLVMBuildLoad(base->gallivm->builder, addr, "load addr reg");
+       addr = lp_build_mul_imm(&bld_base->uint_bld, addr, 16);
+       args[1] = lp_build_add(&bld_base->uint_bld, addr, args[1]);
 
-       /* XXX: This assumes that the constant buffer is not packed, so
-        * CONST[0].x will have an offset of 0 and CONST[1].x will have an
-        * offset of 4. */
-       offset = lp_build_const_int32(base->gallivm,
-                                       (reg->Register.Index * 4) + swizzle);
+       result = build_intrinsic(base->gallivm->builder, "llvm.SI.load.const", base->elem_type,
+                                 args, 2, LLVMReadNoneAttribute | LLVMNoUnwindAttribute);
 
-       load = build_indexed_load(base->gallivm, const_ptr, offset);
-       return bitcast(bld_base, type, load);
+       return bitcast(bld_base, type, result);
+}
+
+/* Initialize arguments for the shader export intrinsic */
+static void si_llvm_init_export_args(struct lp_build_tgsi_context *bld_base,
+                                    struct tgsi_full_declaration *d,
+                                    unsigned index,
+                                    unsigned target,
+                                    LLVMValueRef *args)
+{
+       struct si_shader_context *si_shader_ctx = si_shader_context(bld_base);
+       struct lp_build_context *uint =
+                               &si_shader_ctx->radeon_bld.soa.bld_base.uint_bld;
+       struct lp_build_context *base = &bld_base->base;
+       unsigned compressed = 0;
+       unsigned chan;
+
+       if (si_shader_ctx->type == TGSI_PROCESSOR_FRAGMENT) {
+               int cbuf = target - V_008DFC_SQ_EXP_MRT;
+
+               if (cbuf >= 0 && cbuf < 8) {
+                       compressed = (si_shader_ctx->shader->key.ps.export_16bpc >> cbuf) & 0x1;
+
+                       if (compressed)
+                               si_shader_ctx->shader->spi_shader_col_format |=
+                                       V_028714_SPI_SHADER_FP16_ABGR << (4 * cbuf);
+                       else
+                               si_shader_ctx->shader->spi_shader_col_format |=
+                                       V_028714_SPI_SHADER_32_ABGR << (4 * cbuf);
+
+                       si_shader_ctx->shader->cb_shader_mask |= 0xf << (4 * cbuf);
+               }
+       }
+
+       if (compressed) {
+               /* Pixel shader needs to pack output values before export */
+               for (chan = 0; chan < 2; chan++ ) {
+                       LLVMValueRef *out_ptr =
+                               si_shader_ctx->radeon_bld.soa.outputs[index];
+                       args[0] = LLVMBuildLoad(base->gallivm->builder,
+                                               out_ptr[2 * chan], "");
+                       args[1] = LLVMBuildLoad(base->gallivm->builder,
+                                               out_ptr[2 * chan + 1], "");
+                       args[chan + 5] =
+                               build_intrinsic(base->gallivm->builder,
+                                               "llvm.SI.packf16",
+                                               LLVMInt32TypeInContext(base->gallivm->context),
+                                               args, 2,
+                                               LLVMReadNoneAttribute | LLVMNoUnwindAttribute);
+                       args[chan + 7] = args[chan + 5] =
+                               LLVMBuildBitCast(base->gallivm->builder,
+                                                args[chan + 5],
+                                                LLVMFloatTypeInContext(base->gallivm->context),
+                                                "");
+               }
+
+               /* Set COMPR flag */
+               args[4] = uint->one;
+       } else {
+               for (chan = 0; chan < 4; chan++ ) {
+                       LLVMValueRef out_ptr =
+                               si_shader_ctx->radeon_bld.soa.outputs[index][chan];
+                       /* +5 because the first output value will be
+                        * the 6th argument to the intrinsic. */
+                       args[chan + 5] = LLVMBuildLoad(base->gallivm->builder,
+                                                      out_ptr, "");
+               }
+
+               /* Clear COMPR flag */
+               args[4] = uint->zero;
+       }
+
+       /* XXX: This controls which components of the output
+        * registers actually get exported. (e.g bit 0 means export
+        * X component, bit 1 means export Y component, etc.)  I'm
+        * hard coding this to 0xf for now.  In the future, we might
+        * want to do something else. */
+       args[0] = lp_build_const_int32(base->gallivm, 0xf);
+
+       /* Specify whether the EXEC mask represents the valid mask */
+       args[1] = uint->zero;
+
+       /* Specify whether this is the last export */
+       args[2] = uint->zero;
+
+       /* Specify the target we are exporting */
+       args[3] = lp_build_const_int32(base->gallivm, target);
+
+       /* XXX: We probably need to keep track of the output
+        * values, so we know what we are passing to the next
+        * stage. */
+}
+
+static void si_alpha_test(struct lp_build_tgsi_context *bld_base,
+                         unsigned index)
+{
+       struct si_shader_context *si_shader_ctx = si_shader_context(bld_base);
+       struct gallivm_state *gallivm = bld_base->base.gallivm;
+
+       if (si_shader_ctx->shader->key.ps.alpha_func != PIPE_FUNC_NEVER) {
+               LLVMValueRef out_ptr = si_shader_ctx->radeon_bld.soa.outputs[index][3];
+               LLVMValueRef alpha_pass =
+                       lp_build_cmp(&bld_base->base,
+                                    si_shader_ctx->shader->key.ps.alpha_func,
+                                    LLVMBuildLoad(gallivm->builder, out_ptr, ""),
+                                    lp_build_const_float(gallivm, si_shader_ctx->shader->key.ps.alpha_ref));
+               LLVMValueRef arg =
+                       lp_build_select(&bld_base->base,
+                                       alpha_pass,
+                                       lp_build_const_float(gallivm, 1.0f),
+                                       lp_build_const_float(gallivm, -1.0f));
+
+               build_intrinsic(gallivm->builder,
+                               "llvm.AMDGPU.kill",
+                               LLVMVoidTypeInContext(gallivm->context),
+                               &arg, 1, 0);
+       } else {
+               build_intrinsic(gallivm->builder,
+                               "llvm.AMDGPU.kilp",
+                               LLVMVoidTypeInContext(gallivm->context),
+                               NULL, 0, 0);
+       }
+}
+
+static void si_alpha_to_one(struct lp_build_tgsi_context *bld_base,
+                           unsigned index)
+{
+       struct si_shader_context *si_shader_ctx = si_shader_context(bld_base);
+
+       /* set alpha to one */
+       LLVMBuildStore(bld_base->base.gallivm->builder,
+                      bld_base->base.one,
+                      si_shader_ctx->radeon_bld.soa.outputs[index][3]);
+}
+
+static void si_llvm_emit_clipvertex(struct lp_build_tgsi_context * bld_base,
+                                   LLVMValueRef (*pos)[9], unsigned index)
+{
+       struct si_shader_context *si_shader_ctx = si_shader_context(bld_base);
+       struct si_pipe_shader *shader = si_shader_ctx->shader;
+       struct lp_build_context *base = &bld_base->base;
+       struct lp_build_context *uint = &si_shader_ctx->radeon_bld.soa.bld_base.uint_bld;
+       unsigned reg_index;
+       unsigned chan;
+       unsigned const_chan;
+       LLVMValueRef out_elts[4];
+       LLVMValueRef base_elt;
+       LLVMValueRef ptr = LLVMGetParam(si_shader_ctx->radeon_bld.main_fn, SI_PARAM_CONST);
+       LLVMValueRef const_resource = build_indexed_load(si_shader_ctx, ptr, uint->one);
+
+       for (chan = 0; chan < TGSI_NUM_CHANNELS; chan++) {
+               LLVMValueRef out_ptr = si_shader_ctx->radeon_bld.soa.outputs[index][chan];
+               out_elts[chan] = LLVMBuildLoad(base->gallivm->builder, out_ptr, "");
+       }
+
+       for (reg_index = 0; reg_index < 2; reg_index ++) {
+               LLVMValueRef *args = pos[2 + reg_index];
+
+               if (!(shader->key.vs.ucps_enabled & (1 << reg_index)))
+                       continue;
+
+               shader->shader.clip_dist_write |= 0xf << (4 * reg_index);
+
+               args[5] =
+               args[6] =
+               args[7] =
+               args[8] = lp_build_const_float(base->gallivm, 0.0f);
+
+               /* Compute dot products of position and user clip plane vectors */
+               for (chan = 0; chan < TGSI_NUM_CHANNELS; chan++) {
+                       for (const_chan = 0; const_chan < TGSI_NUM_CHANNELS; const_chan++) {
+                               args[0] = const_resource;
+                               args[1] = lp_build_const_int32(base->gallivm,
+                                                              ((reg_index * 4 + chan) * 4 +
+                                                               const_chan) * 4);
+                               base_elt = build_intrinsic(base->gallivm->builder,
+                                                          "llvm.SI.load.const",
+                                                          base->elem_type,
+                                                          args, 2,
+                                                          LLVMReadNoneAttribute | LLVMNoUnwindAttribute);
+                               args[5 + chan] =
+                                       lp_build_add(base, args[5 + chan],
+                                                    lp_build_mul(base, base_elt,
+                                                                 out_elts[const_chan]));
+                       }
+               }
+
+               args[0] = lp_build_const_int32(base->gallivm, 0xf);
+               args[1] = uint->zero;
+               args[2] = uint->zero;
+               args[3] = lp_build_const_int32(base->gallivm,
+                                              V_008DFC_SQ_EXP_POS + 2 + reg_index);
+               args[4] = uint->zero;
+       }
 }
 
 /* XXX: This is partially implemented for VS only at this point.  It is not complete */
@@ -384,32 +660,35 @@ static void si_llvm_emit_epilogue(struct lp_build_tgsi_context * bld_base)
        struct lp_build_context * uint =
                                &si_shader_ctx->radeon_bld.soa.bld_base.uint_bld;
        struct tgsi_parse_context *parse = &si_shader_ctx->parse;
+       LLVMValueRef args[9];
        LLVMValueRef last_args[9] = { 0 };
+       LLVMValueRef pos_args[4][9] = { { 0 } };
+       unsigned semantic_name;
        unsigned color_count = 0;
        unsigned param_count = 0;
+       int depth_index = -1, stencil_index = -1;
+       int i;
 
        while (!tgsi_parse_end_of_tokens(parse)) {
-               /* XXX: component_bits controls which components of the output
-                * registers actually get exported. (e.g bit 0 means export
-                * X component, bit 1 means export Y component, etc.)  I'm
-                * hard coding this to 0xf for now.  In the future, we might
-                * want to do something else. */
-               unsigned component_bits = 0xf;
-               unsigned chan;
                struct tgsi_full_declaration *d =
                                        &parse->FullToken.FullDeclaration;
-               LLVMValueRef args[9];
                unsigned target;
                unsigned index;
-               int i;
 
                tgsi_parse_token(parse);
+
+               if (parse->FullToken.Token.Type == TGSI_TOKEN_TYPE_PROPERTY &&
+                   parse->FullToken.FullProperty.Property.PropertyName ==
+                   TGSI_PROPERTY_FS_COLOR0_WRITES_ALL_CBUFS)
+                       shader->fs_write_all = TRUE;
+
                if (parse->FullToken.Token.Type != TGSI_TOKEN_TYPE_DECLARATION)
                        continue;
 
                switch (d->Declaration.File) {
                case TGSI_FILE_INPUT:
                        i = shader->ninput++;
+                       assert(i < Elements(shader->input));
                        shader->input[i].name = d->Semantic.Name;
                        shader->input[i].sid = d->Semantic.Index;
                        shader->input[i].interpolate = d->Interp.Interpolate;
@@ -418,6 +697,7 @@ static void si_llvm_emit_epilogue(struct lp_build_tgsi_context * bld_base)
 
                case TGSI_FILE_OUTPUT:
                        i = shader->noutput++;
+                       assert(i < Elements(shader->output));
                        shader->output[i].name = d->Semantic.Name;
                        shader->output[i].sid = d->Semantic.Index;
                        shader->output[i].interpolate = d->Interp.Interpolate;
@@ -427,36 +707,57 @@ static void si_llvm_emit_epilogue(struct lp_build_tgsi_context * bld_base)
                        continue;
                }
 
+               semantic_name = d->Semantic.Name;
+handle_semantic:
                for (index = d->Range.First; index <= d->Range.Last; index++) {
-                       for (chan = 0; chan < 4; chan++ ) {
-                               LLVMValueRef out_ptr =
-                                       si_shader_ctx->radeon_bld.soa.outputs
-                                       [index][chan];
-                               /* +5 because the first output value will be
-                                * the 6th argument to the intrinsic. */
-                               args[chan + 5]= LLVMBuildLoad(
-                                       base->gallivm->builder, out_ptr, "");
-                       }
-
-                       /* XXX: We probably need to keep track of the output
-                        * values, so we know what we are passing to the next
-                        * stage. */
-
                        /* Select the correct target */
-                       switch(d->Semantic.Name) {
-                       case TGSI_SEMANTIC_POSITION:
-                               target = V_008DFC_SQ_EXP_POS;
+                       switch(semantic_name) {
+                       case TGSI_SEMANTIC_PSIZE:
+                               shader->vs_out_misc_write = 1;
+                               shader->vs_out_point_size = 1;
+                               target = V_008DFC_SQ_EXP_POS + 1;
                                break;
+                       case TGSI_SEMANTIC_POSITION:
+                               if (si_shader_ctx->type == TGSI_PROCESSOR_VERTEX) {
+                                       target = V_008DFC_SQ_EXP_POS;
+                                       break;
+                               } else {
+                                       depth_index = index;
+                                       continue;
+                               }
+                       case TGSI_SEMANTIC_STENCIL:
+                               stencil_index = index;
+                               continue;
                        case TGSI_SEMANTIC_COLOR:
                                if (si_shader_ctx->type == TGSI_PROCESSOR_VERTEX) {
+                       case TGSI_SEMANTIC_BCOLOR:
                                        target = V_008DFC_SQ_EXP_PARAM + param_count;
                                        shader->output[i].param_offset = param_count;
                                        param_count++;
                                } else {
                                        target = V_008DFC_SQ_EXP_MRT + color_count;
+                                       if (si_shader_ctx->shader->key.ps.alpha_to_one) {
+                                               si_alpha_to_one(bld_base, index);
+                                       }
+                                       if (color_count == 0 &&
+                                           si_shader_ctx->shader->key.ps.alpha_func != PIPE_FUNC_ALWAYS)
+                                               si_alpha_test(bld_base, index);
+
                                        color_count++;
                                }
                                break;
+                       case TGSI_SEMANTIC_CLIPDIST:
+                               if (!(si_shader_ctx->shader->key.vs.ucps_enabled &
+                                     (1 << d->Semantic.Index)))
+                                       continue;
+                               shader->clip_dist_write |=
+                                       d->Declaration.UsageMask << (d->Semantic.Index << 2);
+                               target = V_008DFC_SQ_EXP_POS + 2 + d->Semantic.Index;
+                               break;
+                       case TGSI_SEMANTIC_CLIPVERTEX:
+                               si_llvm_emit_clipvertex(bld_base, pos_args, index);
+                               continue;
+                       case TGSI_SEMANTIC_FOG:
                        case TGSI_SEMANTIC_GENERIC:
                                target = V_008DFC_SQ_EXP_PARAM + param_count;
                                shader->output[i].param_offset = param_count;
@@ -466,28 +767,18 @@ static void si_llvm_emit_epilogue(struct lp_build_tgsi_context * bld_base)
                                target = 0;
                                fprintf(stderr,
                                        "Warning: SI unhandled output type:%d\n",
-                                       d->Semantic.Name);
+                                       semantic_name);
                        }
 
-                       /* Specify which components to enable */
-                       args[0] = lp_build_const_int32(base->gallivm,
-                                                               component_bits);
-
-                       /* Specify whether the EXEC mask represents the valid mask */
-                       args[1] = lp_build_const_int32(base->gallivm, 0);
+                       si_llvm_init_export_args(bld_base, d, index, target, args);
 
-                       /* Specify whether this is the last export */
-                       args[2] = lp_build_const_int32(base->gallivm, 0);
-
-                       /* Specify the target we are exporting */
-                       args[3] = lp_build_const_int32(base->gallivm, target);
-
-                       /* Set COMPR flag to zero to export data as 32-bit */
-                       args[4] = uint->zero;
-
-                       if (si_shader_ctx->type == TGSI_PROCESSOR_VERTEX ?
-                           (d->Semantic.Name == TGSI_SEMANTIC_POSITION) :
-                           (d->Semantic.Name == TGSI_SEMANTIC_COLOR)) {
+                       if (si_shader_ctx->type == TGSI_PROCESSOR_VERTEX &&
+                           target >= V_008DFC_SQ_EXP_POS &&
+                           target <= (V_008DFC_SQ_EXP_POS + 3)) {
+                               memcpy(pos_args[target - V_008DFC_SQ_EXP_POS],
+                                      args, sizeof(args));
+                       } else if (si_shader_ctx->type == TGSI_PROCESSOR_FRAGMENT &&
+                                  semantic_name == TGSI_SEMANTIC_COLOR) {
                                if (last_args[0]) {
                                        lp_build_intrinsic(base->gallivm->builder,
                                                           "llvm.SI.export",
@@ -504,211 +795,859 @@ static void si_llvm_emit_epilogue(struct lp_build_tgsi_context * bld_base)
                        }
 
                }
-       }
 
-       if (!last_args[0]) {
-               assert(si_shader_ctx->type == TGSI_PROCESSOR_FRAGMENT);
+               if (semantic_name == TGSI_SEMANTIC_CLIPDIST) {
+                       semantic_name = TGSI_SEMANTIC_GENERIC;
+                       goto handle_semantic;
+               }
+       }
 
-               /* Specify which components to enable */
-               last_args[0] = lp_build_const_int32(base->gallivm, 0x0);
+       if (depth_index >= 0 || stencil_index >= 0) {
+               LLVMValueRef out_ptr;
+               unsigned mask = 0;
 
                /* Specify the target we are exporting */
-               last_args[3] = lp_build_const_int32(base->gallivm, V_008DFC_SQ_EXP_MRT);
+               args[3] = lp_build_const_int32(base->gallivm, V_008DFC_SQ_EXP_MRTZ);
+
+               if (depth_index >= 0) {
+                       out_ptr = si_shader_ctx->radeon_bld.soa.outputs[depth_index][2];
+                       args[5] = LLVMBuildLoad(base->gallivm->builder, out_ptr, "");
+                       mask |= 0x1;
+
+                       if (stencil_index < 0) {
+                               args[6] =
+                               args[7] =
+                               args[8] = args[5];
+                       }
+               }
 
-               /* Set COMPR flag to zero to export data as 32-bit */
-               last_args[4] = uint->zero;
+               if (stencil_index >= 0) {
+                       out_ptr = si_shader_ctx->radeon_bld.soa.outputs[stencil_index][1];
+                       args[7] =
+                       args[8] =
+                       args[6] = LLVMBuildLoad(base->gallivm->builder, out_ptr, "");
+                       mask |= 0x2;
 
-               /* dummy bits */
-               last_args[5]= uint->zero;
-               last_args[6]= uint->zero;
-               last_args[7]= uint->zero;
-               last_args[8]= uint->zero;
+                       if (depth_index < 0)
+                               args[5] = args[6];
+               }
+
+               /* Specify which components to enable */
+               args[0] = lp_build_const_int32(base->gallivm, mask);
+
+               args[1] =
+               args[2] =
+               args[4] = uint->zero;
+
+               if (last_args[0])
+                       lp_build_intrinsic(base->gallivm->builder,
+                                          "llvm.SI.export",
+                                          LLVMVoidTypeInContext(base->gallivm->context),
+                                          args, 9);
+               else
+                       memcpy(last_args, args, sizeof(args));
        }
 
-       /* Specify whether the EXEC mask represents the valid mask */
-       last_args[1] = lp_build_const_int32(base->gallivm,
-                                           si_shader_ctx->type == TGSI_PROCESSOR_FRAGMENT);
+       if (si_shader_ctx->type == TGSI_PROCESSOR_VERTEX) {
+               unsigned pos_idx = 0;
+
+               for (i = 0; i < 4; i++)
+                       if (pos_args[i][0])
+                               shader->nr_pos_exports++;
 
-       /* Specify that this is the last export */
-       last_args[2] = lp_build_const_int32(base->gallivm, 1);
+               for (i = 0; i < 4; i++) {
+                       if (!pos_args[i][0])
+                               continue;
+
+                       /* Specify the target we are exporting */
+                       pos_args[i][3] = lp_build_const_int32(base->gallivm, V_008DFC_SQ_EXP_POS + pos_idx++);
+
+                       if (pos_idx == shader->nr_pos_exports)
+                               /* Specify that this is the last export */
+                               pos_args[i][2] = uint->one;
+
+                       lp_build_intrinsic(base->gallivm->builder,
+                                          "llvm.SI.export",
+                                          LLVMVoidTypeInContext(base->gallivm->context),
+                                          pos_args[i], 9);
+               }
+       } else {
+               if (!last_args[0]) {
+                       /* Specify which components to enable */
+                       last_args[0] = lp_build_const_int32(base->gallivm, 0x0);
+
+                       /* Specify the target we are exporting */
+                       last_args[3] = lp_build_const_int32(base->gallivm, V_008DFC_SQ_EXP_MRT);
+
+                       /* Set COMPR flag to zero to export data as 32-bit */
+                       last_args[4] = uint->zero;
 
-       lp_build_intrinsic(base->gallivm->builder,
-                          "llvm.SI.export",
-                          LLVMVoidTypeInContext(base->gallivm->context),
-                          last_args, 9);
+                       /* dummy bits */
+                       last_args[5]= uint->zero;
+                       last_args[6]= uint->zero;
+                       last_args[7]= uint->zero;
+                       last_args[8]= uint->zero;
 
+                       si_shader_ctx->shader->spi_shader_col_format |=
+                               V_028714_SPI_SHADER_32_ABGR;
+                       si_shader_ctx->shader->cb_shader_mask |= S_02823C_OUTPUT0_ENABLE(0xf);
+               }
+
+               /* Specify whether the EXEC mask represents the valid mask */
+               last_args[1] = uint->one;
+
+               if (shader->fs_write_all && shader->nr_cbufs > 1) {
+                       int i;
+
+                       /* Specify that this is not yet the last export */
+                       last_args[2] = lp_build_const_int32(base->gallivm, 0);
+
+                       for (i = 1; i < shader->nr_cbufs; i++) {
+                               /* Specify the target we are exporting */
+                               last_args[3] = lp_build_const_int32(base->gallivm,
+                                                                   V_008DFC_SQ_EXP_MRT + i);
+
+                               lp_build_intrinsic(base->gallivm->builder,
+                                                  "llvm.SI.export",
+                                                  LLVMVoidTypeInContext(base->gallivm->context),
+                                                  last_args, 9);
+
+                               si_shader_ctx->shader->spi_shader_col_format |=
+                                       si_shader_ctx->shader->spi_shader_col_format << 4;
+                               si_shader_ctx->shader->cb_shader_mask |=
+                                       si_shader_ctx->shader->cb_shader_mask << 4;
+                       }
+
+                       last_args[3] = lp_build_const_int32(base->gallivm, V_008DFC_SQ_EXP_MRT);
+               }
+
+               /* Specify that this is the last export */
+               last_args[2] = lp_build_const_int32(base->gallivm, 1);
+
+               lp_build_intrinsic(base->gallivm->builder,
+                                  "llvm.SI.export",
+                                  LLVMVoidTypeInContext(base->gallivm->context),
+                                  last_args, 9);
+       }
 /* XXX: Look up what this function does */
 /*             ctx->shader->output[i].spi_sid = r600_spi_sid(&ctx->shader->output[i]);*/
 }
 
+static const struct lp_build_tgsi_action txf_action;
+
+static void build_tex_intrinsic(const struct lp_build_tgsi_action * action,
+                               struct lp_build_tgsi_context * bld_base,
+                               struct lp_build_emit_data * emit_data);
+
 static void tex_fetch_args(
        struct lp_build_tgsi_context * bld_base,
        struct lp_build_emit_data * emit_data)
 {
+       struct si_shader_context *si_shader_ctx = si_shader_context(bld_base);
+       struct gallivm_state *gallivm = bld_base->base.gallivm;
        const struct tgsi_full_instruction * inst = emit_data->inst;
-       LLVMValueRef ptr;
-       LLVMValueRef offset;
+       unsigned opcode = inst->Instruction.Opcode;
+       unsigned target = inst->Texture.Texture;
+       unsigned sampler_src, sampler_index;
+       LLVMValueRef coords[4];
+       LLVMValueRef address[16];
+       LLVMValueRef sample_index_rewrite = NULL;
+       LLVMValueRef sample_chan = NULL;
+       int ref_pos;
+       unsigned num_coords = tgsi_util_get_texture_coord_dim(target, &ref_pos);
+       unsigned count = 0;
+       unsigned chan;
 
-       /* WriteMask */
-       /* XXX: should be optimized using emit_data->inst->Dst[0].Register.WriteMask*/
-       emit_data->args[0] = lp_build_const_int32(bld_base->base.gallivm, 0xf);
+       /* Fetch and project texture coordinates */
+       coords[3] = lp_build_emit_fetch(bld_base, emit_data->inst, 0, TGSI_CHAN_W);
+       for (chan = 0; chan < 3; chan++ ) {
+               coords[chan] = lp_build_emit_fetch(bld_base,
+                                                  emit_data->inst, 0,
+                                                  chan);
+               if (opcode == TGSI_OPCODE_TXP)
+                       coords[chan] = lp_build_emit_llvm_binary(bld_base,
+                                                                TGSI_OPCODE_DIV,
+                                                                coords[chan],
+                                                                coords[3]);
+       }
 
-       /* Coordinates */
-       /* XXX: Not all sample instructions need 4 address arguments. */
-       if (inst->Instruction.Opcode == TGSI_OPCODE_TXP) {
-               LLVMValueRef src_w;
-               unsigned chan;
-               LLVMValueRef coords[4];
+       if (opcode == TGSI_OPCODE_TXP)
+               coords[3] = bld_base->base.one;
 
-               emit_data->dst_type = LLVMVectorType(bld_base->base.elem_type, 4);
-               src_w = lp_build_emit_fetch(bld_base, emit_data->inst, 0, TGSI_CHAN_W);
+       /* Pack LOD bias value */
+       if (opcode == TGSI_OPCODE_TXB)
+               address[count++] = coords[3];
+
+       if (target == TGSI_TEXTURE_CUBE || target == TGSI_TEXTURE_SHADOWCUBE)
+               radeon_llvm_emit_prepare_cube_coords(bld_base, emit_data, coords);
+
+       /* Pack depth comparison value */
+       switch (target) {
+       case TGSI_TEXTURE_SHADOW1D:
+       case TGSI_TEXTURE_SHADOW1D_ARRAY:
+       case TGSI_TEXTURE_SHADOW2D:
+       case TGSI_TEXTURE_SHADOWRECT:
+       case TGSI_TEXTURE_SHADOWCUBE:
+       case TGSI_TEXTURE_SHADOW2D_ARRAY:
+               assert(ref_pos >= 0);
+               address[count++] = coords[ref_pos];
+               break;
+       case TGSI_TEXTURE_SHADOWCUBE_ARRAY:
+               address[count++] = lp_build_emit_fetch(bld_base, inst, 1, 0);
+       }
 
-               for (chan = 0; chan < 3; chan++ ) {
-                       LLVMValueRef arg = lp_build_emit_fetch(bld_base,
-                                                              emit_data->inst, 0, chan);
-                       coords[chan] = lp_build_emit_llvm_binary(bld_base,
-                                                                TGSI_OPCODE_DIV,
-                                                                arg, src_w);
+       /* Pack user derivatives */
+       if (opcode == TGSI_OPCODE_TXD) {
+               for (chan = 0; chan < 2; chan++) {
+                       address[count++] = lp_build_emit_fetch(bld_base, inst, 1, chan);
+                       if (num_coords > 1)
+                               address[count++] = lp_build_emit_fetch(bld_base, inst, 2, chan);
                }
-               coords[3] = bld_base->base.one;
-               emit_data->args[1] = lp_build_gather_values(bld_base->base.gallivm,
-                                                           coords, 4);
-       } else
-               emit_data->args[1] = lp_build_emit_fetch(bld_base, emit_data->inst,
-                                                        0, LP_CHAN_ALL);
+       }
+
+       /* Pack texture coordinates */
+       address[count++] = coords[0];
+       if (num_coords > 1)
+               address[count++] = coords[1];
+       if (num_coords > 2)
+               address[count++] = coords[2];
+
+       /* Pack LOD */
+       if (opcode == TGSI_OPCODE_TXL || opcode == TGSI_OPCODE_TXF)
+               address[count++] = coords[3];
+
+       if (count > 16) {
+               assert(!"Cannot handle more than 16 texture address parameters");
+               count = 16;
+       }
+
+       for (chan = 0; chan < count; chan++ ) {
+               address[chan] = LLVMBuildBitCast(gallivm->builder,
+                                                address[chan],
+                                                LLVMInt32TypeInContext(gallivm->context),
+                                                "");
+       }
+
+       sampler_src = emit_data->inst->Instruction.NumSrcRegs - 1;
+       sampler_index = emit_data->inst->Src[sampler_src].Register.Index;
+
+       /* Adjust the sample index according to FMASK.
+        *
+        * For uncompressed MSAA surfaces, FMASK should return 0x76543210,
+        * which is the identity mapping. Each nibble says which physical sample
+        * should be fetched to get that sample.
+        *
+        * For example, 0x11111100 means there are only 2 samples stored and
+        * the second sample covers 3/4 of the pixel. When reading samples 0
+        * and 1, return physical sample 0 (determined by the first two 0s
+        * in FMASK), otherwise return physical sample 1.
+        *
+        * The sample index should be adjusted as follows:
+        *   sample_index = (fmask >> (sample_index * 4)) & 0xF;
+        */
+       if (target == TGSI_TEXTURE_2D_MSAA ||
+           target == TGSI_TEXTURE_2D_ARRAY_MSAA) {
+               struct lp_build_context *uint_bld = &bld_base->uint_bld;
+               struct lp_build_emit_data txf_emit_data = *emit_data;
+               LLVMValueRef txf_address[16];
+               unsigned txf_count = count;
+
+               memcpy(txf_address, address, sizeof(address));
+
+               /* Pad to a power-of-two size. */
+               while (txf_count < util_next_power_of_two(txf_count))
+                       txf_address[txf_count++] = LLVMGetUndef(LLVMInt32TypeInContext(gallivm->context));
+
+               /* Read FMASK using TXF. */
+               txf_emit_data.chan = 0;
+               txf_emit_data.dst_type = LLVMVectorType(
+                       LLVMInt32TypeInContext(bld_base->base.gallivm->context), 4);
+               txf_emit_data.args[0] = lp_build_gather_values(gallivm, txf_address, txf_count);
+               txf_emit_data.args[1] = si_shader_ctx->resources[FMASK_TEX_OFFSET + sampler_index];
+               txf_emit_data.args[2] = lp_build_const_int32(bld_base->base.gallivm, target);
+               txf_emit_data.arg_count = 3;
+
+               build_tex_intrinsic(&txf_action, bld_base, &txf_emit_data);
+
+               /* Initialize some constants. */
+               if (target == TGSI_TEXTURE_2D_MSAA) {
+                       sample_chan = LLVMConstInt(uint_bld->elem_type, 2, 0);
+               } else {
+                       sample_chan = LLVMConstInt(uint_bld->elem_type, 3, 0);
+               }
+
+               LLVMValueRef four = LLVMConstInt(uint_bld->elem_type, 4, 0);
+               LLVMValueRef F = LLVMConstInt(uint_bld->elem_type, 0xF, 0);
+
+               /* Apply the formula. */
+               LLVMValueRef fmask =
+                       LLVMBuildExtractElement(gallivm->builder,
+                                               txf_emit_data.output[0],
+                                               uint_bld->zero, "");
+
+               LLVMValueRef sample_index =
+                       LLVMBuildExtractElement(gallivm->builder,
+                                               txf_emit_data.args[0],
+                                               sample_chan, "");
+
+               LLVMValueRef sample_index4 =
+                       LLVMBuildMul(gallivm->builder, sample_index, four, "");
+
+               LLVMValueRef shifted_fmask =
+                       LLVMBuildLShr(gallivm->builder, fmask, sample_index4, "");
+
+               LLVMValueRef final_sample =
+                       LLVMBuildAnd(gallivm->builder, shifted_fmask, F, "");
+
+               /* Don't rewrite the sample index if WORD1.DATA_FORMAT of the FMASK
+                * resource descriptor is 0 (invalid),
+                */
+               LLVMValueRef fmask_desc =
+                       LLVMBuildBitCast(gallivm->builder,
+                                        si_shader_ctx->resources[FMASK_TEX_OFFSET + sampler_index],
+                                        LLVMVectorType(uint_bld->elem_type, 8), "");
+
+               LLVMValueRef fmask_word1 =
+                       LLVMBuildExtractElement(gallivm->builder, fmask_desc,
+                                               uint_bld->one, "");
+
+               LLVMValueRef word1_is_nonzero =
+                       LLVMBuildICmp(gallivm->builder, LLVMIntNE,
+                                     fmask_word1, uint_bld->zero, "");
+
+               sample_index_rewrite =
+                       LLVMBuildSelect(gallivm->builder, word1_is_nonzero,
+                                       final_sample, sample_index, "");
+       }
 
        /* Resource */
-       ptr = use_sgpr(bld_base->base.gallivm, SGPR_CONST_PTR_V8I32, 4);
-       offset = lp_build_const_int32(bld_base->base.gallivm,
-                                 emit_data->inst->Src[1].Register.Index);
-       emit_data->args[2] = build_indexed_load(bld_base->base.gallivm,
-                                               ptr, offset);
-
-       /* Sampler */
-       ptr = use_sgpr(bld_base->base.gallivm, SGPR_CONST_PTR_V4I32, 2);
-       offset = lp_build_const_int32(bld_base->base.gallivm,
-                                 emit_data->inst->Src[1].Register.Index);
-       emit_data->args[3] = build_indexed_load(bld_base->base.gallivm,
-                                               ptr, offset);
+       emit_data->args[1] = si_shader_ctx->resources[sampler_index];
+
+       if (opcode == TGSI_OPCODE_TXF) {
+               /* add tex offsets */
+               if (inst->Texture.NumOffsets) {
+                       struct lp_build_context *uint_bld = &bld_base->uint_bld;
+                       struct lp_build_tgsi_soa_context *bld = lp_soa_context(bld_base);
+                       const struct tgsi_texture_offset * off = inst->TexOffsets;
+
+                       assert(inst->Texture.NumOffsets == 1);
+
+                       address[0] =
+                               lp_build_add(uint_bld, address[0],
+                                            bld->immediates[off->Index][off->SwizzleX]);
+                       if (num_coords > 1)
+                               address[1] =
+                                       lp_build_add(uint_bld, address[1],
+                                                    bld->immediates[off->Index][off->SwizzleY]);
+                       if (num_coords > 2)
+                               address[2] =
+                                       lp_build_add(uint_bld, address[2],
+                                                    bld->immediates[off->Index][off->SwizzleZ]);
+               }
 
-       /* Dimensions */
-       /* XXX: We might want to pass this information to the shader at some. */
-/*     emit_data->args[4] = lp_build_const_int32(bld_base->base.gallivm,
-                                       emit_data->inst->Texture.Texture);
-*/
-
-       emit_data->arg_count = 4;
-       /* XXX: To optimize, we could use a float or v2f32, if the last bits of
-        * the writemask are clear */
-       emit_data->dst_type = LLVMVectorType(
+               emit_data->dst_type = LLVMVectorType(
+                       LLVMInt32TypeInContext(bld_base->base.gallivm->context),
+                       4);
+
+               emit_data->arg_count = 3;
+       } else {
+               /* Sampler */
+               emit_data->args[2] = si_shader_ctx->samplers[sampler_index];
+
+               emit_data->dst_type = LLVMVectorType(
                        LLVMFloatTypeInContext(bld_base->base.gallivm->context),
                        4);
+
+               emit_data->arg_count = 4;
+       }
+
+       /* Dimensions */
+       emit_data->args[emit_data->arg_count - 1] =
+               lp_build_const_int32(bld_base->base.gallivm, target);
+
+       /* Pad to power of two vector */
+       while (count < util_next_power_of_two(count))
+               address[count++] = LLVMGetUndef(LLVMInt32TypeInContext(gallivm->context));
+
+       emit_data->args[0] = lp_build_gather_values(gallivm, address, count);
+
+       /* Replace the MSAA sample index if needed. */
+       if (sample_index_rewrite) {
+               emit_data->args[0] =
+                       LLVMBuildInsertElement(gallivm->builder, emit_data->args[0],
+                                              sample_index_rewrite, sample_chan, "");
+       }
+}
+
+static void build_tex_intrinsic(const struct lp_build_tgsi_action * action,
+                               struct lp_build_tgsi_context * bld_base,
+                               struct lp_build_emit_data * emit_data)
+{
+       struct lp_build_context * base = &bld_base->base;
+       char intr_name[23];
+
+       sprintf(intr_name, "%sv%ui32", action->intr_name,
+               LLVMGetVectorSize(LLVMTypeOf(emit_data->args[0])));
+
+       emit_data->output[emit_data->chan] = build_intrinsic(
+               base->gallivm->builder, intr_name, emit_data->dst_type,
+               emit_data->args, emit_data->arg_count,
+               LLVMReadNoneAttribute | LLVMNoUnwindAttribute);
+}
+
+static void txq_fetch_args(
+       struct lp_build_tgsi_context * bld_base,
+       struct lp_build_emit_data * emit_data)
+{
+       struct si_shader_context *si_shader_ctx = si_shader_context(bld_base);
+       const struct tgsi_full_instruction *inst = emit_data->inst;
+
+       /* Mip level */
+       emit_data->args[0] = lp_build_emit_fetch(bld_base, inst, 0, TGSI_CHAN_X);
+
+       /* Resource */
+       emit_data->args[1] = si_shader_ctx->resources[inst->Src[1].Register.Index];
+
+       /* Dimensions */
+       emit_data->args[2] = lp_build_const_int32(bld_base->base.gallivm,
+                                                 inst->Texture.Texture);
+
+       emit_data->arg_count = 3;
+
+       emit_data->dst_type = LLVMVectorType(
+               LLVMInt32TypeInContext(bld_base->base.gallivm->context),
+               4);
+}
+
+#if HAVE_LLVM >= 0x0304
+
+static void si_llvm_emit_ddxy(
+       const struct lp_build_tgsi_action * action,
+       struct lp_build_tgsi_context * bld_base,
+       struct lp_build_emit_data * emit_data)
+{
+       struct si_shader_context *si_shader_ctx = si_shader_context(bld_base);
+       struct gallivm_state *gallivm = bld_base->base.gallivm;
+       struct lp_build_context * base = &bld_base->base;
+       const struct tgsi_full_instruction *inst = emit_data->inst;
+       unsigned opcode = inst->Instruction.Opcode;
+       LLVMValueRef indices[2];
+       LLVMValueRef store_ptr, load_ptr0, load_ptr1;
+       LLVMValueRef tl, trbl, result[4];
+       LLVMTypeRef i32;
+       unsigned swizzle[4];
+       unsigned c;
+
+       i32 = LLVMInt32TypeInContext(gallivm->context);
+
+       indices[0] = bld_base->uint_bld.zero;
+       indices[1] = build_intrinsic(gallivm->builder, "llvm.SI.tid", i32,
+                                    NULL, 0, LLVMReadNoneAttribute);
+       store_ptr = LLVMBuildGEP(gallivm->builder, si_shader_ctx->ddxy_lds,
+                                indices, 2, "");
+
+       indices[1] = LLVMBuildAnd(gallivm->builder, indices[1],
+                                 lp_build_const_int32(gallivm, 0xfffffffc), "");
+       load_ptr0 = LLVMBuildGEP(gallivm->builder, si_shader_ctx->ddxy_lds,
+                                indices, 2, "");
+
+       indices[1] = LLVMBuildAdd(gallivm->builder, indices[1],
+                                 lp_build_const_int32(gallivm,
+                                                      opcode == TGSI_OPCODE_DDX ? 1 : 2),
+                                 "");
+       load_ptr1 = LLVMBuildGEP(gallivm->builder, si_shader_ctx->ddxy_lds,
+                                indices, 2, "");
+
+       for (c = 0; c < 4; ++c) {
+               unsigned i;
+
+               swizzle[c] = tgsi_util_get_full_src_register_swizzle(&inst->Src[0], c);
+               for (i = 0; i < c; ++i) {
+                       if (swizzle[i] == swizzle[c]) {
+                               result[c] = result[i];
+                               break;
+                       }
+               }
+               if (i != c)
+                       continue;
+
+               LLVMBuildStore(gallivm->builder,
+                              LLVMBuildBitCast(gallivm->builder,
+                                               lp_build_emit_fetch(bld_base, inst, 0, c),
+                                               i32, ""),
+                              store_ptr);
+
+               tl = LLVMBuildLoad(gallivm->builder, load_ptr0, "");
+               tl = LLVMBuildBitCast(gallivm->builder, tl, base->elem_type, "");
+
+               trbl = LLVMBuildLoad(gallivm->builder, load_ptr1, "");
+               trbl = LLVMBuildBitCast(gallivm->builder, trbl, base->elem_type, "");
+
+               result[c] = LLVMBuildFSub(gallivm->builder, trbl, tl, "");
+       }
+
+       emit_data->output[0] = lp_build_gather_values(gallivm, result, 4);
 }
 
+#endif /* HAVE_LLVM >= 0x0304 */
+
 static const struct lp_build_tgsi_action tex_action = {
        .fetch_args = tex_fetch_args,
-       .emit = lp_build_tgsi_intrinsic,
-       .intr_name = "llvm.SI.sample"
+       .emit = build_tex_intrinsic,
+       .intr_name = "llvm.SI.sample."
+};
+
+static const struct lp_build_tgsi_action txb_action = {
+       .fetch_args = tex_fetch_args,
+       .emit = build_tex_intrinsic,
+       .intr_name = "llvm.SI.sampleb."
+};
+
+#if HAVE_LLVM >= 0x0304
+static const struct lp_build_tgsi_action txd_action = {
+       .fetch_args = tex_fetch_args,
+       .emit = build_tex_intrinsic,
+       .intr_name = "llvm.SI.sampled."
 };
+#endif
+
+static const struct lp_build_tgsi_action txf_action = {
+       .fetch_args = tex_fetch_args,
+       .emit = build_tex_intrinsic,
+       .intr_name = "llvm.SI.imageload."
+};
+
+static const struct lp_build_tgsi_action txl_action = {
+       .fetch_args = tex_fetch_args,
+       .emit = build_tex_intrinsic,
+       .intr_name = "llvm.SI.samplel."
+};
+
+static const struct lp_build_tgsi_action txq_action = {
+       .fetch_args = txq_fetch_args,
+       .emit = build_tgsi_intrinsic_nomem,
+       .intr_name = "llvm.SI.resinfo"
+};
+
+static void create_meta_data(struct si_shader_context *si_shader_ctx)
+{
+       struct gallivm_state *gallivm = si_shader_ctx->radeon_bld.soa.bld_base.base.gallivm;
+       LLVMValueRef args[3];
+
+       args[0] = LLVMMDStringInContext(gallivm->context, "const", 5);
+       args[1] = 0;
+       args[2] = lp_build_const_int32(gallivm, 1);
+
+       si_shader_ctx->const_md = LLVMMDNodeInContext(gallivm->context, args, 3);
+}
+
+static void create_function(struct si_shader_context *si_shader_ctx)
+{
+       struct lp_build_tgsi_context *bld_base = &si_shader_ctx->radeon_bld.soa.bld_base;
+       struct gallivm_state *gallivm = bld_base->base.gallivm;
+       LLVMTypeRef params[20], f32, i8, i32, v2i32, v3i32;
+       unsigned i;
+
+       i8 = LLVMInt8TypeInContext(gallivm->context);
+       i32 = LLVMInt32TypeInContext(gallivm->context);
+       f32 = LLVMFloatTypeInContext(gallivm->context);
+       v2i32 = LLVMVectorType(i32, 2);
+       v3i32 = LLVMVectorType(i32, 3);
 
+       params[SI_PARAM_CONST] = LLVMPointerType(LLVMVectorType(i8, 16), CONST_ADDR_SPACE);
+       params[SI_PARAM_SAMPLER] = params[SI_PARAM_CONST];
+       params[SI_PARAM_RESOURCE] = LLVMPointerType(LLVMVectorType(i8, 32), CONST_ADDR_SPACE);
+
+       if (si_shader_ctx->type == TGSI_PROCESSOR_VERTEX) {
+               params[SI_PARAM_VERTEX_BUFFER] = params[SI_PARAM_SAMPLER];
+               params[SI_PARAM_START_INSTANCE] = i32;
+               params[SI_PARAM_VERTEX_ID] = i32;
+               params[SI_PARAM_DUMMY_0] = i32;
+               params[SI_PARAM_DUMMY_1] = i32;
+               params[SI_PARAM_INSTANCE_ID] = i32;
+               radeon_llvm_create_func(&si_shader_ctx->radeon_bld, params, 9);
+
+       } else {
+               params[SI_PARAM_PRIM_MASK] = i32;
+               params[SI_PARAM_PERSP_SAMPLE] = v2i32;
+               params[SI_PARAM_PERSP_CENTER] = v2i32;
+               params[SI_PARAM_PERSP_CENTROID] = v2i32;
+               params[SI_PARAM_PERSP_PULL_MODEL] = v3i32;
+               params[SI_PARAM_LINEAR_SAMPLE] = v2i32;
+               params[SI_PARAM_LINEAR_CENTER] = v2i32;
+               params[SI_PARAM_LINEAR_CENTROID] = v2i32;
+               params[SI_PARAM_LINE_STIPPLE_TEX] = f32;
+               params[SI_PARAM_POS_X_FLOAT] = f32;
+               params[SI_PARAM_POS_Y_FLOAT] = f32;
+               params[SI_PARAM_POS_Z_FLOAT] = f32;
+               params[SI_PARAM_POS_W_FLOAT] = f32;
+               params[SI_PARAM_FRONT_FACE] = f32;
+               params[SI_PARAM_ANCILLARY] = f32;
+               params[SI_PARAM_SAMPLE_COVERAGE] = f32;
+               params[SI_PARAM_POS_FIXED_PT] = f32;
+               radeon_llvm_create_func(&si_shader_ctx->radeon_bld, params, 20);
+       }
+
+       radeon_llvm_shader_type(si_shader_ctx->radeon_bld.main_fn, si_shader_ctx->type);
+       for (i = SI_PARAM_CONST; i <= SI_PARAM_VERTEX_BUFFER; ++i) {
+               LLVMValueRef P = LLVMGetParam(si_shader_ctx->radeon_bld.main_fn, i);
+               LLVMAddAttribute(P, LLVMInRegAttribute);
+       }
+
+       if (si_shader_ctx->type == TGSI_PROCESSOR_VERTEX) {
+               LLVMValueRef P = LLVMGetParam(si_shader_ctx->radeon_bld.main_fn,
+                                             SI_PARAM_START_INSTANCE);
+               LLVMAddAttribute(P, LLVMInRegAttribute);
+       }
+
+#if HAVE_LLVM >= 0x0304
+       if (bld_base->info->opcode_count[TGSI_OPCODE_DDX] > 0 ||
+           bld_base->info->opcode_count[TGSI_OPCODE_DDY] > 0)
+               si_shader_ctx->ddxy_lds =
+                       LLVMAddGlobalInAddressSpace(gallivm->module,
+                                                   LLVMArrayType(i32, 64),
+                                                   "ddxy_lds",
+                                                   LOCAL_ADDR_SPACE);
+#endif
+}
+
+static void preload_constants(struct si_shader_context *si_shader_ctx)
+{
+       struct lp_build_tgsi_context * bld_base = &si_shader_ctx->radeon_bld.soa.bld_base;
+       struct gallivm_state * gallivm = bld_base->base.gallivm;
+       const struct tgsi_shader_info * info = bld_base->info;
+
+       unsigned i, num_const = info->file_max[TGSI_FILE_CONSTANT] + 1;
+
+       LLVMValueRef ptr;
+
+       if (num_const == 0)
+               return;
+
+       /* Allocate space for the constant values */
+       si_shader_ctx->constants = CALLOC(num_const * 4, sizeof(LLVMValueRef));
+
+       /* Load the resource descriptor */
+       ptr = LLVMGetParam(si_shader_ctx->radeon_bld.main_fn, SI_PARAM_CONST);
+       si_shader_ctx->const_resource = build_indexed_load(si_shader_ctx, ptr, bld_base->uint_bld.zero);
+
+       /* Load the constants, we rely on the code sinking to do the rest */
+       for (i = 0; i < num_const * 4; ++i) {
+               LLVMValueRef args[2] = {
+                       si_shader_ctx->const_resource,
+                       lp_build_const_int32(gallivm, i * 4)
+               };
+               si_shader_ctx->constants[i] = build_intrinsic(gallivm->builder, "llvm.SI.load.const",
+                       bld_base->base.elem_type, args, 2, LLVMReadNoneAttribute | LLVMNoUnwindAttribute);
+       }
+}
+
+static void preload_samplers(struct si_shader_context *si_shader_ctx)
+{
+       struct lp_build_tgsi_context * bld_base = &si_shader_ctx->radeon_bld.soa.bld_base;
+       struct gallivm_state * gallivm = bld_base->base.gallivm;
+       const struct tgsi_shader_info * info = bld_base->info;
+
+       unsigned i, num_samplers = info->file_max[TGSI_FILE_SAMPLER] + 1;
+
+       LLVMValueRef res_ptr, samp_ptr;
+       LLVMValueRef offset;
+
+       if (num_samplers == 0)
+               return;
+
+       /* Allocate space for the values */
+       si_shader_ctx->resources = CALLOC(NUM_SAMPLER_VIEWS, sizeof(LLVMValueRef));
+       si_shader_ctx->samplers = CALLOC(num_samplers, sizeof(LLVMValueRef));
+
+       res_ptr = LLVMGetParam(si_shader_ctx->radeon_bld.main_fn, SI_PARAM_RESOURCE);
+       samp_ptr = LLVMGetParam(si_shader_ctx->radeon_bld.main_fn, SI_PARAM_SAMPLER);
+
+       /* Load the resources and samplers, we rely on the code sinking to do the rest */
+       for (i = 0; i < num_samplers; ++i) {
+               /* Resource */
+               offset = lp_build_const_int32(gallivm, i);
+               si_shader_ctx->resources[i] = build_indexed_load(si_shader_ctx, res_ptr, offset);
+
+               /* Sampler */
+               offset = lp_build_const_int32(gallivm, i);
+               si_shader_ctx->samplers[i] = build_indexed_load(si_shader_ctx, samp_ptr, offset);
+
+               /* FMASK resource */
+               if (info->is_msaa_sampler[i]) {
+                       offset = lp_build_const_int32(gallivm, FMASK_TEX_OFFSET + i);
+                       si_shader_ctx->resources[FMASK_TEX_OFFSET + i] =
+                               build_indexed_load(si_shader_ctx, res_ptr, offset);
+               }
+       }
+}
+
+int si_compile_llvm(struct r600_context *rctx, struct si_pipe_shader *shader,
+                                                       LLVMModuleRef mod)
+{
+       unsigned i;
+       uint32_t *ptr;
+       bool dump;
+       struct radeon_llvm_binary binary;
+
+       dump = debug_get_bool_option("RADEON_DUMP_SHADERS", FALSE);
+
+       memset(&binary, 0, sizeof(binary));
+       radeon_llvm_compile(mod, &binary,
+               r600_get_llvm_processor_name(rctx->screen->family), dump);
+       if (dump) {
+               fprintf(stderr, "SI CODE:\n");
+               for (i = 0; i < binary.code_size; i+=4 ) {
+                       fprintf(stderr, "%02x%02x%02x%02x\n", binary.code[i + 3],
+                               binary.code[i + 2], binary.code[i + 1],
+                               binary.code[i]);
+               }
+       }
+
+       /* XXX: We may be able to emit some of these values directly rather than
+        * extracting fields to be emitted later.
+        */
+       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) {
+               case R_00B028_SPI_SHADER_PGM_RSRC1_PS:
+               case R_00B128_SPI_SHADER_PGM_RSRC1_VS:
+               case R_00B228_SPI_SHADER_PGM_RSRC1_GS:
+               case R_00B848_COMPUTE_PGM_RSRC1:
+                       shader->num_sgprs = (G_00B028_SGPRS(value) + 1) * 8;
+                       shader->num_vgprs = (G_00B028_VGPRS(value) + 1) * 4;
+                       break;
+               case R_00B02C_SPI_SHADER_PGM_RSRC2_PS:
+                       shader->lds_size = G_00B02C_EXTRA_LDS_SIZE(value);
+                       break;
+               case R_00B84C_COMPUTE_PGM_RSRC2:
+                       shader->lds_size = G_00B84C_LDS_SIZE(value);
+                       break;
+               case R_0286CC_SPI_PS_INPUT_ENA:
+                       shader->spi_ps_input_ena = value;
+                       break;
+               default:
+                       fprintf(stderr, "Warning: Compiler emitted unknown "
+                               "config register: 0x%x\n", reg);
+                       break;
+               }
+       }
+
+       /* copy new shader */
+       si_resource_reference(&shader->bo, NULL);
+       shader->bo = si_resource_create_custom(rctx->context.screen, PIPE_USAGE_IMMUTABLE,
+                                              binary.code_size);
+       if (shader->bo == NULL) {
+               return -ENOMEM;
+       }
+
+       ptr = (uint32_t*)rctx->ws->buffer_map(shader->bo->cs_buf, rctx->cs, PIPE_TRANSFER_WRITE);
+       if (0 /*R600_BIG_ENDIAN*/) {
+               for (i = 0; i < binary.code_size / 4; ++i) {
+                       ptr[i] = util_bswap32(*(uint32_t*)(binary.code + i*4));
+               }
+       } else {
+               memcpy(ptr, binary.code, binary.code_size);
+       }
+       rctx->ws->buffer_unmap(shader->bo->cs_buf);
+
+       free(binary.code);
+       free(binary.config);
+
+       return 0;
+}
 
 int si_pipe_shader_create(
        struct pipe_context *ctx,
        struct si_pipe_shader *shader)
 {
        struct r600_context *rctx = (struct r600_context*)ctx;
+       struct si_pipe_shader_selector *sel = shader->selector;
        struct si_shader_context si_shader_ctx;
        struct tgsi_shader_info shader_info;
        struct lp_build_tgsi_context * bld_base;
        LLVMModuleRef mod;
-       unsigned char * inst_bytes;
-       unsigned inst_byte_count;
-       unsigned i;
-       uint32_t *ptr;
        bool dump;
+       int r = 0;
 
        dump = debug_get_bool_option("RADEON_DUMP_SHADERS", FALSE);
 
-       memset(&si_shader_ctx.radeon_bld, 0, sizeof(si_shader_ctx.radeon_bld));
+       assert(shader->shader.noutput == 0);
+       assert(shader->shader.ninterp == 0);
+       assert(shader->shader.ninput == 0);
+
+       memset(&si_shader_ctx, 0, sizeof(si_shader_ctx));
        radeon_llvm_context_init(&si_shader_ctx.radeon_bld);
        bld_base = &si_shader_ctx.radeon_bld.soa.bld_base;
 
-       tgsi_scan_shader(shader->tokens, &shader_info);
+       tgsi_scan_shader(sel->tokens, &shader_info);
+
+       shader->shader.uses_kill = shader_info.uses_kill;
+       shader->shader.uses_instanceid = shader_info.uses_instanceid;
        bld_base->info = &shader_info;
        bld_base->emit_fetch_funcs[TGSI_FILE_CONSTANT] = fetch_constant;
        bld_base->emit_epilogue = si_llvm_emit_epilogue;
 
        bld_base->op_actions[TGSI_OPCODE_TEX] = tex_action;
+       bld_base->op_actions[TGSI_OPCODE_TXB] = txb_action;
+#if HAVE_LLVM >= 0x0304
+       bld_base->op_actions[TGSI_OPCODE_TXD] = txd_action;
+#endif
+       bld_base->op_actions[TGSI_OPCODE_TXF] = txf_action;
+       bld_base->op_actions[TGSI_OPCODE_TXL] = txl_action;
        bld_base->op_actions[TGSI_OPCODE_TXP] = tex_action;
+       bld_base->op_actions[TGSI_OPCODE_TXQ] = txq_action;
+
+#if HAVE_LLVM >= 0x0304
+       bld_base->op_actions[TGSI_OPCODE_DDX].emit = si_llvm_emit_ddxy;
+       bld_base->op_actions[TGSI_OPCODE_DDY].emit = si_llvm_emit_ddxy;
+#endif
 
        si_shader_ctx.radeon_bld.load_input = declare_input;
-       si_shader_ctx.tokens = shader->tokens;
+       si_shader_ctx.radeon_bld.load_system_value = declare_system_value;
+       si_shader_ctx.tokens = sel->tokens;
        tgsi_parse_init(&si_shader_ctx.parse, si_shader_ctx.tokens);
        si_shader_ctx.shader = shader;
        si_shader_ctx.type = si_shader_ctx.parse.FullHeader.Processor.Processor;
-       si_shader_ctx.rctx = rctx;
+
+       create_meta_data(&si_shader_ctx);
+       create_function(&si_shader_ctx);
+       preload_constants(&si_shader_ctx);
+       preload_samplers(&si_shader_ctx);
 
        shader->shader.nr_cbufs = rctx->framebuffer.nr_cbufs;
 
        /* Dump TGSI code before doing TGSI->LLVM conversion in case the
         * conversion fails. */
        if (dump) {
-               tgsi_dump(shader->tokens, 0);
+               tgsi_dump(sel->tokens, 0);
        }
 
-       if (!lp_build_tgsi_llvm(bld_base, shader->tokens)) {
+       if (!lp_build_tgsi_llvm(bld_base, sel->tokens)) {
                fprintf(stderr, "Failed to translate shader from TGSI to LLVM\n");
+               FREE(si_shader_ctx.constants);
+               FREE(si_shader_ctx.resources);
+               FREE(si_shader_ctx.samplers);
                return -EINVAL;
        }
 
        radeon_llvm_finalize_module(&si_shader_ctx.radeon_bld);
 
        mod = bld_base->base.gallivm->module;
-       if (dump) {
-               LLVMDumpModule(mod);
-       }
-       radeon_llvm_compile(mod, &inst_bytes, &inst_byte_count, "SI", dump);
-       if (dump) {
-               fprintf(stderr, "SI CODE:\n");
-               for (i = 0; i < inst_byte_count; i+=4 ) {
-                       fprintf(stderr, "%02x%02x%02x%02x\n", inst_bytes[i + 3],
-                               inst_bytes[i + 2], inst_bytes[i + 1],
-                               inst_bytes[i]);
-               }
-       }
-
-       shader->num_sgprs = util_le32_to_cpu(*(uint32_t*)inst_bytes);
-       shader->num_vgprs = util_le32_to_cpu(*(uint32_t*)(inst_bytes + 4));
-       shader->spi_ps_input_ena = util_le32_to_cpu(*(uint32_t*)(inst_bytes + 8));
+       r = si_compile_llvm(rctx, shader, mod);
 
+       radeon_llvm_dispose(&si_shader_ctx.radeon_bld);
        tgsi_parse_free(&si_shader_ctx.parse);
 
-       /* copy new shader */
-       si_resource_reference(&shader->bo, NULL);
-       shader->bo = si_resource_create_custom(ctx->screen, PIPE_USAGE_IMMUTABLE,
-                                              inst_byte_count - 12);
-       if (shader->bo == NULL) {
-               return -ENOMEM;
-       }
-
-       ptr = (uint32_t*)rctx->ws->buffer_map(shader->bo->cs_buf, rctx->cs, PIPE_TRANSFER_WRITE);
-       if (0 /*R600_BIG_ENDIAN*/) {
-               for (i = 0; i < (inst_byte_count-12)/4; ++i) {
-                       ptr[i] = util_bswap32(*(uint32_t*)(inst_bytes+12 + i*4));
-               }
-       } else {
-               memcpy(ptr, inst_bytes + 12, inst_byte_count - 12);
-       }
-       rctx->ws->buffer_unmap(shader->bo->cs_buf);
+       FREE(si_shader_ctx.constants);
+       FREE(si_shader_ctx.resources);
+       FREE(si_shader_ctx.samplers);
 
-       free(inst_bytes);
-
-       return 0;
+       return r;
 }
 
 void si_pipe_shader_destroy(struct pipe_context *ctx, struct si_pipe_shader *shader)
 {
        si_resource_reference(&shader->bo, NULL);
-
-       memset(&shader->shader,0,sizeof(struct si_shader));
 }