diff options
| author | Dave Airlie <[email protected]> | 2009-09-16 13:48:45 +1000 |
|---|---|---|
| committer | Dave Airlie <[email protected]> | 2009-09-16 13:48:45 +1000 |
| commit | 858a2a2ac7b1c8f1a7f7c4b3c66b3919989798d4 (patch) | |
| tree | ca2062a8df5d10c3b65af9759b4370e8baff23ca /src/mesa/drivers/dri/r600 | |
| parent | a6a21eb00dbd262b2835456bef8172b36df5c1ea (diff) | |
radeon: cleanup compile defines mess.
I inherited this and really it stayed around far too long,
make it nice and simple.
Diffstat (limited to 'src/mesa/drivers/dri/r600')
| -rw-r--r-- | src/mesa/drivers/dri/r600/Makefile | 3 | ||||
| -rw-r--r-- | src/mesa/drivers/dri/r600/r600_context.c | 3 |
2 files changed, 1 insertions, 5 deletions
diff --git a/src/mesa/drivers/dri/r600/Makefile b/src/mesa/drivers/dri/r600/Makefile index d925a2dfe39..36bf773c054 100644 --- a/src/mesa/drivers/dri/r600/Makefile +++ b/src/mesa/drivers/dri/r600/Makefile @@ -65,8 +65,7 @@ DRIVER_SOURCES = \ C_SOURCES = $(COMMON_SOURCES) $(DRIVER_SOURCES) -DRIVER_DEFINES = -DCOMPILE_R600 -DR200_MERGED=0 \ - -DRADEON_COMMON=1 -DRADEON_COMMON_FOR_R600 \ +DRIVER_DEFINES = -DRADEON_R600 \ # -DRADEON_BO_TRACK \ -Wall diff --git a/src/mesa/drivers/dri/r600/r600_context.c b/src/mesa/drivers/dri/r600/r600_context.c index 07a7bcf11f1..f8fd9c13d77 100644 --- a/src/mesa/drivers/dri/r600/r600_context.c +++ b/src/mesa/drivers/dri/r600/r600_context.c @@ -385,9 +385,6 @@ GLboolean r600CreateContext(const __GLcontextModes * glVisual, if (driQueryOptionb(&r600->radeon.optionCache, "no_rast")) { radeon_warning("disabling 3D acceleration\n"); -#if R200_MERGED - FALLBACK(&r600->radeon, RADEON_FALLBACK_DISABLE, 1); -#endif } return GL_TRUE; |