radeon: Don't crash generating mipmaps when pixels=NULL

[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 cd05927e5e32bad0bb9a2778a4cc534de2897cb2..62715e3b50db536d3c3231910877d4215f914ead 100644 (file)
--- a/src/mesa/drivers/dri/r300/Makefile
+++ b/src/mesa/drivers/dri/r300/Makefile
@@ -3,6 +3,8 @@
 TOP = ../../../../..
 include $(TOP)/configs/current
 
+CFLAGS += $(RADEON_CFLAGS)
+
 LIBNAME = r300_dri.so
 
 MINIGLX_SOURCES = server/radeon_dri.c
@@ -20,33 +22,50 @@ COMMON_SOURCES = \
        ../common/xmlconfig.c \
        ../common/dri_util.c
 
+RADEON_COMMON_SOURCES = \
+       radeon_texture.c \
+       radeon_common_context.c \
+       radeon_common.c \
+       radeon_dma.c \
+       radeon_lock.c \
+       radeon_bo_legacy.c \
+       radeon_cs_legacy.c \
+       radeon_mipmap_tree.c \
+       radeon_span.c \
+       radeon_fbo.c
+
 DRIVER_SOURCES = \
                 radeon_screen.c \
-                radeon_context.c \
-                radeon_ioctl.c \
-                radeon_lock.c \
-                radeon_span.c \
-                radeon_state.c \
-                radeon_mm.c \
-                \
                 r300_context.c \
                 r300_ioctl.c \
                 r300_cmdbuf.c \
                 r300_state.c \
                 r300_render.c \
-                r300_texmem.c \
                 r300_tex.c \
                 r300_texstate.c \
+                radeon_program.c \
+                radeon_program_alu.c \
+                radeon_program_pair.c \
+                radeon_nqssadce.c \
                 r300_vertprog.c \
+                r300_fragprog_common.c \
                 r300_fragprog.c \
+                r300_fragprog_swizzle.c \
+                r300_fragprog_emit.c \
+                r500_fragprog.c \
+                r500_fragprog_emit.c \
                 r300_shader.c \
-                r300_maos.c \
+                r300_emit.c \
+                r300_swtcl.c \
+                $(RADEON_COMMON_SOURCES) \
                 $(EGL_SOURCES)
 
 C_SOURCES = $(COMMON_SOURCES) $(DRIVER_SOURCES)
 
-DRIVER_DEFINES = -DCOMPILE_R300 -DGLX_DIRECT_RENDERING -DR200_MERGED=0 \
-       -DRADEON_COMMON=1 -DRADEON_COMMON_FOR_R300
+DRIVER_DEFINES = -DCOMPILE_R300 -DR200_MERGED=0 \
+       -DRADEON_COMMON=1 -DRADEON_COMMON_FOR_R300 \
+#      -DRADEON_BO_TRACK \
+       -Wall
 
 SYMLINKS = \
        server/radeon_dri.c \
@@ -59,7 +78,30 @@ SYMLINKS = \
 COMMON_SYMLINKS = \
        radeon_chipset.h \
        radeon_screen.c \
-       radeon_screen.h
+       radeon_screen.h \
+       radeon_span.h \
+       radeon_span.c \
+       radeon_bo_legacy.c \
+       radeon_cs_legacy.c \
+       radeon_bo_legacy.h \
+       radeon_cs_legacy.h \
+       radeon_bocs_wrapper.h \
+       radeon_lock.c \
+       radeon_lock.h \
+       radeon_common.c \
+       radeon_common.h \
+       radeon_common_context.c \
+       radeon_common_context.h \
+       radeon_cmdbuf.h \
+       radeon_dma.c \
+       radeon_dma.h \
+       radeon_mipmap_tree.c \
+       radeon_mipmap_tree.h \
+       radeon_texture.c \
+       radeon_texture.h \
+       radeon_fbo.c
+
+DRI_LIB_DEPS += $(RADEON_LDFLAGS)
 
 ##### TARGETS #####