Mesa (master): r300c: do not advertise half float vertex on RV3xx, RS4xx, RC4xx

[Marek Olšák]

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

Author: Marek Olšák <maraeo at gmail.com>
Date:   Sat Aug  7 18:10:07 2010 +0200

r300c: do not advertise half float vertex on RV3xx, RS4xx, RC4xx

Fixes a hardlock.

NOTE: this is a candidate for the 7.8 branch, provided the half float vertex
is really implemented there.

---

 src/mesa/drivers/dri/r300/r300_context.c     |    2 +-
 src/mesa/drivers/dri/radeon/radeon_chipset.h |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/mesa/drivers/dri/r300/r300_context.c b/src/mesa/drivers/dri/r300/r300_context.c
index e4b302b..3d2f892 100644
--- a/src/mesa/drivers/dri/r300/r300_context.c
+++ b/src/mesa/drivers/dri/r300/r300_context.c
@@ -461,7 +461,7 @@ static void r300InitGLExtensions(GLcontext *ctx)
 	if (!r300->radeon.radeonScreen->drmSupportsOcclusionQueries) {
 		_mesa_disable_extension(ctx, "GL_ARB_occlusion_query");
 	}
-	if (r300->radeon.radeonScreen->chip_family >= CHIP_FAMILY_RV350)
+        if (r300->radeon.radeonScreen->chip_family >= CHIP_FAMILY_R420)
   		_mesa_enable_extension(ctx, "GL_ARB_half_float_vertex");
 
 	if (r300->radeon.radeonScreen->chip_family >= CHIP_FAMILY_RV515)
diff --git a/src/mesa/drivers/dri/radeon/radeon_chipset.h b/src/mesa/drivers/dri/radeon/radeon_chipset.h
index b7ee9a1..7d54fab 100644
--- a/src/mesa/drivers/dri/radeon/radeon_chipset.h
+++ b/src/mesa/drivers/dri/radeon/radeon_chipset.h
@@ -414,9 +414,9 @@ enum {
    CHIP_FAMILY_R350,
    CHIP_FAMILY_RV350,
    CHIP_FAMILY_RV380,
+   CHIP_FAMILY_RS400,
    CHIP_FAMILY_R420,
    CHIP_FAMILY_RV410,
-   CHIP_FAMILY_RS400,
    CHIP_FAMILY_RS600,
    CHIP_FAMILY_RS690,
    CHIP_FAMILY_RS740,