diff options
| author | Marek Olšák <maraeo@gmail.com> | 2010-08-07 18:10:07 +0200 |
|---|---|---|
| committer | Marek Olšák <maraeo@gmail.com> | 2010-08-08 00:32:58 +0200 |
| commit | 84e84cf4e7dae00b46b97a5a4ad8f5e89246994c (patch) | |
| tree | afbb2e2a193d0857c5090f7f5feb2832d8ce5cdd | |
| parent | 800473566cdcee8d062d65ef9af6833ff1ac8d42 (diff) | |
r300c: do not advertise half float vertex on RV3xx, RS4xx, RC4xx
Fixes a hardlock.
(cherry picked from commit 1e46de3a834b361f4227f90dd1fe2e401d0d7723)
| -rw-r--r-- | src/mesa/drivers/dri/r300/r300_context.c | 2 | ||||
| -rw-r--r-- | 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 689bb13813..4cbd4f20d5 100644 --- a/src/mesa/drivers/dri/r300/r300_context.c +++ b/src/mesa/drivers/dri/r300/r300_context.c @@ -456,7 +456,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 98732c810c..6dbfdc964b 100644 --- a/src/mesa/drivers/dri/radeon/radeon_chipset.h +++ b/src/mesa/drivers/dri/radeon/radeon_chipset.h @@ -413,9 +413,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, |