From: Christian König <deathsimple@vodafone.de>
Date: Fri, 3 Jun 2011 08:47:56 +0000 (+0200)
Subject: Merge remote-tracking branch 'mareko/r300g-draw-instanced' into pipe-video
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=10370b752cd793665feec9494e6545a3f04c69f9;p=mesa.git

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

10370b752cd793665feec9494e6545a3f04c69f9
diff --cc src/gallium/drivers/r300/r300_tgsi_to_rc.c
index 0561ab9bfa4,2ac52906d13..30377ffa59b
--- a/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;