Merge remote-tracking branch 'mareko/r300g-draw-instanced' into pipe-video

diff --cc src/gallium/drivers/r300/r300_context.c
Simple merge

diff --cc src/gallium/drivers/r300/r300_context.h
Simple merge

diff --cc src/gallium/drivers/r300/r300_emit.c
Simple merge

diff --cc src/gallium/drivers/r300/r300_state.c
Simple merge

diff --cc src/gallium/drivers/r300/r300_state_derived.c
Simple merge

diff --cc src/gallium/drivers/r300/r300_tgsi_to_rc.c
index 0561ab9bfa4526e5c25efb0e54867738eb40500c,2ac52906d13af7018e1e3c5ab581bcfa23382fed..30377ffa59bb15064bf7fb574031f0c6e4356904
--- 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
@@@ -266,10 -279,10 +279,11 @@@ static void transform_texture(struct rc
              *shadowSamplers |= 1 << dst->U.I.TexSrcUnit;
              break;
      }
 +    dst->U.I.TexSwizzle = RC_SWIZZLE_XYZW;
  }
  
- static void transform_instruction(struct tgsi_to_rc * ttr, struct tgsi_full_instruction * src)
+ static void transform_instruction(struct tgsi_to_rc * ttr,
+                                   struct tgsi_full_instruction * src)
  {
      struct rc_instruction * dst;
      int i;