projects
/
mesa.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch '7.8'
[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 be005bd1641f3edeac04c52d9f06641f036e9d1b..2245998c952332faea7b1b1c2bc1f0e9c1ba4a4a 100644
(file)
--- a/
src/mesa/drivers/dri/r300/Makefile
+++ b/
src/mesa/drivers/dri/r300/Makefile
@@
-7,12
+7,6
@@
CFLAGS += $(RADEON_CFLAGS)
LIBNAME = r300_dri.so
LIBNAME = r300_dri.so
-MINIGLX_SOURCES = server/radeon_dri.c
-
-ifeq ($(USING_EGL), 1)
-EGL_SOURCES = server/radeon_egl.c
-endif
-
ifeq ($(RADEON_LDFLAGS),)
CS_SOURCES = radeon_cs_space_drm.c radeon_bo.c radeon_cs.c
endif
ifeq ($(RADEON_LDFLAGS),)
CS_SOURCES = radeon_cs_space_drm.c radeon_bo.c radeon_cs.c
endif
@@
-37,9
+31,13
@@
RADEON_COMMON_SOURCES = \
radeon_fbo.c \
radeon_lock.c \
radeon_mipmap_tree.c \
radeon_fbo.c \
radeon_lock.c \
radeon_mipmap_tree.c \
- radeon_
span
.c \
+ radeon_
pixel_read
.c \
radeon_queryobj.c \
radeon_queryobj.c \
- radeon_texture.c
+ radeon_span.c \
+ radeon_texture.c \
+ radeon_tex_copy.c \
+ radeon_tex_getimage.c \
+ radeon_tile.c
DRIVER_SOURCES = \
radeon_screen.c \
DRIVER_SOURCES = \
radeon_screen.c \
@@
-50,7
+48,6
@@
DRIVER_SOURCES = \
r300_state.c \
r300_render.c \
r300_tex.c \
r300_state.c \
r300_render.c \
r300_tex.c \
- r300_texcopy.c \
r300_texstate.c \
r300_vertprog.c \
r300_fragprog_common.c \
r300_texstate.c \
r300_vertprog.c \
r300_fragprog_common.c \
@@
-66,7
+63,6
@@
C_SOURCES = $(COMMON_SOURCES) $(DRIVER_SOURCES)
DRIVER_DEFINES = -DRADEON_R300
# -DRADEON_BO_TRACK \
DRIVER_DEFINES = -DRADEON_R300
# -DRADEON_BO_TRACK \
- -Wall
DRI_LIB_DEPS += $(RADEON_LDFLAGS)
DRI_LIB_DEPS += $(RADEON_LDFLAGS)