projects
/
mesa.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge commit 'origin/master' into gallium-sw-api-2
[mesa.git]
/
src
/
mesa
/
drivers
/
dri
/
r600
/
Makefile
diff --git
a/src/mesa/drivers/dri/r600/Makefile
b/src/mesa/drivers/dri/r600/Makefile
index 9b7c42042e66c0bb026b50ff93e01792ca81e4ea..17915621ee4d1bc6907c77686b1db64f49c10108 100644
(file)
--- a/
src/mesa/drivers/dri/r600/Makefile
+++ b/
src/mesa/drivers/dri/r600/Makefile
@@
-7,14
+7,8
@@
CFLAGS += $(RADEON_CFLAGS)
LIBNAME = r600_dri.so
LIBNAME = r600_dri.so
-MINIGLX_SOURCES = server/radeon_dri.c
-
-ifeq ($(USING_EGL), 1)
-EGL_SOURCES = server/radeon_egl.c
-endif
-
ifeq ($(RADEON_LDFLAGS),)
ifeq ($(RADEON_LDFLAGS),)
-CS_SOURCES = radeon_cs_space_drm.c
+CS_SOURCES = radeon_cs_space_drm.c
radeon_bo.c radeon_cs.c
endif
COMMON_SOURCES = \
endif
COMMON_SOURCES = \
@@
-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_pixel_read.c \
+ radeon_queryobj.c \
radeon_span.c \
radeon_texture.c \
radeon_span.c \
radeon_texture.c \
- radeon_queryobj.c
+ radeon_tex_copy.c \
+ radeon_tex_getimage.c \
+ radeon_tile.c
DRIVER_SOURCES = \
radeon_screen.c \
DRIVER_SOURCES = \
radeon_screen.c \
@@
-59,6
+57,7
@@
DRIVER_SOURCES = \
r700_render.c \
r600_tex.c \
r600_texstate.c \
r700_render.c \
r600_tex.c \
r600_texstate.c \
+ r600_blit.c \
r700_debug.c \
$(RADEON_COMMON_SOURCES) \
$(EGL_SOURCES) \
r700_debug.c \
$(RADEON_COMMON_SOURCES) \
$(EGL_SOURCES) \
@@
-66,9
+65,8
@@
DRIVER_SOURCES = \
C_SOURCES = $(COMMON_SOURCES) $(DRIVER_SOURCES)
C_SOURCES = $(COMMON_SOURCES) $(DRIVER_SOURCES)
-DRIVER_DEFINES = -DRADEON_R600
\
+DRIVER_DEFINES = -DRADEON_R600
# -DRADEON_BO_TRACK \
# -DRADEON_BO_TRACK \
- -Wall
DRI_LIB_DEPS += $(RADEON_LDFLAGS)
DRI_LIB_DEPS += $(RADEON_LDFLAGS)