diff options
| author | Nicolai Hähnle <[email protected]> | 2009-09-21 13:26:50 +0200 |
|---|---|---|
| committer | Nicolai Hähnle <[email protected]> | 2009-09-21 13:26:50 +0200 |
| commit | 81c7561d9d3faf70ac22c6a5f3fbea18f53eed92 (patch) | |
| tree | 5ec097e0e1fe99804104d3a56923c16edf1533aa /src/mesa/drivers/dri/r300/Makefile | |
| parent | f02f63997ce65530788a6dfcb28f11790a14d938 (diff) | |
| parent | 3083ba38f4c884b32cd0460607b5064b6b7008d2 (diff) | |
Merge branch 'master' into r300-compiler
There were additional non-textual conflicts.
Conflicts:
src/gallium/drivers/r300/r300_tgsi_to_rc.c
src/mesa/drivers/dri/r300/compiler/r3xx_vertprog.c
src/mesa/drivers/dri/r300/compiler/radeon_program.c
src/mesa/drivers/dri/r300/compiler/radeon_program_alu.c
Diffstat (limited to 'src/mesa/drivers/dri/r300/Makefile')
| -rw-r--r-- | src/mesa/drivers/dri/r300/Makefile | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/src/mesa/drivers/dri/r300/Makefile b/src/mesa/drivers/dri/r300/Makefile index 06c31ce7f2e..c64f940623f 100644 --- a/src/mesa/drivers/dri/r300/Makefile +++ b/src/mesa/drivers/dri/r300/Makefile @@ -63,8 +63,7 @@ DRIVER_SOURCES = \ C_SOURCES = $(COMMON_SOURCES) $(DRIVER_SOURCES) -DRIVER_DEFINES = -DCOMPILE_R300 -DR200_MERGED=0 \ - -DRADEON_COMMON=1 -DRADEON_COMMON_FOR_R300 \ +DRIVER_DEFINES = -DRADEON_R300 # -DRADEON_BO_TRACK \ -Wall |