projects
/
mesa.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
r500: fragprog
[mesa.git]
/
src
/
mesa
/
drivers
/
dri
/
r300
/
Makefile
diff --git
a/src/mesa/drivers/dri/r300/Makefile
b/src/mesa/drivers/dri/r300/Makefile
index 2ee23289341e2854eebf0d3771d3a12648c7eca0..5b2bd0bc2b005432252c78622eb00420d419222d 100644
(file)
--- a/
src/mesa/drivers/dri/r300/Makefile
+++ b/
src/mesa/drivers/dri/r300/Makefile
@@
-1,6
+1,5
@@
# src/mesa/drivers/dri/r300/Makefile
# src/mesa/drivers/dri/r300/Makefile
-
TOP = ../../../../..
include $(TOP)/configs/current
TOP = ../../../../..
include $(TOP)/configs/current
@@
-28,8
+27,7
@@
DRIVER_SOURCES = \
radeon_lock.c \
radeon_span.c \
radeon_state.c \
radeon_lock.c \
radeon_span.c \
radeon_state.c \
- radeon_mm.c \
- radeon_vtxfmt_a.c \
+ r300_mem.c \
\
r300_context.c \
r300_ioctl.c \
\
r300_context.c \
r300_ioctl.c \
@@
-39,37
+37,17
@@
DRIVER_SOURCES = \
r300_texmem.c \
r300_tex.c \
r300_texstate.c \
r300_texmem.c \
r300_tex.c \
r300_texstate.c \
- r300_vert
ex
prog.c \
+ r300_vertprog.c \
r300_fragprog.c \
r300_fragprog.c \
+ r500_fragprog.c \
r300_shader.c \
r300_shader.c \
- r300_maos.c \
+ r300_emit.c \
+ r300_swtcl.c \
$(EGL_SOURCES)
$(EGL_SOURCES)
-# \
-# r200_context.c \
-# r200_ioctl.c \
-# r200_state.c \
-# r200_state_init.c \
-# r200_cmdbuf.c \
-# r200_pixel.c \
-# r200_tex.c \
-# r200_texmem.c \
-# r200_texstate.c \
-# r200_swtcl.c \
-# r200_maos.c \
-# r200_sanity.c \
-# r200_vtxfmt.c \
-# r200_vtxfmt_c.c \
-# r200_vtxfmt_sse.c \
-# r200_vtxfmt_x86.c
-
-
C_SOURCES = $(COMMON_SOURCES) $(DRIVER_SOURCES)
C_SOURCES = $(COMMON_SOURCES) $(DRIVER_SOURCES)
-X86_SOURCES =
-#r200_vtxtmp_x86.S
-
-DRIVER_DEFINES = -DCOMPILE_R300 -DGLX_DIRECT_RENDERING -DR200_MERGED=0 \
+DRIVER_DEFINES = -DCOMPILE_R300 -DR200_MERGED=0 \
-DRADEON_COMMON=1 -DRADEON_COMMON_FOR_R300
SYMLINKS = \
-DRADEON_COMMON=1 -DRADEON_COMMON_FOR_R300
SYMLINKS = \
@@
-83,11
+61,11
@@
SYMLINKS = \
COMMON_SYMLINKS = \
radeon_chipset.h \
radeon_screen.c \
COMMON_SYMLINKS = \
radeon_chipset.h \
radeon_screen.c \
- radeon_screen.h
+ radeon_screen.h \
+ radeon_span.h
##### TARGETS #####
##### TARGETS #####
-
include ../Makefile.template
server:
include ../Makefile.template
server:
@@
-100,4
+78,3
@@
$(COMMON_SYMLINKS):
@[ -e $@ ] || ln -sf ../radeon/$@ ./
symlinks: $(SYMLINKS) $(COMMON_SYMLINKS)
@[ -e $@ ] || ln -sf ../radeon/$@ ./
symlinks: $(SYMLINKS) $(COMMON_SYMLINKS)
-