Merge branch 'master' into r300g-glsl

Conflicts:
	src/gallium/drivers/r300/r300_tgsi_to_rc.c

Signed-off-by: Nicolai Hähnle <nhaehnle@gmail.com>

diff --cc src/gallium/drivers/r300/r300_tgsi_to_rc.c
index cc5e5c19e948b7744045b192642ff37a43f3df56,4534a6dd80d6c04d963acb4eed4fc07e7e73aa1e..74d4fb5087680ecdc9e040ac9aea07c958c8c561
--- 1/src/gallium/drivers/r300/r300_tgsi_to_rc.c
--- 2/src/gallium/drivers/r300/r300_tgsi_to_rc.c
+++ b/src/gallium/drivers/r300/r300_tgsi_to_rc.c
@@@ -260,14 -263,12 +263,12 @@@ static void transform_instruction(struc
      if (src->Instruction.Opcode == TGSI_OPCODE_END)
          return;
  
-     struct rc_instruction * dst = rc_insert_new_instruction(ttr->compiler, ttr->compiler->Program.Instructions.Prev);
-     int i;
- 
+     dst = rc_insert_new_instruction(ttr->compiler, ttr->compiler->Program.Instructions.Prev);
 -    dst->I.Opcode = translate_opcode(src->Instruction.Opcode);
 -    dst->I.SaturateMode = translate_saturate(src->Instruction.Saturate);
 +    dst->U.I.Opcode = translate_opcode(src->Instruction.Opcode);
 +    dst->U.I.SaturateMode = translate_saturate(src->Instruction.Saturate);
  
      if (src->Instruction.NumDstRegs)
 -        transform_dstreg(ttr, &dst->I.DstReg, &src->FullDstRegisters[0]);
 +        transform_dstreg(ttr, &dst->U.I.DstReg, &src->FullDstRegisters[0]);
  
      for(i = 0; i < src->Instruction.NumSrcRegs; ++i) {
          if (src->FullSrcRegisters[i].SrcRegister.File == TGSI_FILE_SAMPLER)

diff --cc src/mesa/drivers/dri/r300/r300_fragprog_common.c
Simple merge