diff --git a/src/gallium/drivers/r600/r600_shader.c b/src/gallium/drivers/r600/r600_shader.c
index 39e6d85..bd3a5bf 100644
--- a/src/gallium/drivers/r600/r600_shader.c
+++ b/src/gallium/drivers/r600/r600_shader.c
@@ -189,7 +189,7 @@ struct r600_shader_ctx {
 	struct r600_shader_tgsi_instruction	*inst_info;
 	struct r600_bc				*bc;
 	struct r600_shader			*shader;
-	struct r600_shader_src			src[3];
+	struct r600_shader_src			src[4];
 	u32					*literals;
 	u32					nliterals;
 	u32					max_driver_temp_used;
@@ -1748,24 +1748,43 @@ static int tgsi_dp(struct r600_shader_ctx *ctx)
 	return 0;
 }
 
+static inline boolean tgsi_tex_src_requires_loading(struct r600_shader_ctx *ctx, unsigned index) {
+        struct tgsi_full_instruction *inst = &ctx->parse.FullToken.FullInstruction;
+
+        /* Texture fetch instructions can only use gprs as source.
+         * Also they cannot negate the source or take the absolute value */
+        return (inst->Src[index].Register.File != TGSI_FILE_TEMPORARY &&
+                inst->Src[index].Register.File != TGSI_FILE_INPUT) ||
+                ctx->src[index].neg || ctx->src[index].abs;
+}
+
+static inline unsigned tgsi_get_src_gpr(struct r600_shader_ctx *ctx, unsigned index) {
+        struct tgsi_full_instruction *inst = &ctx->parse.FullToken.FullInstruction;
+        return ctx->file_offset[inst->Src[index].Register.File] + inst->Src[index].Register.Index;
+}
+
 static int tgsi_tex(struct r600_shader_ctx *ctx)
 {
 	static float one_point_five = 1.5f;
 	struct tgsi_full_instruction *inst = &ctx->parse.FullToken.FullInstruction;
 	struct r600_bc_tex tex;
 	struct r600_bc_alu alu;
-	unsigned src_gpr;
-	int r, i;
+	unsigned src_gpr = tgsi_get_src_gpr(ctx, 0);
+	unsigned sampler_src_index = -1;
+	int r, i, j;
 	int opcode;
-	/* Texture fetch instructions can only use gprs as source.
-	 * Also they cannot negate the source or take the absolute value */
-	const boolean src_requires_loading =
-		(inst->Src[0].Register.File != TGSI_FILE_TEMPORARY &&
-		inst->Src[0].Register.File != TGSI_FILE_INPUT) ||
-		ctx->src[0].neg || ctx->src[0].abs;
+	const boolean src_requires_loading = tgsi_tex_src_requires_loading(ctx, 0);
 	boolean src_loaded = FALSE;
 
-	src_gpr = ctx->file_offset[inst->Src[0].Register.File] + inst->Src[0].Register.Index;
+        if (inst->Instruction.Opcode == TGSI_OPCODE_TXD) {
+                sampler_src_index = 3;
+        }
+        else if (inst->Instruction.NumSrcRegs > 1) {
+                sampler_src_index = 1;
+        }
+
+        assert(sampler_src_index == -1 ||
+               inst->Src[sampler_src_index].Register.File == TGSI_FILE_SAMPLER);
 
 	if (inst->Instruction.Opcode == TGSI_OPCODE_TXP) {
 		int out_chan;
@@ -1831,6 +1850,51 @@ static int tgsi_tex(struct r600_shader_ctx *ctx)
 		src_gpr = ctx->temp_reg;
 	}
 
+        if (inst->Instruction.Opcode == TGSI_OPCODE_TXD) {
+                /* emit SET_GRADIENTS_ */
+                for (i = 1; i < 3; ++i) {
+                        memset(&tex, 0, sizeof(struct r600_bc_tex));
+                        tex.inst = (i == 1) ? SQ_TEX_INST_SET_GRADIENTS_H :
+                                              SQ_TEX_INST_SET_GRADIENTS_V;
+                        tex.sampler_id = tgsi_get_src_gpr(ctx, sampler_src_index);
+                        tex.resource_id = tex.sampler_id + R600_MAX_CONST_BUFFERS;
+                        tex.src_gpr = tgsi_get_src_gpr(ctx, i);
+
+                        if (tgsi_tex_src_requires_loading(ctx, i)) {
+                                tex.src_gpr = r600_get_temp(ctx);
+                                tex.src_sel_x = 0;
+                                tex.src_sel_y = 1;
+                                tex.src_sel_z = 2;
+                                tex.src_sel_w = 3;
+
+                                for (j = 0; j < 4; ++j) {
+                                        memset(&alu, 0, sizeof(struct r600_bc_alu));
+                                        alu.inst = CTX_INST(V_SQ_ALU_WORD1_OP2_SQ_OP2_INST_MOV);
+                                        r600_bc_src(&alu.src[0], &ctx->src[i], j);
+                                        alu.dst.sel = tex.src_gpr;
+                                        alu.dst.chan = j;
+                                        if (j == 3)
+                                                alu.last = 1;
+                                        alu.dst.write = 1;
+                                        r = r600_bc_add_alu(ctx->bc, &alu);
+                                        if (r)
+                                                return r;
+                                }
+                        }
+                        else {
+                                tex.src_sel_x = ctx->src[i].swizzle[0];
+                                tex.src_sel_y = ctx->src[i].swizzle[1];
+                                tex.src_sel_z = ctx->src[i].swizzle[2];
+                                tex.src_sel_w = ctx->src[i].swizzle[3];
+                                tex.src_rel = ctx->src[i].rel;
+                        }
+
+                        r = r600_bc_add_tex(ctx->bc, &tex);
+                        if (r)
+                                return r;
+                }
+        }
+
 	if (inst->Texture.Texture == TGSI_TEXTURE_CUBE) {
 		static const unsigned src0_swizzle[] = {2, 2, 0, 1};
 		static const unsigned src1_swizzle[] = {1, 0, 2, 2};
@@ -1954,14 +2018,28 @@ static int tgsi_tex(struct r600_shader_ctx *ctx)
 	}
 
 	opcode = ctx->inst_info->r600_opcode;
-	if (opcode == SQ_TEX_INST_SAMPLE &&
-	    (inst->Texture.Texture == TGSI_TEXTURE_SHADOW1D || inst->Texture.Texture == TGSI_TEXTURE_SHADOW2D))
-		opcode = SQ_TEX_INST_SAMPLE_C;
+	if (inst->Texture.Texture == TGSI_TEXTURE_SHADOW1D || inst->Texture.Texture == TGSI_TEXTURE_SHADOW2D) {
+                switch (opcode) {
+                case SQ_TEX_INST_SAMPLE:
+                        opcode = SQ_TEX_INST_SAMPLE_C;
+                        break;
+
+                case SQ_TEX_INST_SAMPLE_L:
+                        opcode = SQ_TEX_INST_SAMPLE_C_L;
+                        break;
+
+                case SQ_TEX_INST_SAMPLE_G:
+                        opcode = SQ_TEX_INST_SAMPLE_C_G;
+                        break;
+                }
+        }
 
 	memset(&tex, 0, sizeof(struct r600_bc_tex));
 	tex.inst = opcode;
-	tex.sampler_id = ctx->file_offset[inst->Src[1].Register.File] + inst->Src[1].Register.Index;
-	tex.resource_id = tex.sampler_id + R600_MAX_CONST_BUFFERS;
+        if (sampler_src_index != -1) {
+                tex.sampler_id = tgsi_get_src_gpr(ctx, sampler_src_index);
+                tex.resource_id = tex.sampler_id + R600_MAX_CONST_BUFFERS;
+        }
 	tex.src_gpr = src_gpr;
 	tex.dst_gpr = ctx->file_offset[inst->Dst[0].Register.File] + inst->Dst[0].Register.Index;
 	tex.dst_sel_x = (inst->Dst[0].Register.WriteMask & 1) ? 0 : 7;
@@ -3085,7 +3163,7 @@ static struct r600_shader_tgsi_instruction r600_shader_tgsi_instruction[] = {
 	{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, SQ_TEX_INST_SAMPLE, tgsi_tex},
-	{TGSI_OPCODE_TXD,	0, V_SQ_ALU_WORD1_OP2_SQ_OP2_INST_NOP, tgsi_unsupported},
+	{TGSI_OPCODE_TXD,	0, SQ_TEX_INST_SAMPLE_G, 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},
@@ -3243,7 +3321,7 @@ static struct r600_shader_tgsi_instruction eg_shader_tgsi_instruction[] = {
 	{TGSI_OPCODE_SNE,	0, EG_V_SQ_ALU_WORD1_OP2_SQ_OP2_INST_SETNE, tgsi_op2},
 	{TGSI_OPCODE_STR,	0, EG_V_SQ_ALU_WORD1_OP2_SQ_OP2_INST_NOP, tgsi_unsupported},
 	{TGSI_OPCODE_TEX,	0, SQ_TEX_INST_SAMPLE, tgsi_tex},
-	{TGSI_OPCODE_TXD,	0, EG_V_SQ_ALU_WORD1_OP2_SQ_OP2_INST_NOP, tgsi_unsupported},
+	{TGSI_OPCODE_TXD,	0, SQ_TEX_INST_SAMPLE_G, tgsi_tex},
 	{TGSI_OPCODE_TXP,	0, SQ_TEX_INST_SAMPLE, tgsi_tex},
 	{TGSI_OPCODE_UP2H,	0, EG_V_SQ_ALU_WORD1_OP2_SQ_OP2_INST_NOP, tgsi_unsupported},
 	{TGSI_OPCODE_UP2US,	0, EG_V_SQ_ALU_WORD1_OP2_SQ_OP2_INST_NOP, tgsi_unsupported},
@@ -3401,7 +3479,7 @@ static struct r600_shader_tgsi_instruction cm_shader_tgsi_instruction[] = {
 	{TGSI_OPCODE_SNE,	0, EG_V_SQ_ALU_WORD1_OP2_SQ_OP2_INST_SETNE, tgsi_op2},
 	{TGSI_OPCODE_STR,	0, EG_V_SQ_ALU_WORD1_OP2_SQ_OP2_INST_NOP, tgsi_unsupported},
 	{TGSI_OPCODE_TEX,	0, SQ_TEX_INST_SAMPLE, tgsi_tex},
-	{TGSI_OPCODE_TXD,	0, EG_V_SQ_ALU_WORD1_OP2_SQ_OP2_INST_NOP, tgsi_unsupported},
+	{TGSI_OPCODE_TXD,	0, SQ_TEX_INST_SAMPLE_G, tgsi_tex},
 	{TGSI_OPCODE_TXP,	0, SQ_TEX_INST_SAMPLE, tgsi_tex},
 	{TGSI_OPCODE_UP2H,	0, EG_V_SQ_ALU_WORD1_OP2_SQ_OP2_INST_NOP, tgsi_unsupported},
 	{TGSI_OPCODE_UP2US,	0, EG_V_SQ_ALU_WORD1_OP2_SQ_OP2_INST_NOP, tgsi_unsupported},
diff --git a/src/gallium/drivers/r600/r600d.h b/src/gallium/drivers/r600/r600d.h
index 9281b08..6373572 100644
--- a/src/gallium/drivers/r600/r600d.h
+++ b/src/gallium/drivers/r600/r600d.h
@@ -3465,9 +3465,14 @@
 #define SQ_TEX_INST_LD 0x03
 #define SQ_TEX_INST_GET_GRADIENTS_H 0x7
 #define SQ_TEX_INST_GET_GRADIENTS_V 0x8
+#define SQ_TEX_INST_SET_GRADIENTS_H 0xB
+#define SQ_TEX_INST_SET_GRADIENTS_V 0xC
 
 #define SQ_TEX_INST_SAMPLE 0x10
 #define SQ_TEX_INST_SAMPLE_L 0x11
+#define SQ_TEX_INST_SAMPLE_G 0x14
 #define SQ_TEX_INST_SAMPLE_C 0x18
+#define SQ_TEX_INST_SAMPLE_C_L 0x19
+#define SQ_TEX_INST_SAMPLE_C_G 0x1C
 
 #endif