llvmpipe: fix PIPE_CAP_MAX_VERTEX_TEXTURE_UNITS query
[mesa.git] / src / gallium / drivers / r600 / r600_shader.c
index dc8d4cb3151117e9367648c16774ad3db32b3cea..f0b7df5a6f3ca8fd613e98fa27cbc6c2c8b56679 100644 (file)
@@ -105,8 +105,8 @@ int r600_pipe_shader_create(struct pipe_context *ctx,
        struct r600_screen *rscreen = r600_screen(ctx->screen);
        int r;
 
-fprintf(stderr, "--------------------------------------------------------------\n");
-tgsi_dump(tokens, 0);
+//fprintf(stderr, "--------------------------------------------------------------\n");
+//tgsi_dump(tokens, 0);
        if (rpshader == NULL)
                return -ENOMEM;
        rpshader->shader.family = radeon_get_family(rscreen->rw);
@@ -120,7 +120,7 @@ tgsi_dump(tokens, 0);
                R600_ERR("building bytecode failed !\n");
                return r;
        }
-fprintf(stderr, "______________________________________________________________\n");
+//fprintf(stderr, "______________________________________________________________\n");
        return 0;
 }
 
@@ -132,7 +132,7 @@ static int r600_pipe_shader_vs(struct pipe_context *ctx, struct r600_context_sta
        unsigned i, tmp;
 
        rpshader->rstate = radeon_state_decref(rpshader->rstate);
-       state = radeon_state(rscreen->rw, R600_VS_SHADER_TYPE, R600_VS_SHADER);
+       state = radeon_state(rscreen->rw, R600_VS_SHADER);
        if (state == NULL)
                return -ENOMEM;
        for (i = 0; i < 10; i++) {
@@ -150,18 +150,24 @@ static int r600_pipe_shader_vs(struct pipe_context *ctx, struct r600_context_sta
        rpshader->rstate->bo[1] = radeon_bo_incref(rscreen->rw, rpshader->bo);
        rpshader->rstate->nbo = 2;
        rpshader->rstate->placement[0] = RADEON_GEM_DOMAIN_GTT;
+       rpshader->rstate->placement[2] = RADEON_GEM_DOMAIN_GTT;
+       state->reloc_pm4_id[0] = R600_VS_SHADER__SQ_PGM_START_VS_BO_ID;
+       state->reloc_pm4_id[1] = R600_VS_SHADER__SQ_PGM_START_FS_BO_ID;
        return radeon_state_pm4(state);
 }
 
 static int r600_pipe_shader_ps(struct pipe_context *ctx, struct r600_context_state *rpshader)
 {
+       const struct pipe_rasterizer_state *rasterizer;
        struct r600_screen *rscreen = r600_screen(ctx->screen);
        struct r600_shader *rshader = &rpshader->shader;
+       struct r600_context *rctx = r600_context(ctx);
        struct radeon_state *state;
        unsigned i, tmp, exports_ps, num_cout;
 
+       rasterizer = &rctx->rasterizer->state.rasterizer;
        rpshader->rstate = radeon_state_decref(rpshader->rstate);
-       state = radeon_state(rscreen->rw, R600_PS_SHADER_TYPE, R600_PS_SHADER);
+       state = radeon_state(rscreen->rw, R600_PS_SHADER);
        if (state == NULL)
                return -ENOMEM;
        for (i = 0; i < rshader->ninput; i++) {
@@ -171,6 +177,9 @@ static int r600_pipe_shader_ps(struct pipe_context *ctx, struct r600_context_sta
                        rshader->input[i].name == TGSI_SEMANTIC_BCOLOR) {
                        tmp |= S_028644_FLAT_SHADE(rshader->flat_shade);
                }
+               if (rasterizer->sprite_coord_enable & (1 << i)) {
+                       tmp |= S_028644_PT_SPRITE_TEX(1);
+               }
                state->states[R600_PS_SHADER__SPI_PS_INPUT_CNTL_0 + i] = tmp;
        }
 
@@ -184,6 +193,10 @@ static int r600_pipe_shader_ps(struct pipe_context *ctx, struct r600_context_sta
                        num_cout++;
                }
        }
+       if (!exports_ps) {
+               /* always at least export 1 component per pixel */
+               exports_ps = 2;
+       }
        state->states[R600_PS_SHADER__SPI_PS_IN_CONTROL_0] = S_0286CC_NUM_INTERP(rshader->ninput) |
                                                        S_0286CC_PERSP_GRADIENT_ENA(1);
        state->states[R600_PS_SHADER__SPI_PS_IN_CONTROL_1] = 0x00000000;
@@ -193,6 +206,7 @@ static int r600_pipe_shader_ps(struct pipe_context *ctx, struct r600_context_sta
        rpshader->rstate->bo[0] = radeon_bo_incref(rscreen->rw, rpshader->bo);
        rpshader->rstate->nbo = 1;
        rpshader->rstate->placement[0] = RADEON_GEM_DOMAIN_GTT;
+       state->reloc_pm4_id[0] = R600_PS_SHADER__SQ_PGM_START_PS_BO_ID;
        return radeon_state_pm4(state);
 }
 
@@ -339,7 +353,8 @@ int r600_shader_from_tgsi(const struct tgsi_token *tokens, struct r600_shader *s
 {
        struct tgsi_full_immediate *immediate;
        struct r600_shader_ctx ctx;
-       struct r600_bc_output output;
+       struct r600_bc_output output[32];
+       unsigned output_done, noutput;
        unsigned opcode;
        int i, r = 0, pos0;
 
@@ -355,9 +370,15 @@ int r600_shader_from_tgsi(const struct tgsi_token *tokens, struct r600_shader *s
        shader->processor_type = ctx.type;
 
        /* register allocations */
-       /* Values [0,127] correspond to GPR[0..127]. 
-        * Values [256,511] correspond to cfile constants c[0..255]. 
+       /* Values [0,127] correspond to GPR[0..127].
+        * Values [128,159] correspond to constant buffer bank 0
+        * Values [160,191] correspond to constant buffer bank 1
+        * Values [256,511] correspond to cfile constants c[0..255].
         * Other special values are shown in the list below.
+        * 244  ALU_SRC_1_DBL_L: special constant 1.0 double-float, LSW. (RV670+)
+        * 245  ALU_SRC_1_DBL_M: special constant 1.0 double-float, MSW. (RV670+)
+        * 246  ALU_SRC_0_5_DBL_L: special constant 0.5 double-float, LSW. (RV670+)
+        * 247  ALU_SRC_0_5_DBL_M: special constant 0.5 double-float, MSW. (RV670+)
         * 248  SQ_ALU_SRC_0: special constant 0.0.
         * 249  SQ_ALU_SRC_1: special constant 1.0 float.
         * 250  SQ_ALU_SRC_1_INT: special constant 1 integer.
@@ -417,34 +438,41 @@ int r600_shader_from_tgsi(const struct tgsi_token *tokens, struct r600_shader *s
                }
        }
        /* export output */
-       for (i = 0, pos0 = 0; i < shader->noutput; i++) {
-               memset(&output, 0, sizeof(struct r600_bc_output));
-               output.gpr = shader->output[i].gpr;
-               output.elem_size = 3;
-               output.swizzle_x = 0;
-               output.swizzle_y = 1;
-               output.swizzle_z = 2;
-               output.swizzle_w = 3;
-               output.barrier = 1;
-               output.type = V_SQ_CF_ALLOC_EXPORT_WORD0_SQ_EXPORT_PARAM;
-               output.array_base = i - pos0;
-               output.inst = V_SQ_CF_ALLOC_EXPORT_WORD1_SQ_CF_INST_EXPORT_DONE;
-               switch (ctx.type == TGSI_PROCESSOR_VERTEX) {
+       noutput = shader->noutput;
+       for (i = 0, pos0 = 0; i < noutput; i++) {
+               memset(&output[i], 0, sizeof(struct r600_bc_output));
+               output[i].gpr = shader->output[i].gpr;
+               output[i].elem_size = 3;
+               output[i].swizzle_x = 0;
+               output[i].swizzle_y = 1;
+               output[i].swizzle_z = 2;
+               output[i].swizzle_w = 3;
+               output[i].barrier = 1;
+               output[i].type = V_SQ_CF_ALLOC_EXPORT_WORD0_SQ_EXPORT_PARAM;
+               output[i].array_base = i - pos0;
+               output[i].inst = V_SQ_CF_ALLOC_EXPORT_WORD1_SQ_CF_INST_EXPORT;
+               switch (ctx.type) {
                case TGSI_PROCESSOR_VERTEX:
                        if (shader->output[i].name == TGSI_SEMANTIC_POSITION) {
-                               output.array_base = 60;
-                               output.type = V_SQ_CF_ALLOC_EXPORT_WORD0_SQ_EXPORT_POS;
+                               output[i].array_base = 60;
+                               output[i].type = V_SQ_CF_ALLOC_EXPORT_WORD0_SQ_EXPORT_POS;
                                /* position doesn't count in array_base */
-                               pos0 = 1;
+                               pos0++;
+                       }
+                       if (shader->output[i].name == TGSI_SEMANTIC_PSIZE) {
+                               output[i].array_base = 61;
+                               output[i].type = V_SQ_CF_ALLOC_EXPORT_WORD0_SQ_EXPORT_POS;
+                               /* position doesn't count in array_base */
+                               pos0++;
                        }
                        break;
                case TGSI_PROCESSOR_FRAGMENT:
                        if (shader->output[i].name == TGSI_SEMANTIC_COLOR) {
-                               output.array_base = 0;
-                               output.type = V_SQ_CF_ALLOC_EXPORT_WORD0_SQ_EXPORT_PIXEL;
+                               output[i].array_base = shader->output[i].sid;
+                               output[i].type = V_SQ_CF_ALLOC_EXPORT_WORD0_SQ_EXPORT_PIXEL;
                        } else if (shader->output[i].name == TGSI_SEMANTIC_POSITION) {
-                               output.array_base = 61;
-                               output.type = V_SQ_CF_ALLOC_EXPORT_WORD0_SQ_EXPORT_PIXEL;
+                               output[i].array_base = 61;
+                               output[i].type = V_SQ_CF_ALLOC_EXPORT_WORD0_SQ_EXPORT_PIXEL;
                        } else {
                                R600_ERR("unsupported fragment output name %d\n", shader->output[i].name);
                                r = -EINVAL;
@@ -456,10 +484,58 @@ int r600_shader_from_tgsi(const struct tgsi_token *tokens, struct r600_shader *s
                        r = -EINVAL;
                        goto out_err;
                }
-               if (i == (shader->noutput - 1)) {
-                       output.end_of_program = 1;
+       }
+       /* add fake param output for vertex shader if no param is exported */
+       if (ctx.type == TGSI_PROCESSOR_VERTEX) {
+               for (i = 0, pos0 = 0; i < noutput; i++) {
+                       if (output[i].type == V_SQ_CF_ALLOC_EXPORT_WORD0_SQ_EXPORT_PARAM) {
+                               pos0 = 1;
+                               break;
+                       }
                }
-               r = r600_bc_add_output(ctx.bc, &output);
+               if (!pos0) {
+                       memset(&output[i], 0, sizeof(struct r600_bc_output));
+                       output[i].gpr = 0;
+                       output[i].elem_size = 3;
+                       output[i].swizzle_x = 0;
+                       output[i].swizzle_y = 1;
+                       output[i].swizzle_z = 2;
+                       output[i].swizzle_w = 3;
+                       output[i].barrier = 1;
+                       output[i].type = V_SQ_CF_ALLOC_EXPORT_WORD0_SQ_EXPORT_PARAM;
+                       output[i].array_base = 0;
+                       output[i].inst = V_SQ_CF_ALLOC_EXPORT_WORD1_SQ_CF_INST_EXPORT;
+                       noutput++;
+               }
+       }
+       /* add fake pixel export */
+       if (ctx.type == TGSI_PROCESSOR_FRAGMENT && !noutput) {
+               memset(&output[0], 0, sizeof(struct r600_bc_output));
+               output[0].gpr = 0;
+               output[0].elem_size = 3;
+               output[0].swizzle_x = 7;
+               output[0].swizzle_y = 7;
+               output[0].swizzle_z = 7;
+               output[0].swizzle_w = 7;
+               output[0].barrier = 1;
+               output[0].type = V_SQ_CF_ALLOC_EXPORT_WORD0_SQ_EXPORT_PIXEL;
+               output[0].array_base = 0;
+               output[0].inst = V_SQ_CF_ALLOC_EXPORT_WORD1_SQ_CF_INST_EXPORT;
+               noutput++;
+       }
+       /* set export done on last export of each type */
+       for (i = noutput - 1, output_done = 0; i >= 0; i--) {
+               if (i == (noutput - 1)) {
+                       output[i].end_of_program = 1;
+               }
+               if (!(output_done & (1 << output[i].type))) {
+                       output_done |= (1 << output[i].type);
+                       output[i].inst = V_SQ_CF_ALLOC_EXPORT_WORD1_SQ_CF_INST_EXPORT_DONE;
+               }
+       }
+       /* add output to bytecode */
+       for (i = 0; i < noutput; i++) {
+               r = r600_bc_add_output(ctx.bc, &output[i]);
                if (r)
                        goto out_err;
        }
@@ -490,6 +566,7 @@ static int tgsi_src(struct r600_shader_ctx *ctx,
        if (tgsi_src->Register.File == TGSI_FILE_IMMEDIATE) {
                r600_src->sel = 0;
        }
+       r600_src->neg = tgsi_src->Register.Negate;
        r600_src->sel += ctx->file_offset[tgsi_src->Register.File];
        return 0;
 }
@@ -611,6 +688,126 @@ static int tgsi_op2(struct r600_shader_ctx *ctx)
        return 0;
 }
 
+/* 
+ * r600 - trunc to -PI..PI range
+ * r700 - normalize by dividing by 2PI
+ * see fdo bug 27901
+ */
+static int tgsi_trig(struct r600_shader_ctx *ctx)
+{
+       struct tgsi_full_instruction *inst = &ctx->parse.FullToken.FullInstruction;
+       struct r600_bc_alu_src r600_src[3];
+       struct r600_bc_alu alu;
+       int i, r;
+       uint32_t lit_vals[4];
+
+       memset(lit_vals, 0, 4*4);
+       r = tgsi_split_constant(ctx, r600_src);
+       if (r)
+               return r;
+       lit_vals[0] = fui(1.0 /(3.1415926535 * 2));
+       lit_vals[1] = fui(0.5f);
+
+       memset(&alu, 0, sizeof(struct r600_bc_alu));
+       alu.inst = V_SQ_ALU_WORD1_OP3_SQ_OP3_INST_MULADD;
+       alu.is_op3 = 1;
+
+       alu.dst.chan = 0;
+       alu.dst.sel = ctx->temp_reg;
+       alu.dst.write = 1;
+
+       alu.src[0] = r600_src[0];
+       alu.src[0].chan = tgsi_chan(&inst->Src[0], 0);
+               
+       alu.src[1].sel = V_SQ_ALU_SRC_LITERAL;
+       alu.src[1].chan = 0;
+       alu.src[2].sel = V_SQ_ALU_SRC_LITERAL;
+       alu.src[2].chan = 1;
+       alu.last = 1;
+       r = r600_bc_add_alu(ctx->bc, &alu);
+       if (r)
+               return r;
+       r = r600_bc_add_literal(ctx->bc, lit_vals);
+       if (r)
+               return r;
+
+       memset(&alu, 0, sizeof(struct r600_bc_alu));
+       alu.inst = V_SQ_ALU_WORD1_OP2_SQ_OP2_INST_FRACT;
+               
+       alu.dst.chan = 0;
+       alu.dst.sel = ctx->temp_reg;
+       alu.dst.write = 1;
+
+       alu.src[0].sel = ctx->temp_reg;
+       alu.src[0].chan = 0;
+       alu.last = 1;
+       r = r600_bc_add_alu(ctx->bc, &alu);
+       if (r)
+               return r;
+
+       if (ctx->bc->chiprev == 0) {
+               lit_vals[0] = fui(3.1415926535897f * 2.0f);
+               lit_vals[1] = fui(-3.1415926535897f);
+       } else {
+               lit_vals[0] = fui(1.0f);
+               lit_vals[1] = fui(-0.5f);
+       }
+
+       memset(&alu, 0, sizeof(struct r600_bc_alu));
+       alu.inst = V_SQ_ALU_WORD1_OP3_SQ_OP3_INST_MULADD;
+       alu.is_op3 = 1;
+
+       alu.dst.chan = 0;
+       alu.dst.sel = ctx->temp_reg;
+       alu.dst.write = 1;
+
+       alu.src[0].sel = ctx->temp_reg;
+       alu.src[0].chan = 0;
+               
+       alu.src[1].sel = V_SQ_ALU_SRC_LITERAL;
+       alu.src[1].chan = 0;
+       alu.src[2].sel = V_SQ_ALU_SRC_LITERAL;
+       alu.src[2].chan = 1;
+       alu.last = 1;
+       r = r600_bc_add_alu(ctx->bc, &alu);
+       if (r)
+               return r;
+       r = r600_bc_add_literal(ctx->bc, lit_vals);
+       if (r)
+               return r;
+
+       memset(&alu, 0, sizeof(struct r600_bc_alu));
+       alu.inst = ctx->inst_info->r600_opcode;
+       alu.dst.chan = 0;
+       alu.dst.sel = ctx->temp_reg;
+       alu.dst.write = 1;
+
+       alu.src[0].sel = ctx->temp_reg;
+       alu.src[0].chan = 0;
+       alu.last = 1;
+       r = r600_bc_add_alu(ctx->bc, &alu);
+       if (r)
+               return r;
+
+       /* replicate result */
+       for (i = 0; i < 4; i++) {
+               memset(&alu, 0, sizeof(struct r600_bc_alu));
+               alu.src[0].sel = ctx->temp_reg;
+               alu.inst = V_SQ_ALU_WORD1_OP2_SQ_OP2_INST_MOV;
+               alu.dst.chan = i;
+               r = tgsi_dst(ctx, &inst->Dst[0], i, &alu.dst);
+               if (r)
+                       return r;
+               alu.dst.write = (inst->Dst[0].Register.WriteMask >> i) & 1;
+               if (i == 3)
+                       alu.last = 1;
+               r = r600_bc_add_alu(ctx->bc, &alu);
+               if (r)
+                       return r;
+       }
+       return 0;
+}
+
 static int tgsi_kill(struct r600_shader_ctx *ctx)
 {
        struct tgsi_full_instruction *inst = &ctx->parse.FullToken.FullInstruction;
@@ -621,7 +818,7 @@ static int tgsi_kill(struct r600_shader_ctx *ctx)
                memset(&alu, 0, sizeof(struct r600_bc_alu));
                alu.inst = ctx->inst_info->r600_opcode;
                alu.dst.chan = i;
-               alu.src[0].sel = 248;
+               alu.src[0].sel = V_SQ_ALU_SRC_0;
                r = tgsi_src(ctx, &inst->Src[0], &alu.src[1]);
                if (r)
                        return r;
@@ -680,7 +877,7 @@ static int tgsi_lit(struct r600_shader_ctx *ctx)
        /* dst.x, <- 1.0  */
        memset(&alu, 0, sizeof(struct r600_bc_alu));
        alu.inst = V_SQ_ALU_WORD1_OP2_SQ_OP2_INST_MOV;
-       alu.src[0].sel  = 249; /*1.0*/
+       alu.src[0].sel  = V_SQ_ALU_SRC_1; /*1.0*/
        alu.src[0].chan = 0;
        r = tgsi_dst(ctx, &inst->Dst[0], 0, &alu.dst);
        if (r)
@@ -696,7 +893,7 @@ static int tgsi_lit(struct r600_shader_ctx *ctx)
        r = tgsi_src(ctx, &inst->Src[0], &alu.src[0]);
        if (r)
                return r;
-       alu.src[1].sel  = 248; /*0.0*/
+       alu.src[1].sel  = V_SQ_ALU_SRC_0; /*0.0*/
        alu.src[1].chan = tgsi_chan(&inst->Src[0], 0);
        r = tgsi_dst(ctx, &inst->Dst[0], 1, &alu.dst);
        if (r)
@@ -717,7 +914,7 @@ static int tgsi_lit(struct r600_shader_ctx *ctx)
        /* dst.w, <- 1.0  */
        memset(&alu, 0, sizeof(struct r600_bc_alu));
        alu.inst = V_SQ_ALU_WORD1_OP2_SQ_OP2_INST_MOV;
-       alu.src[0].sel  = 249;
+       alu.src[0].sel  = V_SQ_ALU_SRC_1;
        alu.src[0].chan = 0;
        r = tgsi_dst(ctx, &inst->Dst[0], 3, &alu.dst);
        if (r)
@@ -817,19 +1014,43 @@ static int tgsi_trans(struct r600_shader_ctx *ctx)
        return 0;
 }
 
+static int tgsi_helper_tempx_replicate(struct r600_shader_ctx *ctx)
+{
+       struct tgsi_full_instruction *inst = &ctx->parse.FullToken.FullInstruction;
+       struct r600_bc_alu alu;
+       int i, r;
+
+       for (i = 0; i < 4; i++) {
+               memset(&alu, 0, sizeof(struct r600_bc_alu));
+               alu.src[0].sel = ctx->temp_reg;
+               alu.inst = V_SQ_ALU_WORD1_OP2_SQ_OP2_INST_MOV;
+               alu.dst.chan = i;
+               r = tgsi_dst(ctx, &inst->Dst[0], i, &alu.dst);
+               if (r)
+                       return r;
+               alu.dst.write = (inst->Dst[0].Register.WriteMask >> i) & 1;
+               if (i == 3)
+                       alu.last = 1;
+               r = r600_bc_add_alu(ctx->bc, &alu);
+               if (r)
+                       return r;
+       }
+       return 0;
+}
+
 static int tgsi_trans_srcx_replicate(struct r600_shader_ctx *ctx)
 {
        struct tgsi_full_instruction *inst = &ctx->parse.FullToken.FullInstruction;
        struct r600_bc_alu alu;
-       int i, j, r;
+       int i, r;
 
        memset(&alu, 0, sizeof(struct r600_bc_alu));
        alu.inst = ctx->inst_info->r600_opcode;
-       for (j = 0; j < inst->Instruction.NumSrcRegs; j++) {
-               r = tgsi_src(ctx, &inst->Src[j], &alu.src[j]);
+       for (i = 0; i < inst->Instruction.NumSrcRegs; i++) {
+               r = tgsi_src(ctx, &inst->Src[i], &alu.src[i]);
                if (r)
                        return r;
-               alu.src[j].chan = tgsi_chan(&inst->Src[j], 0);
+               alu.src[i].chan = tgsi_chan(&inst->Src[i], 0);
        }
        alu.dst.sel = ctx->temp_reg;
        alu.dst.write = 1;
@@ -838,15 +1059,106 @@ static int tgsi_trans_srcx_replicate(struct r600_shader_ctx *ctx)
        if (r)
                return r;
        /* replicate result */
+       return tgsi_helper_tempx_replicate(ctx);
+}
+
+static int tgsi_pow(struct r600_shader_ctx *ctx)
+{
+       struct tgsi_full_instruction *inst = &ctx->parse.FullToken.FullInstruction;
+       struct r600_bc_alu alu;
+       int r;
+
+       /* LOG2(a) */
+       memset(&alu, 0, sizeof(struct r600_bc_alu));
+       alu.inst = V_SQ_ALU_WORD1_OP2_SQ_OP2_INST_LOG_IEEE;
+       r = tgsi_src(ctx, &inst->Src[0], &alu.src[0]);
+       if (r)
+               return r;
+       alu.src[0].chan = tgsi_chan(&inst->Src[0], 0);
+       alu.dst.sel = ctx->temp_reg;
+       alu.dst.write = 1;
+       alu.last = 1;
+       r = r600_bc_add_alu(ctx->bc, &alu);
+       if (r)
+               return r;
+       /* b * LOG2(a) */
+       memset(&alu, 0, sizeof(struct r600_bc_alu));
+       alu.inst = V_SQ_ALU_WORD1_OP2_SQ_OP2_INST_MUL_IEEE;
+       r = tgsi_src(ctx, &inst->Src[1], &alu.src[0]);
+       if (r)
+               return r;
+       alu.src[0].chan = tgsi_chan(&inst->Src[1], 0);
+       alu.src[1].sel = ctx->temp_reg;
+       alu.dst.sel = ctx->temp_reg;
+       alu.dst.write = 1;
+       alu.last = 1;
+       r = r600_bc_add_alu(ctx->bc, &alu);
+       if (r)
+               return r;
+       /* POW(a,b) = EXP2(b * LOG2(a))*/
+       memset(&alu, 0, sizeof(struct r600_bc_alu));
+       alu.inst = V_SQ_ALU_WORD1_OP2_SQ_OP2_INST_EXP_IEEE;
+       alu.src[0].sel = ctx->temp_reg;
+       alu.dst.sel = ctx->temp_reg;
+       alu.dst.write = 1;
+       alu.last = 1;
+       r = r600_bc_add_alu(ctx->bc, &alu);
+       if (r)
+               return r;
+       return tgsi_helper_tempx_replicate(ctx);
+}
+
+static int tgsi_ssg(struct r600_shader_ctx *ctx)
+{
+       struct tgsi_full_instruction *inst = &ctx->parse.FullToken.FullInstruction;
+       struct r600_bc_alu alu;
+       struct r600_bc_alu_src r600_src[3];
+       int i, r;
+
+       r = tgsi_split_constant(ctx, r600_src);
+       if (r)
+               return r;
+
+       /* tmp = (src > 0 ? 1 : src) */
        for (i = 0; i < 4; i++) {
                memset(&alu, 0, sizeof(struct r600_bc_alu));
-               alu.src[0].sel = ctx->temp_reg;
-               alu.inst = V_SQ_ALU_WORD1_OP2_SQ_OP2_INST_MOV;
-               alu.dst.chan = i;
+               alu.inst = V_SQ_ALU_WORD1_OP3_SQ_OP3_INST_CNDGT;
+               alu.is_op3 = 1;
+               alu.dst.sel = ctx->temp_reg;
+               alu.dst.write = 1;
+
+               alu.src[0] = r600_src[0];
+               alu.src[0].chan = tgsi_chan(&inst->Src[0], i);
+
+               alu.src[1].sel = V_SQ_ALU_SRC_1;
+
+               alu.src[2] = r600_src[0];
+               alu.src[2].chan = tgsi_chan(&inst->Src[0], i);
+               if (i == 3)
+                       alu.last = 1;
+               r = r600_bc_add_alu(ctx->bc, &alu);
+               if (r)
+                       return r;
+       }
+
+       /* dst = (-tmp > 0 ? -1 : tmp) */
+       for (i = 0; i < 4; i++) {
+               memset(&alu, 0, sizeof(struct r600_bc_alu));
+               alu.inst = V_SQ_ALU_WORD1_OP3_SQ_OP3_INST_CNDGT;
+               alu.is_op3 = 1;
                r = tgsi_dst(ctx, &inst->Dst[0], i, &alu.dst);
                if (r)
                        return r;
-               alu.dst.write = (inst->Dst[0].Register.WriteMask >> i) & 1;
+
+               alu.src[0].sel = ctx->temp_reg;
+               alu.src[0].neg = 1;
+
+               alu.src[1].sel = V_SQ_ALU_SRC_1;
+               alu.src[1].neg = 1;
+
+               alu.src[2].sel = ctx->temp_reg;
+
+               alu.dst.write = 1;
                if (i == 3)
                        alu.last = 1;
                r = r600_bc_add_alu(ctx->bc, &alu);
@@ -943,13 +1255,13 @@ static int tgsi_dp(struct r600_shader_ctx *ctx)
                switch (ctx->inst_info->tgsi_opcode) {
                case TGSI_OPCODE_DP2:
                        if (i > 1) {
-                               alu.src[0].sel = alu.src[1].sel = 248;
+                               alu.src[0].sel = alu.src[1].sel = V_SQ_ALU_SRC_0;
                                alu.src[0].chan = alu.src[1].chan = 0;
                        }
                        break;
                case TGSI_OPCODE_DP3:
                        if (i > 2) {
-                               alu.src[0].sel = alu.src[1].sel = 248;
+                               alu.src[0].sel = alu.src[1].sel = V_SQ_ALU_SRC_0;
                                alu.src[0].chan = alu.src[1].chan = 0;
                        }
                        break;
@@ -972,73 +1284,68 @@ static int tgsi_tex(struct r600_shader_ctx *ctx)
        struct r600_bc_tex tex;
        struct r600_bc_alu alu;
        unsigned src_gpr;
-       int r;
+       int r, i;
 
        src_gpr = ctx->file_offset[inst->Src[0].Register.File] + inst->Src[0].Register.Index;
 
-       /* Add perspective divide */
-       memset(&alu, 0, sizeof(struct r600_bc_alu));
-       alu.inst = V_SQ_ALU_WORD1_OP2_SQ_OP2_INST_RECIP_IEEE;
-       alu.src[0].sel = src_gpr;
-       alu.src[0].chan = tgsi_chan(&inst->Src[0], 3);
-       alu.dst.sel = ctx->temp_reg;
-       alu.dst.chan = 3;
-       alu.last = 1;
-       alu.dst.write = 1;
-       r = r600_bc_add_alu(ctx->bc, &alu);
-       if (r)
-               return r;
-
-       memset(&alu, 0, sizeof(struct r600_bc_alu));
-       alu.inst = V_SQ_ALU_WORD1_OP2_SQ_OP2_INST_MUL;
-       alu.src[0].sel = ctx->temp_reg;
-       alu.src[0].chan = 3;
-       alu.src[1].sel = src_gpr;
-       alu.src[1].chan = tgsi_chan(&inst->Src[0], 0);
-       alu.dst.sel = ctx->temp_reg;
-       alu.dst.chan = 0;
-       alu.dst.write = 1;
-       r = r600_bc_add_alu(ctx->bc, &alu);
-       if (r)
-               return r;
-       memset(&alu, 0, sizeof(struct r600_bc_alu));
-       alu.inst = V_SQ_ALU_WORD1_OP2_SQ_OP2_INST_MUL;
-       alu.src[0].sel = ctx->temp_reg;
-       alu.src[0].chan = 3;
-       alu.src[1].sel = src_gpr;
-       alu.src[1].chan = tgsi_chan(&inst->Src[0], 1);
-       alu.dst.sel = ctx->temp_reg;
-       alu.dst.chan = 1;
-       alu.dst.write = 1;
-       r = r600_bc_add_alu(ctx->bc, &alu);
-       if (r)
-               return r;
-       memset(&alu, 0, sizeof(struct r600_bc_alu));
-       alu.inst = V_SQ_ALU_WORD1_OP2_SQ_OP2_INST_MUL;
-       alu.src[0].sel = ctx->temp_reg;
-       alu.src[0].chan = 3;
-       alu.src[1].sel = src_gpr;
-       alu.src[1].chan = tgsi_chan(&inst->Src[0], 2);
-       alu.dst.sel = ctx->temp_reg;
-       alu.dst.chan = 2;
-       alu.dst.write = 1;
-       r = r600_bc_add_alu(ctx->bc, &alu);
-       if (r)
-               return r;
-       memset(&alu, 0, sizeof(struct r600_bc_alu));
-       alu.inst = V_SQ_ALU_WORD1_OP2_SQ_OP2_INST_MOV;
-       alu.src[0].sel = 249;
-       alu.src[0].chan = 0;
-       alu.dst.sel = ctx->temp_reg;
-       alu.dst.chan = 3;
-       alu.last = 1;
-       alu.dst.write = 1;
-       r = r600_bc_add_alu(ctx->bc, &alu);
-       if (r)
-               return r;
-       src_gpr = ctx->temp_reg;
+       if (inst->Instruction.Opcode == TGSI_OPCODE_TXP) {
+               /* Add perspective divide */
+               memset(&alu, 0, sizeof(struct r600_bc_alu));
+               alu.inst = V_SQ_ALU_WORD1_OP2_SQ_OP2_INST_RECIP_IEEE;
+               alu.src[0].sel = src_gpr;
+               alu.src[0].chan = tgsi_chan(&inst->Src[0], 3);
+               alu.dst.sel = ctx->temp_reg;
+               alu.dst.chan = 3;
+               alu.last = 1;
+               alu.dst.write = 1;
+               r = r600_bc_add_alu(ctx->bc, &alu);
+               if (r)
+                       return r;
+               
+               for (i = 0; i < 3; i++) {
+                       memset(&alu, 0, sizeof(struct r600_bc_alu));
+                       alu.inst = V_SQ_ALU_WORD1_OP2_SQ_OP2_INST_MUL;
+                       alu.src[0].sel = ctx->temp_reg;
+                       alu.src[0].chan = 3;
+                       alu.src[1].sel = src_gpr;
+                       alu.src[1].chan = tgsi_chan(&inst->Src[0], i);
+                       alu.dst.sel = ctx->temp_reg;
+                       alu.dst.chan = i;
+                       alu.dst.write = 1;
+                       r = r600_bc_add_alu(ctx->bc, &alu);
+                       if (r)
+                               return r;
+               }
+               memset(&alu, 0, sizeof(struct r600_bc_alu));
+               alu.inst = V_SQ_ALU_WORD1_OP2_SQ_OP2_INST_MOV;
+               alu.src[0].sel = V_SQ_ALU_SRC_1;
+               alu.src[0].chan = 0;
+               alu.dst.sel = ctx->temp_reg;
+               alu.dst.chan = 3;
+               alu.last = 1;
+               alu.dst.write = 1;
+               r = r600_bc_add_alu(ctx->bc, &alu);
+               if (r)
+                       return r;
+               src_gpr = ctx->temp_reg;
+       } else if (inst->Src[0].Register.File != TGSI_FILE_TEMPORARY) {
+               for (i = 0; i < 4; i++) {
+                       memset(&alu, 0, sizeof(struct r600_bc_alu));
+                       alu.inst = V_SQ_ALU_WORD1_OP2_SQ_OP2_INST_MOV;
+                       alu.src[0].sel = src_gpr;
+                       alu.src[0].chan = i;
+                       alu.dst.sel = ctx->temp_reg;
+                       alu.dst.chan = i;
+                       if (i == 3)
+                               alu.last = 1;
+                       alu.dst.write = 1;
+                       r = r600_bc_add_alu(ctx->bc, &alu);
+                       if (r)
+                               return r;
+               }
+               src_gpr = ctx->temp_reg;
+       }
 
-       /* TODO use temp if src_gpr is not a temporary reg (File != TEMPORARY) */
        memset(&tex, 0, sizeof(struct r600_bc_tex));
        tex.inst = ctx->inst_info->r600_opcode;
        tex.resource_id = ctx->file_offset[inst->Src[1].Register.File] + inst->Src[1].Register.Index;
@@ -1078,7 +1385,7 @@ static int tgsi_lrp(struct r600_shader_ctx *ctx)
        for (i = 0; i < 4; i++) {
                memset(&alu, 0, sizeof(struct r600_bc_alu));
                alu.inst = V_SQ_ALU_WORD1_OP2_SQ_OP2_INST_ADD;
-               alu.src[0].sel = 249;
+               alu.src[0].sel = V_SQ_ALU_SRC_1;
                alu.src[0].chan = 0;
                alu.src[1] = r600_src[0];
                alu.src[1].chan = tgsi_chan(&inst->Src[0], i);
@@ -1142,6 +1449,178 @@ static int tgsi_lrp(struct r600_shader_ctx *ctx)
        return tgsi_helper_copy(ctx, inst);
 }
 
+static int tgsi_cmp(struct r600_shader_ctx *ctx)
+{
+       struct tgsi_full_instruction *inst = &ctx->parse.FullToken.FullInstruction;
+       struct r600_bc_alu_src r600_src[3];
+       struct r600_bc_alu alu;
+       int use_temp = 0;
+       int i, r;
+
+       r = tgsi_split_constant(ctx, r600_src);
+       if (r)
+               return r;
+
+       if (inst->Dst[0].Register.WriteMask != 0xf)
+               use_temp = 1;
+
+       for (i = 0; i < 4; i++) {
+               memset(&alu, 0, sizeof(struct r600_bc_alu));
+               alu.inst = V_SQ_ALU_WORD1_OP3_SQ_OP3_INST_CNDGE;
+               alu.src[0] = r600_src[0];
+               alu.src[0].chan = tgsi_chan(&inst->Src[0], i);
+
+               alu.src[1] = r600_src[2];
+               alu.src[1].chan = tgsi_chan(&inst->Src[2], i);
+
+               alu.src[2] = r600_src[1];
+               alu.src[2].chan = tgsi_chan(&inst->Src[1], i);
+
+               if (use_temp)
+                       alu.dst.sel = ctx->temp_reg;
+               else {
+                       r = tgsi_dst(ctx, &inst->Dst[0], i, &alu.dst);
+                       if (r)
+                               return r;
+               }
+               alu.dst.chan = i;
+               alu.dst.write = 1;
+               alu.is_op3 = 1;
+               if (i == 3)
+                       alu.last = 1;
+               r = r600_bc_add_alu(ctx->bc, &alu);
+               if (r)
+                       return r;
+       }       
+       if (use_temp)
+               return tgsi_helper_copy(ctx, inst);
+       return 0;
+}
+
+static int tgsi_xpd(struct r600_shader_ctx *ctx)
+{
+       struct tgsi_full_instruction *inst = &ctx->parse.FullToken.FullInstruction;
+       struct r600_bc_alu_src r600_src[3];
+       struct r600_bc_alu alu;
+       uint32_t use_temp = 0;
+       int i, r;
+
+       if (inst->Dst[0].Register.WriteMask != 0xf)
+               use_temp = 1;
+
+       r = tgsi_split_constant(ctx, r600_src);
+       if (r)
+               return r;
+       
+       for (i = 0; i < 4; i++) {
+               memset(&alu, 0, sizeof(struct r600_bc_alu));
+               alu.inst = V_SQ_ALU_WORD1_OP2_SQ_OP2_INST_MUL;
+
+               alu.src[0] = r600_src[0];
+               switch (i) {
+               case 0:
+                       alu.src[0].chan = tgsi_chan(&inst->Src[0], 2);
+                       break;
+               case 1:
+                       alu.src[0].chan = tgsi_chan(&inst->Src[0], 0);
+                       break;
+               case 2:
+                       alu.src[0].chan = tgsi_chan(&inst->Src[0], 1);
+                       break;
+               case 3:
+                       alu.src[0].sel = V_SQ_ALU_SRC_0;
+                       alu.src[0].chan = i;
+               }
+
+               alu.src[1] = r600_src[1];
+               switch (i) {
+               case 0:
+                       alu.src[1].chan = tgsi_chan(&inst->Src[1], 1);
+                       break;
+               case 1:
+                       alu.src[1].chan = tgsi_chan(&inst->Src[1], 2);
+                       break;
+               case 2:
+                       alu.src[1].chan = tgsi_chan(&inst->Src[1], 0);
+                       break;
+               case 3:
+                       alu.src[1].sel = V_SQ_ALU_SRC_0;
+                       alu.src[1].chan = i;
+               }
+
+               alu.dst.sel = ctx->temp_reg;
+               alu.dst.chan = i;
+               alu.dst.write = 1;
+
+               if (i == 3)
+                       alu.last = 1;
+               r = r600_bc_add_alu(ctx->bc, &alu);
+               if (r)
+                       return r;
+       }
+
+       for (i = 0; i < 4; i++) {
+               memset(&alu, 0, sizeof(struct r600_bc_alu));
+               alu.inst = V_SQ_ALU_WORD1_OP3_SQ_OP3_INST_MULADD;
+
+               alu.src[0] = r600_src[0];
+               switch (i) {
+               case 0:
+                       alu.src[0].chan = tgsi_chan(&inst->Src[0], 1);
+                       break;
+               case 1:
+                       alu.src[0].chan = tgsi_chan(&inst->Src[0], 2);
+                       break;
+               case 2:
+                       alu.src[0].chan = tgsi_chan(&inst->Src[0], 0);
+                       break;
+               case 3:
+                       alu.src[0].sel = V_SQ_ALU_SRC_0;
+                       alu.src[0].chan = i;
+               }
+
+               alu.src[1] = r600_src[1];
+               switch (i) {
+               case 0:
+                       alu.src[1].chan = tgsi_chan(&inst->Src[1], 2);
+                       break;
+               case 1:
+                       alu.src[1].chan = tgsi_chan(&inst->Src[1], 0);
+                       break;
+               case 2:
+                       alu.src[1].chan = tgsi_chan(&inst->Src[1], 1);
+                       break;
+               case 3:
+                       alu.src[1].sel = V_SQ_ALU_SRC_0;
+                       alu.src[1].chan = i;
+               }
+
+               alu.src[2].sel = ctx->temp_reg;
+               alu.src[2].neg = 1;
+               alu.src[2].chan = i;
+
+               if (use_temp)
+                       alu.dst.sel = ctx->temp_reg;
+               else {
+                       r = tgsi_dst(ctx, &inst->Dst[0], i, &alu.dst);
+                       if (r)
+                               return r;
+               }
+               alu.dst.chan = i;
+               alu.dst.write = 1;
+               alu.is_op3 = 1;
+               if (i == 3)
+                       alu.last = 1;
+               r = r600_bc_add_alu(ctx->bc, &alu);
+               if (r)
+                       return r;
+       }
+       if (use_temp)
+               return tgsi_helper_copy(ctx, inst);
+       return 0;
+}
+
+
 static struct r600_shader_tgsi_instruction r600_shader_tgsi_instruction[] = {
        {TGSI_OPCODE_ARL,       0, V_SQ_ALU_WORD1_OP2_SQ_OP2_INST_NOP, tgsi_unsupported},
        {TGSI_OPCODE_MOV,       0, V_SQ_ALU_WORD1_OP2_SQ_OP2_INST_MOV, tgsi_op2},
@@ -1158,7 +1637,7 @@ static struct r600_shader_tgsi_instruction r600_shader_tgsi_instruction[] = {
        {TGSI_OPCODE_MIN,       0, V_SQ_ALU_WORD1_OP2_SQ_OP2_INST_MIN, tgsi_op2},
        {TGSI_OPCODE_MAX,       0, V_SQ_ALU_WORD1_OP2_SQ_OP2_INST_MAX, tgsi_op2},
        {TGSI_OPCODE_SLT,       0, V_SQ_ALU_WORD1_OP2_SQ_OP2_INST_SETGT, tgsi_slt},
-       {TGSI_OPCODE_SGE,       0, V_SQ_ALU_WORD1_OP2_SQ_OP2_INST_NOP, tgsi_unsupported},
+       {TGSI_OPCODE_SGE,       0, V_SQ_ALU_WORD1_OP2_SQ_OP2_INST_SETGE, tgsi_op2},
        {TGSI_OPCODE_MAD,       1, V_SQ_ALU_WORD1_OP3_SQ_OP3_INST_MULADD, tgsi_op3},
        {TGSI_OPCODE_SUB,       0, V_SQ_ALU_WORD1_OP2_SQ_OP2_INST_ADD, tgsi_op2},
        {TGSI_OPCODE_LRP,       0, V_SQ_ALU_WORD1_OP2_SQ_OP2_INST_NOP, tgsi_lrp},
@@ -1169,38 +1648,38 @@ static struct r600_shader_tgsi_instruction r600_shader_tgsi_instruction[] = {
        /* gap */
        {22,                    0, V_SQ_ALU_WORD1_OP2_SQ_OP2_INST_NOP, tgsi_unsupported},
        {23,                    0, V_SQ_ALU_WORD1_OP2_SQ_OP2_INST_NOP, tgsi_unsupported},
-       {TGSI_OPCODE_FRC,       0, V_SQ_ALU_WORD1_OP2_SQ_OP2_INST_NOP, tgsi_unsupported},
+       {TGSI_OPCODE_FRC,       0, V_SQ_ALU_WORD1_OP2_SQ_OP2_INST_FRACT, tgsi_op2},
        {TGSI_OPCODE_CLAMP,     0, V_SQ_ALU_WORD1_OP2_SQ_OP2_INST_NOP, tgsi_unsupported},
-       {TGSI_OPCODE_FLR,       0, V_SQ_ALU_WORD1_OP2_SQ_OP2_INST_NOP, tgsi_unsupported},
+       {TGSI_OPCODE_FLR,       0, V_SQ_ALU_WORD1_OP2_SQ_OP2_INST_FLOOR, tgsi_op2},
        {TGSI_OPCODE_ROUND,     0, V_SQ_ALU_WORD1_OP2_SQ_OP2_INST_NOP, tgsi_unsupported},
        {TGSI_OPCODE_EX2,       0, V_SQ_ALU_WORD1_OP2_SQ_OP2_INST_EXP_IEEE, tgsi_trans_srcx_replicate},
-       {TGSI_OPCODE_LG2,       0, V_SQ_ALU_WORD1_OP2_SQ_OP2_INST_NOP, tgsi_unsupported},
-       {TGSI_OPCODE_POW,       0, V_SQ_ALU_WORD1_OP2_SQ_OP2_INST_NOP, tgsi_unsupported},
-       {TGSI_OPCODE_XPD,       0, V_SQ_ALU_WORD1_OP2_SQ_OP2_INST_NOP, tgsi_unsupported},
+       {TGSI_OPCODE_LG2,       0, V_SQ_ALU_WORD1_OP2_SQ_OP2_INST_LOG_IEEE, tgsi_trans_srcx_replicate},
+       {TGSI_OPCODE_POW,       0, V_SQ_ALU_WORD1_OP2_SQ_OP2_INST_NOP, tgsi_pow},
+       {TGSI_OPCODE_XPD,       0, V_SQ_ALU_WORD1_OP2_SQ_OP2_INST_NOP, tgsi_xpd},
        /* gap */
        {32,                    0, V_SQ_ALU_WORD1_OP2_SQ_OP2_INST_NOP, tgsi_unsupported},
        {TGSI_OPCODE_ABS,       0, V_SQ_ALU_WORD1_OP2_SQ_OP2_INST_MOV, tgsi_op2},
        {TGSI_OPCODE_RCC,       0, V_SQ_ALU_WORD1_OP2_SQ_OP2_INST_NOP, tgsi_unsupported},
        {TGSI_OPCODE_DPH,       0, V_SQ_ALU_WORD1_OP2_SQ_OP2_INST_NOP, tgsi_unsupported},
-       {TGSI_OPCODE_COS,       0, V_SQ_ALU_WORD1_OP2_SQ_OP2_INST_NOP, tgsi_unsupported},
-       {TGSI_OPCODE_DDX,       0, V_SQ_ALU_WORD1_OP2_SQ_OP2_INST_NOP, tgsi_unsupported},
-       {TGSI_OPCODE_DDY,       0, V_SQ_ALU_WORD1_OP2_SQ_OP2_INST_NOP, tgsi_unsupported},
+       {TGSI_OPCODE_COS,       0, V_SQ_ALU_WORD1_OP2_SQ_OP2_INST_COS, tgsi_trig},
+       {TGSI_OPCODE_DDX,       0, SQ_TEX_INST_GET_GRADIENTS_H, tgsi_tex},
+       {TGSI_OPCODE_DDY,       0, SQ_TEX_INST_GET_GRADIENTS_V, tgsi_tex},
        {TGSI_OPCODE_KILP,      0, V_SQ_ALU_WORD1_OP2_SQ_OP2_INST_NOP, tgsi_unsupported},  /* predicated kill */
        {TGSI_OPCODE_PK2H,      0, V_SQ_ALU_WORD1_OP2_SQ_OP2_INST_NOP, tgsi_unsupported},
        {TGSI_OPCODE_PK2US,     0, V_SQ_ALU_WORD1_OP2_SQ_OP2_INST_NOP, tgsi_unsupported},
        {TGSI_OPCODE_PK4B,      0, V_SQ_ALU_WORD1_OP2_SQ_OP2_INST_NOP, tgsi_unsupported},
        {TGSI_OPCODE_PK4UB,     0, V_SQ_ALU_WORD1_OP2_SQ_OP2_INST_NOP, tgsi_unsupported},
        {TGSI_OPCODE_RFL,       0, V_SQ_ALU_WORD1_OP2_SQ_OP2_INST_NOP, tgsi_unsupported},
-       {TGSI_OPCODE_SEQ,       0, V_SQ_ALU_WORD1_OP2_SQ_OP2_INST_NOP, tgsi_unsupported},
+       {TGSI_OPCODE_SEQ,       0, V_SQ_ALU_WORD1_OP2_SQ_OP2_INST_SETE, tgsi_op2},
        {TGSI_OPCODE_SFL,       0, V_SQ_ALU_WORD1_OP2_SQ_OP2_INST_NOP, tgsi_unsupported},
-       {TGSI_OPCODE_SGT,       0, V_SQ_ALU_WORD1_OP2_SQ_OP2_INST_NOP, tgsi_unsupported},
-       {TGSI_OPCODE_SIN,       0, V_SQ_ALU_WORD1_OP2_SQ_OP2_INST_NOP, tgsi_unsupported},
-       {TGSI_OPCODE_SLE,       0, V_SQ_ALU_WORD1_OP2_SQ_OP2_INST_NOP, tgsi_unsupported},
-       {TGSI_OPCODE_SNE,       0, V_SQ_ALU_WORD1_OP2_SQ_OP2_INST_NOP, tgsi_unsupported},
+       {TGSI_OPCODE_SGT,       0, V_SQ_ALU_WORD1_OP2_SQ_OP2_INST_SETGT, tgsi_op2},
+       {TGSI_OPCODE_SIN,       0, V_SQ_ALU_WORD1_OP2_SQ_OP2_INST_SIN, tgsi_trig},
+       {TGSI_OPCODE_SLE,       0, V_SQ_ALU_WORD1_OP2_SQ_OP2_INST_SETGE, tgsi_slt},
+       {TGSI_OPCODE_SNE,       0, V_SQ_ALU_WORD1_OP2_SQ_OP2_INST_SETNE, tgsi_op2},
        {TGSI_OPCODE_STR,       0, V_SQ_ALU_WORD1_OP2_SQ_OP2_INST_NOP, tgsi_unsupported},
-       {TGSI_OPCODE_TEX,       0, 0x10, tgsi_tex},
+       {TGSI_OPCODE_TEX,       0, SQ_TEX_INST_SAMPLE, tgsi_tex},
        {TGSI_OPCODE_TXD,       0, V_SQ_ALU_WORD1_OP2_SQ_OP2_INST_NOP, tgsi_unsupported},
-       {TGSI_OPCODE_TXP,       0, 0x10, tgsi_tex},
+       {TGSI_OPCODE_TXP,       0, SQ_TEX_INST_SAMPLE, tgsi_tex},
        {TGSI_OPCODE_UP2H,      0, V_SQ_ALU_WORD1_OP2_SQ_OP2_INST_NOP, tgsi_unsupported},
        {TGSI_OPCODE_UP2US,     0, V_SQ_ALU_WORD1_OP2_SQ_OP2_INST_NOP, tgsi_unsupported},
        {TGSI_OPCODE_UP4B,      0, V_SQ_ALU_WORD1_OP2_SQ_OP2_INST_NOP, tgsi_unsupported},
@@ -1211,10 +1690,10 @@ static struct r600_shader_tgsi_instruction r600_shader_tgsi_instruction[] = {
        {TGSI_OPCODE_BRA,       0, V_SQ_ALU_WORD1_OP2_SQ_OP2_INST_NOP, tgsi_unsupported},
        {TGSI_OPCODE_CAL,       0, V_SQ_ALU_WORD1_OP2_SQ_OP2_INST_NOP, tgsi_unsupported},
        {TGSI_OPCODE_RET,       0, V_SQ_ALU_WORD1_OP2_SQ_OP2_INST_NOP, tgsi_unsupported},
-       {TGSI_OPCODE_SSG,       0, V_SQ_ALU_WORD1_OP2_SQ_OP2_INST_NOP, tgsi_unsupported}, /* SGN */
-       {TGSI_OPCODE_CMP,       0, V_SQ_ALU_WORD1_OP2_SQ_OP2_INST_NOP, tgsi_unsupported},
+       {TGSI_OPCODE_SSG,       0, V_SQ_ALU_WORD1_OP2_SQ_OP2_INST_NOP, tgsi_ssg},
+       {TGSI_OPCODE_CMP,       0, V_SQ_ALU_WORD1_OP2_SQ_OP2_INST_NOP, tgsi_cmp},
        {TGSI_OPCODE_SCS,       0, V_SQ_ALU_WORD1_OP2_SQ_OP2_INST_NOP, tgsi_unsupported},
-       {TGSI_OPCODE_TXB,       0, V_SQ_ALU_WORD1_OP2_SQ_OP2_INST_NOP, tgsi_unsupported},
+       {TGSI_OPCODE_TXB,       0, SQ_TEX_INST_SAMPLE_L, tgsi_tex},
        {TGSI_OPCODE_NRM,       0, V_SQ_ALU_WORD1_OP2_SQ_OP2_INST_NOP, tgsi_unsupported},
        {TGSI_OPCODE_DIV,       0, V_SQ_ALU_WORD1_OP2_SQ_OP2_INST_NOP, tgsi_unsupported},
        {TGSI_OPCODE_DP2,       0, V_SQ_ALU_WORD1_OP2_SQ_OP2_INST_DOT4, tgsi_dp},
@@ -1234,7 +1713,7 @@ static struct r600_shader_tgsi_instruction r600_shader_tgsi_instruction[] = {
        {TGSI_OPCODE_CEIL,      0, V_SQ_ALU_WORD1_OP2_SQ_OP2_INST_NOP, tgsi_unsupported},
        {TGSI_OPCODE_I2F,       0, V_SQ_ALU_WORD1_OP2_SQ_OP2_INST_NOP, tgsi_unsupported},
        {TGSI_OPCODE_NOT,       0, V_SQ_ALU_WORD1_OP2_SQ_OP2_INST_NOP, tgsi_unsupported},
-       {TGSI_OPCODE_TRUNC,     0, V_SQ_ALU_WORD1_OP2_SQ_OP2_INST_NOP, tgsi_unsupported},
+       {TGSI_OPCODE_TRUNC,     0, V_SQ_ALU_WORD1_OP2_SQ_OP2_INST_TRUNC, tgsi_trans_srcx_replicate},
        {TGSI_OPCODE_SHL,       0, V_SQ_ALU_WORD1_OP2_SQ_OP2_INST_NOP, tgsi_unsupported},
        /* gap */
        {88,                    0, V_SQ_ALU_WORD1_OP2_SQ_OP2_INST_NOP, tgsi_unsupported},