Mesa (master): r300g: emit US_FORMAT on R520 only

[Marek Olšák]

Module: Mesa
Branch: master
Commit: ff3d7ce201e6b415eb1254d784f0f425592d556b
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=ff3d7ce201e6b415eb1254d784f0f425592d556b

Author: Marek Olšák <maraeo at gmail.com>
Date:   Fri Apr  8 20:05:33 2011 +0200

r300g: emit US_FORMAT on R520 only

---

 src/gallium/drivers/r300/r300_chipset.c |    2 +-
 src/gallium/drivers/r300/r300_chipset.h |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/gallium/drivers/r300/r300_chipset.c b/src/gallium/drivers/r300/r300_chipset.c
index 1068d35..4949703 100644
--- a/src/gallium/drivers/r300/r300_chipset.c
+++ b/src/gallium/drivers/r300/r300_chipset.c
@@ -419,5 +419,5 @@ void r300_parse_chipset(struct r300_capabilities* caps)
     caps->is_rv350 = caps->family >= CHIP_FAMILY_RV350;
     caps->z_compress = caps->is_rv350 ? R300_ZCOMP_8X8 : R300_ZCOMP_4X4;
     caps->dxtc_swizzle = caps->is_r400 || caps->is_r500;
-    caps->has_us_format = caps->is_r500;
+    caps->has_us_format = caps->family == CHIP_FAMILY_R520;
 }
diff --git a/src/gallium/drivers/r300/r300_chipset.h b/src/gallium/drivers/r300/r300_chipset.h
index 3777f0c..d0050be 100644
--- a/src/gallium/drivers/r300/r300_chipset.h
+++ b/src/gallium/drivers/r300/r300_chipset.h
@@ -90,7 +90,7 @@ struct r300_capabilities {
     boolean high_second_pipe;
     /* DXTC texture swizzling. */
     boolean dxtc_swizzle;
-    /* Whether R500_US_FORMAT0_0 is supported (depends on DRM). */
+    /* Whether R500_US_FORMAT0_0 exists (R520-only and depends on DRM). */
     boolean has_us_format;
 };