R1xx/r2xx: Don't use an alpha texture format for GLX_TEXTURE_FORMAT_RGB_EXT

[mesa.git] / src / mesa / drivers / dri / r200 / Makefile

diff --git a/src/mesa/drivers/dri/r200/Makefile b/src/mesa/drivers/dri/r200/Makefile
index 37b42d3f4206cecfeb98c01e3f1f68460ae2c084..6a246edf7cb0ea88474c53d1bf770a82e9713f6b 100644 (file)
--- a/src/mesa/drivers/dri/r200/Makefile
+++ b/src/mesa/drivers/dri/r200/Makefile
@@ -1,141 +1,107 @@
 # src/mesa/drivers/dri/r200/Makefile
 
 TOP = ../../../../..
-include $(TOP)/configs/default
+include $(TOP)/configs/current
 
-SHARED_INCLUDES = $(INCLUDE_DIRS) -I. -I../common -Iserver
-MINIGLX_INCLUDES = -I$(TOP)/src/glx/mini
+CFLAGS += $(RADEON_CFLAGS)
 
-DEFINES += \
-       -D_HAVE_SWRAST=1 \
-       -D_HAVE_SWTNL=1 \
-       -D_HAVE_SANITY=1 \
-       -D_HAVE_CODEGEN=1 \
-       -D_HAVE_LIGHTING=1 \
-       -D_HAVE_TEXGEN=1 \
-       -D_HAVE_USERCLIP=1 \
-       -DGLX_DIRECT_RENDERING 
+LIBNAME = r200_dri.so
 
 MINIGLX_SOURCES = server/radeon_dri.c 
 
+ifeq ($(USING_EGL), 1)
+EGL_SOURCES = server/radeon_egl.c
+endif
+
+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 = r200_context.c \
                 r200_ioctl.c \
-                r200_lock.c \
-                r200_screen.c \
                 r200_state.c \
                 r200_state_init.c \
-                ../../common/driverfuncs.c \
-                ../common/mm.c \
-                ../common/utils.c \
-                ../common/texmem.c \
-                ../common/vblank.c \
-                ../common/xmlconfig.c \
                 r200_cmdbuf.c \
                 r200_pixel.c \
                 r200_tex.c \
-                r200_texmem.c \
                 r200_texstate.c \
                 r200_tcl.c \
                 r200_swtcl.c \
-                r200_span.c \
                 r200_maos.c \
                 r200_sanity.c \
-                r200_vtxfmt.c \
-                r200_vtxfmt_c.c \
-                r200_vtxfmt_sse.c \
-                r200_vtxfmt_x86.c 
-
-
-INCLUDES = $(MINIGLX_INCLUDES) \
-          $(SHARED_INCLUDES)
+                r200_fragshader.c \
+                r200_vertprog.c \
+                radeon_screen.c \
+                $(EGL_SOURCES) \
+                $(RADEON_COMMON_SOURCES)
 
+C_SOURCES = $(COMMON_SOURCES) $(DRIVER_SOURCES)
 
-C_SOURCES = $(DRIVER_SOURCES) \
-           $(MINIGLX_SOURCES) 
+X86_SOURCES = 
 
-MESA_MODULES = $(TOP)/src/mesa/mesa.a
-
-
-ifeq ($(WINDOW_SYSTEM),dri)
-WINOBJ=$(MESABUILDDIR)/dri/dri.a
-WINLIB=
-else
-WINOBJ=
-WINLIB=-L$(MESA)/src/glx/mini
-endif
-
-ASM_SOURCES = 
-OBJECTS = $(C_SOURCES:.c=.o) \
-         $(ASM_SOURCES:.S=.o) 
+DRIVER_DEFINES = -DRADEON_COMMON=1 -DRADEON_COMMON_FOR_R200
 
 SYMLINKS = \
-       server/radeon_common.h \
-       server/radeon_dri.c \
+       server/radeon_egl.c  \
+       server/radeon_dri.c  \
        server/radeon_dri.h \
        server/radeon.h \
        server/radeon_macros.h \
-       server/radeon_reg.h \
-       server/radeon_sarea.h \
-
-
-$(SYMLINKS):
-       mkdir -p server
-       cd server
-       rm -f $@ && ln -s ../../radeon/$@ $@
-
-
-### Include directories
-
-INCLUDE_DIRS = \
-       -I$(TOP)/include \
-       -I$(TOP)/src/mesa \
-       -I$(TOP)/src/mesa/main \
-       -I$(TOP)/src/mesa/glapi \
-       -I$(TOP)/src/mesa/math \
-       -I$(TOP)/src/mesa/transform \
-       -I$(TOP)/src/mesa/swrast \
-       -I$(TOP)/src/mesa/swrast_setup
-
-
-##### RULES #####
-
-.c.o:
-       $(CC) -c $(SHARED_INCLUDES) $(MINIGLX_INCLUDES) $(CFLAGS) $(DEFINES) $< -o $@
-
-.S.o:
-       $(CC) -c $(SHARED_INCLUDES) $(MINIGLX_INCLUDES) $(CFLAGS) $(DEFINES)  $< -o $@
-
+       server/radeon_reg.h
+
+COMMON_SYMLINKS = \
+       radeon_chipset.h \
+       radeon_screen.c \
+       radeon_screen.h \
+       radeon_bo_legacy.c \
+       radeon_cs_legacy.c \
+       radeon_bo_legacy.h \
+       radeon_cs_legacy.h \
+       radeon_bocs_wrapper.h \
+       radeon_span.h \
+       radeon_span.c \
+       radeon_lock.c \
+       radeon_lock.h \
+       radeon_common.c \
+       radeon_common_context.c \
+       radeon_common_context.h \
+       radeon_common.h \
+       radeon_cmdbuf.h \
+       radeon_mipmap_tree.c \
+       radeon_mipmap_tree.h \
+       radeon_texture.c \
+       radeon_texture.h \
+       radeon_dma.c \
+       radeon_dma.h \
+       radeon_fbo.c
+
+DRI_LIB_DEPS += $(RADEON_LDFLAGS)
 
 ##### TARGETS #####
 
-default: depend r200_dri.so
 
-r200_dri.so:  $(SYMLINKS) $(OBJECTS) $(MESA_MODULES) $(WINOBJ) Makefile.solo
-       rm -f $@ && gcc -o $@ -shared $(OBJECTS) $(MESA_MODULES) $(WINOBJ) $(WINLIB) -lc $(GL_LIB_DEPS)
-       rm -f $(LIB_DIR)/r200_dri.so && \
-       install r200_dri.so $(LIB_DIR)/r200_dri.so
+include ../Makefile.template
 
-$(LIB_DIR)/r200_dri.so:        r200_dri.so
-       rm -f $(LIB_DIR)/r200_dri.so && \
-       install r200_dri.so $(LIB_DIR)/r200_dri.so
-
-# Run 'make -f Makefile.solo dep' to update the dependencies if you change
-# what's included by any source file.
-depend: $(C_SOURCES) $(ASM_SOURCES)
-       touch depend
-       makedepend -fdepend -Y $(SHARED_INCLUDES) $(MINIGLX_INCLUDES) \
-               $(C_SOURCES) $(ASM_SOURCES) >& /dev/null
+#INCLUDES += -I../radeon/server
 
+server:
+       mkdir -p server
 
-# Emacs tags
-tags:
-       etags `find . -name \*.[ch]` `find ../include`
+$(SYMLINKS): server
+       @[ -e $@ ] || ln -sf ../../radeon/$@ server/
 
 
-# Remove .o and backup files
-clean:
-       -rm -f *.o */*.o *~ *.o *~ *.so server/*.o
-       -rm -f $(SYMLINKS)
+$(COMMON_SYMLINKS):
+       @[ -e $@ ] || ln -sf ../radeon/$@ ./
 
+symlinks: $(SYMLINKS) $(COMMON_SYMLINKS)
 
-include depend