Build infrastructure for libGL dri modules.

Work in progress, not connected to the build yet.

17 files changed, 593 insertions, 0 deletions

diff --git a/lib/libGL/dri/Makefile b/lib/libGL/dri/Makefile
new file mode 100644
index 000000000..277357780
--- /dev/null
+++ b/lib/libGL/dri/Makefile
@@ -0,0 +1,6 @@
+SUBDIR= i810 i915 i965 mach64 mga r128 \
+	r200 r300 radeon savage sis tdfx unichrome
+
+.include <bsd.subdir.mk>
+
+build: _SUBDIRUSE
diff --git a/lib/libGL/dri/Makefile.inc b/lib/libGL/dri/Makefile.inc
new file mode 100644
index 000000000..f185194ff
--- /dev/null
+++ b/lib/libGL/dri/Makefile.inc
@@ -0,0 +1,77 @@
+# $OpenBSD: Makefile.inc,v 1.1 2007/12/04 22:00:27 matthieu Exp $
+.include <bsd.own.mk>
+
+MESA= ${.CURDIR}/../../../../dist/Mesa/src/mesa
+TOP= ${.CURDIR}/../../../../dist/Mesa
+
+DRI_DRIVER_INSTALL_DIR=	${X11BASE}/lib/modules/dri
+X11BASE ?= /usr/X11R6
+
+COMMON_SOURCES = \
+	driverfuncs.c \
+	utils.c \
+	texmem.c \
+	vblank.c \
+	dri_util.c \
+	xmlconfig.c \
+	drirenderbuffer.c
+
+COMMON_BM_SOURCES = \
+	dri_bufmgr.c \
+	dri_drmpool.c
+
+CFLAGS+= -DIN_DRI_DRIVER $(INCLUDES) $(DRIVER_DEFINES)
+
+INCLUDES = \
+	-I$(TOP)/src/mesa/drivers/dri/common \
+	-I$(TOP)/include \
+	-I$(TOP)/include/GL/internal \
+	-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/shader \
+	-I$(TOP)/src/mesa/swrast \
+	-I$(TOP)/src/mesa/swrast_setup \
+	-I$(TOP)/src/egl/main \
+	-I$(TOP)/src/egl/drivers/dri \
+	-I$(X11BASE)/include \
+	-I$(X11BASE)/include/drm
+
+LDADD=	-L${X11BASE}/lib -lexpat -ldrm 
+.PATH: ${MESA}/drivers/dri/common
+.PATH: ${MESA}/drivers/common
+
+.SUFFIXES:
+.SUFFIXES: .a .c .o .S .s .so
+
+.c.so:
+	@echo "${COMPILE.c} ${PICFLAG} -DPIC ${.IMPSRC} -o ${.TARGET}"
+	@${COMPILE.c} ${PICFLAG} -DPIC ${.IMPSRC} -o ${.TARGET}.o
+	@${LD} -X -r ${.TARGET}.o -o ${.TARGET}
+	@rm -f ${.TARGET}.o
+
+all: ${LIB}
+
+OBJS+=  ${SRCS:N*.h:R:S/$/.so/g}
+
+${LIB}:	${OBJS} $(DPADD)
+	${CC} -shared ${PICFLAG} -o $@ `${LORDER} ${OBJS}|tsort -q` ${LDADD}
+
+clean:
+	rm -f ${LIB} ${OBJS}
+
+cleandir:	clean
+
+install: $(LIB)
+	${INSTALL} ${INSTALL_COPY} -o ${LIBOWN} -g ${LIBGRP} -m ${LIBMODE} \
+	${LIB} ${DESTDIR}${DRI_DRIVER_INSTALL_DIR}
+
+.include <bsd.dep.mk>
+
+
+
+
+
+
diff --git a/lib/libGL/dri/Makefile.inc~ b/lib/libGL/dri/Makefile.inc~
new file mode 100644
index 000000000..bbd5b7c87
--- /dev/null
+++ b/lib/libGL/dri/Makefile.inc~
@@ -0,0 +1,43 @@
+# $OpenBSD: Makefile.inc~,v 1.1 2007/12/04 22:00:27 matthieu Exp $
+
+
+MESA= ${.CURDIR}/../../../../dist/Mesa/src/mesa
+TOP= ${.CURDIR}/../../../../dist/Mesa
+
+X11BASE ?= /usr/X11R6
+
+COMMON_SOURCES = \
+	driverfuncs.c \
+	utils.c \
+	texmem.c \
+	vblank.c \
+	dri_util.c \
+	xmlconfig.c \
+	drirenderbuffer.c
+
+COMMON_BM_SOURCES = \
+	dri_bufmgr.c \
+	dri_drmpool.c
+
+CFLAGS+= -DIN_DRI_DRIVER $(INCLUDES) $(DRIVER_DEFINES)
+
+INCLUDES = \
+	-I$(TOP)/src/mesa/drivers/dri/common \
+	-I$(TOP)/include \
+	-I$(TOP)/include/GL/internal \
+	-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/shader \
+	-I$(TOP)/src/mesa/swrast \
+	-I$(TOP)/src/mesa/swrast_setup \
+	-I$(TOP)/src/egl/main \
+	-I$(TOP)/src/egl/drivers/dri \
+	-I$(X11BASE)/include \
+	-I$(X11BASE)/include/drm
+
+LDADD=	-L${X11BASE}/lib -lexpat -ldrm 
+.PATH: ${MESA}/drivers/dri/common
+.PATH: ${MESA}/drivers/common
diff --git a/lib/libGL/dri/Makefile~ b/lib/libGL/dri/Makefile~
new file mode 100644
index 000000000..28abdb3c3
--- /dev/null
+++ b/lib/libGL/dri/Makefile~
@@ -0,0 +1,3 @@
+SUBDIRS=i810
+
+.include <bsd.subdir.mk>
diff --git a/lib/libGL/dri/i810/Makefile b/lib/libGL/dri/i810/Makefile
new file mode 100644
index 000000000..db926305a
--- /dev/null
+++ b/lib/libGL/dri/i810/Makefile
@@ -0,0 +1,22 @@
+LIB=	i810_dri.so
+
+DRIVER_SOURCES = \
+	i810context.c \
+	i810ioctl.c \
+	i810render.c \
+	i810screen.c \
+	i810span.c \
+	i810state.c \
+	i810tex.c \
+	i810texmem.c \
+	i810texstate.c \
+	i810tris.c \
+	i810vb.c
+
+SRCS= ${DRIVER_SOURCES} ${COMMON_SOURCES}
+
+DRIVER_DEFINES= -I$(MESA)/drivers/dri/i810/server
+
+.include <bsd.xorg.mk>
+
+.PATH: ${MESA}/drivers/dri/i810
diff --git a/lib/libGL/dri/i915/Makefile b/lib/libGL/dri/i915/Makefile
new file mode 100644
index 000000000..4a392d7df
--- /dev/null
+++ b/lib/libGL/dri/i915/Makefile
@@ -0,0 +1,42 @@
+#	$OpenBSD: Makefile,v 1.1 2007/12/04 22:00:27 matthieu Exp $
+
+LIB=	i915_dri.so
+
+DRIVER_SOURCES = \
+	i915_context.c \
+	i915_debug.c \
+	i915_fragprog.c \
+	i915_metaops.c \
+	i915_program.c \
+	i915_state.c \
+	i915_tex.c \
+	i915_texprog.c \
+	i915_texstate.c \
+	i915_vtbl.c \
+	i830_context.c \
+	i830_metaops.c \
+	i830_state.c \
+	i830_texblend.c \
+	i830_tex.c \
+	i830_texstate.c \
+	i830_vtbl.c \
+	intel_batchbuffer.c \
+	intel_context.c \
+	intel_ioctl.c \
+	intel_pixel.c \
+	intel_render.c \
+	intel_rotate.c \
+	intel_screen.c \
+	intel_span.c \
+	intel_state.c \
+	intel_tex.c \
+	intel_texmem.c \
+	intel_tris.c 
+
+SRCS= ${DRIVER_SOURCES} ${COMMON_SOURCES}
+
+DRIVER_DEFINES= -I$(MESA)/drivers/dri/i915/server
+
+.include <bsd.xorg.mk>
+
+.PATH: ${MESA}/drivers/dri/i915
diff --git a/lib/libGL/dri/i965/Makefile b/lib/libGL/dri/i965/Makefile
new file mode 100644
index 000000000..4bf58af76
--- /dev/null
+++ b/lib/libGL/dri/i965/Makefile
@@ -0,0 +1,91 @@
+#	$OpenBSD: Makefile,v 1.1 2007/12/04 22:00:27 matthieu Exp $
+
+LIB=	i965_dri.so
+
+DRIVER_SOURCES = \
+	bufmgr_fake.c \
+	intel_batchbuffer.c \
+	intel_blit.c \
+	intel_buffer_objects.c \
+	intel_buffers.c \
+	intel_context.c \
+	intel_ioctl.c \
+	intel_mipmap_tree.c \
+	intel_regions.c \
+	intel_screen.c \
+	intel_span.c \
+	intel_pixel_copy.c \
+	intel_pixel_bitmap.c \
+	intel_state.c \
+	intel_tex.c \
+	intel_tex_layout.c \
+	intel_tex_validate.c \
+	brw_aub.c \
+	brw_aub_playback.c \
+	brw_cc.c \
+	brw_clip.c \
+	brw_clip_line.c \
+	brw_clip_point.c \
+	brw_clip_state.c \
+	brw_clip_tri.c \
+	brw_clip_unfilled.c \
+	brw_clip_util.c \
+	brw_context.c \
+	brw_curbe.c \
+	brw_draw.c \
+	brw_draw_upload.c \
+	brw_eu.c \
+	brw_eu_debug.c \
+	brw_eu_emit.c \
+	brw_eu_util.c \
+	brw_fallback.c \
+	brw_gs.c \
+	brw_gs_emit.c \
+	brw_gs_state.c \
+	brw_hal.c \
+	brw_metaops.c \
+	brw_misc_state.c \
+	brw_program.c \
+	brw_sf.c \
+	brw_sf_emit.c \
+	brw_sf_state.c \
+	brw_state_batch.c \
+	brw_state_cache.c \
+	brw_state_pool.c \
+	brw_state_upload.c \
+	brw_tex.c \
+	brw_tex_layout.c \
+	brw_urb.c \
+	brw_util.c \
+	brw_vs.c \
+	brw_vs_constval.c \
+	brw_vs_emit.c \
+	brw_vs_state.c \
+	brw_vs_tnl.c \
+	brw_vtbl.c \
+	brw_wm.c \
+	brw_wm_debug.c \
+	brw_wm_emit.c \
+	brw_wm_fp.c \
+	brw_wm_iz.c \
+	brw_wm_pass0.c \
+	brw_wm_pass1.c \
+	brw_wm_pass2.c \
+	brw_wm_sampler_state.c \
+	brw_wm_state.c \
+	brw_wm_surface_state.c 
+
+SRCS = \
+	$(COMMON_SOURCES) \
+	$(MINIGLX_SOURCES) \
+	$(DRIVER_SOURCES)
+
+DRIVER_DEFINES = \
+	-I$(MESA)/drivers/dri/i965 \
+	-I$(MESA)/drivers/dri/i965/server \
+	-I$(MESA)/drivers/dri/intel
+
+.include <bsd.xorg.mk>
+
+.PATH: $(MESA)/drivers/dri/i965
+.PATH: $(MESA)/drivers/dri/intel
diff --git a/lib/libGL/dri/mach64/Makefile b/lib/libGL/dri/mach64/Makefile
new file mode 100644
index 000000000..a0ef56b69
--- /dev/null
+++ b/lib/libGL/dri/mach64/Makefile
@@ -0,0 +1,27 @@
+#	$OpenBSD: Makefile,v 1.1 2007/12/04 22:00:27 matthieu Exp $
+
+LIB=	mach64_dri.so
+
+DRIVER_SOURCES = \
+	mach64_context.c \
+	mach64_ioctl.c \
+	mach64_screen.c \
+	mach64_span.c \
+	mach64_state.c \
+	mach64_tex.c \
+	mach64_texmem.c \
+	mach64_texstate.c \
+	mach64_tris.c \
+	mach64_vb.c \
+	mach64_dd.c \
+	mach64_lock.c
+
+SRCS = \
+	$(COMMON_SOURCES) \
+	$(DRIVER_SOURCES)
+
+DRIVER_DEFINES= -I$(MESA)/drivers/dri/mach64/server
+
+.include <bsd.xorg.mk>
+
+.PATH: $(MESA)/drivers/dri/mach64
diff --git a/lib/libGL/dri/mga/Makefile b/lib/libGL/dri/mga/Makefile
new file mode 100644
index 000000000..07e28a6e4
--- /dev/null
+++ b/lib/libGL/dri/mga/Makefile
@@ -0,0 +1,28 @@
+#	$OpenBSD: Makefile,v 1.1 2007/12/04 22:00:27 matthieu Exp $
+
+LIB=	mga_dri.so
+
+DRIVER_SOURCES = \
+	mgadd.c \
+	mgaioctl.c \
+	mgarender.c \
+	mgastate.c \
+	mgatris.c \
+	mgapixel.c \
+	mgaspan.c \
+	mgatex.c \
+	mgatexmem.c \
+	mga_texstate.c \
+	mga_texcombine.c \
+	mgavb.c \
+	mga_xmesa.c
+
+SRCS = \
+	$(COMMON_SOURCES) \
+	$(DRIVER_SOURCES) 
+
+DRIVER_DEFINES = -I$(MESA)/drivers/dri/mga/server
+
+.include <bsd.xorg.mk>
+
+.PATH: $(MESA)/drivers/dri/mga
diff --git a/lib/libGL/dri/r128/Makefile b/lib/libGL/dri/r128/Makefile
new file mode 100644
index 000000000..c28a593ee
--- /dev/null
+++ b/lib/libGL/dri/r128/Makefile
@@ -0,0 +1,26 @@
+#	$OpenBSD: Makefile,v 1.1 2007/12/04 22:00:27 matthieu Exp $
+
+LIB=	r128_dri.so
+
+DRIVER_SOURCES = \
+	r128_context.c \
+	r128_lock.c \
+	r128_state.c \
+	r128_texstate.c \
+	r128_dd.c \
+	r128_screen.c \
+	r128_tex.c \
+	r128_tris.c \
+	r128_ioctl.c \
+	r128_span.c \
+	r128_texmem.c
+
+SRCS = \
+	$(COMMON_SOURCES) \
+	$(DRIVER_SOURCES) 
+
+DRIVER_DEFINES= -I$(MESA)/drivers/dri/r128/server
+
+.include <bsd.xorg.mk>
+
+.PATH: $(MESA)/drivers/dri/r128
diff --git a/lib/libGL/dri/r200/Makefile b/lib/libGL/dri/r200/Makefile
new file mode 100644
index 000000000..f417145a9
--- /dev/null
+++ b/lib/libGL/dri/r200/Makefile
@@ -0,0 +1,39 @@
+# $OpenBSD: Makefile,v 1.1 2007/12/04 22:00:27 matthieu Exp $
+
+LIB=	r200_dri.so
+
+DRIVER_SOURCES = r200_context.c \
+		 r200_ioctl.c \
+		 r200_lock.c \
+		 r200_state.c \
+		 r200_state_init.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_fragshader.c \
+		 r200_vertprog.c \
+		 radeon_screen.c \
+		 $(EGL_SOURCES)
+
+SRCS = $(COMMON_SOURCES) $(DRIVER_SOURCES)
+
+DRIVER_DEFINES = -DRADEON_COMMON=1 -DRADEON_COMMON_FOR_R200 \
+	-I$(MESA)/drivers/dri/r200 \
+	-I$(MESA)/drivers/dri/r200/server \
+	-I$(MESA)/drivers/dri/radeon \
+	-I$(MESA)/drivers/dri/radeon/server
+
+.include <bsd.xorg.mk>
+
+.PATH: $(MESA)/drivers/dri/r200
+.PATH: $(MESA)/drivers/dri/radeon
+
+
+
diff --git a/lib/libGL/dri/r300/Makefile b/lib/libGL/dri/r300/Makefile
new file mode 100644
index 000000000..c744b30b8
--- /dev/null
+++ b/lib/libGL/dri/r300/Makefile
@@ -0,0 +1,49 @@
+#	$OpenBSD: Makefile,v 1.1 2007/12/04 22:00:27 matthieu Exp $
+
+LIB=	r300_dri.so
+
+COMMON_SOURCES = \
+	../../common/driverfuncs.c \
+	../common/mm.c \
+	../common/utils.c \
+	../common/texmem.c \
+	../common/vblank.c \
+	../common/xmlconfig.c \
+	../common/dri_util.c
+
+DRIVER_SOURCES = \
+		 radeon_screen.c \
+		 radeon_context.c \
+		 radeon_ioctl.c \
+		 radeon_lock.c \
+		 radeon_span.c \
+		 radeon_state.c \
+		 r300_mem.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 \
+		 r300_vertprog.c \
+		 r300_fragprog.c \
+		 r300_shader.c \
+		 r300_emit.c \
+
+SRCS = $(COMMON_SOURCES) $(DRIVER_SOURCES)
+
+DRIVER_DEFINES = -DCOMPILE_R300 -DR200_MERGED=0 \
+	-DRADEON_COMMON=1 -DRADEON_COMMON_FOR_R300 \
+	-I$(MESA)/drivers/dri/r300 \
+	-I$(MESA)/drivers/dri/r300/server \
+	-I$(MESA)/drivers/dri/radeon \
+	-I$(MESA)/drivers/dri/radeon/server
+
+.include <bsd.xorg.mk>
+
+.PATH: $(MESA)/drivers/dri/r300
+.PATH: $(MESA)/drivers/dri/radeon
+
diff --git a/lib/libGL/dri/radeon/Makefile b/lib/libGL/dri/radeon/Makefile
new file mode 100644
index 000000000..ad9c5e925
--- /dev/null
+++ b/lib/libGL/dri/radeon/Makefile
@@ -0,0 +1,31 @@
+#	$OpenBSD: Makefile,v 1.1 2007/12/04 22:00:27 matthieu Exp $
+
+LIB=	radeon_dri.so
+
+DRIVER_SOURCES = \
+	radeon_context.c \
+	radeon_ioctl.c \
+	radeon_lock.c \
+	radeon_screen.c \
+	radeon_state.c \
+	radeon_state_init.c \
+	radeon_tex.c \
+	radeon_texmem.c \
+	radeon_texstate.c \
+	radeon_tcl.c \
+	radeon_swtcl.c \
+	radeon_span.c \
+	radeon_maos.c \
+	radeon_sanity.c 
+
+SRCS = \
+	$(COMMON_SOURCES) \
+	$(DRIVER_SOURCES) 
+
+DRIVER_DEFINES = -DRADEON_COMMON=0 \
+	-I$(MESA)/drivers/dri/radeon/server
+
+
+.include <bsd.xorg.mk>
+
+.PATH: $(MESA)/drivers/dri/radeon
diff --git a/lib/libGL/dri/savage/Makefile b/lib/libGL/dri/savage/Makefile
new file mode 100644
index 000000000..b31bd5dbb
--- /dev/null
+++ b/lib/libGL/dri/savage/Makefile
@@ -0,0 +1,23 @@
+#	$OpenBSD: Makefile,v 1.1 2007/12/04 22:00:28 matthieu Exp $
+
+LIB=	savage_dri.so
+
+DRIVER_SOURCES = \
+	savage_xmesa.c \
+	savagedd.c \
+	savagestate.c \
+	savagetex.c \
+	savagetris.c \
+	savagerender.c \
+	savageioctl.c \
+	savagespan.c
+
+SRCS = \
+	$(COMMON_SOURCES) \
+	$(DRIVER_SOURCES) 
+
+DRIVER_DEFINES = -I$(MESA)/drivers/dri/savage/server
+
+.include <bsd.xorg.mk>
+
+.PATH: $(MESA)/drivers/dri/savage
diff --git a/lib/libGL/dri/sis/Makefile b/lib/libGL/dri/sis/Makefile
new file mode 100644
index 000000000..1fb431b15
--- /dev/null
+++ b/lib/libGL/dri/sis/Makefile
@@ -0,0 +1,30 @@
+#	$OpenBSD: Makefile,v 1.1 2007/12/04 22:00:28 matthieu Exp $
+
+LIB=	sis_dri.so
+
+DRIVER_SOURCES = \
+	sis6326_state.c \
+	sis6326_clear.c \
+	sis_alloc.c \
+	sis_clear.c \
+	sis_context.c \
+	sis_dd.c \
+	sis_fog.c \
+	sis_lock.c \
+	sis_screen.c \
+	sis_span.c \
+	sis_state.c \
+	sis_stencil.c \
+	sis_tex.c \
+	sis_texstate.c \
+	sis_tris.c
+
+SRCS = \
+	$(COMMON_SOURCES) \
+	$(DRIVER_SOURCES)
+
+DRIVER_DEFINES = -I$(MESA)/drivers/dri/sis/server
+
+.include <bsd.xorg.mk>
+
+.PATH: $(MESA)/drivers/dri/sis
diff --git a/lib/libGL/dri/tdfx/Makefile b/lib/libGL/dri/tdfx/Makefile
new file mode 100644
index 000000000..7ba7bc0d1
--- /dev/null
+++ b/lib/libGL/dri/tdfx/Makefile
@@ -0,0 +1,28 @@
+#	$OpenBSD: Makefile,v 1.1 2007/12/04 22:00:28 matthieu Exp $
+
+LIB=	tdfx_dri.so
+
+DRIVER_SOURCES = \
+	tdfx_context.c \
+	tdfx_dd.c \
+	tdfx_lock.c \
+	tdfx_pixels.c \
+	tdfx_render.c \
+	tdfx_screen.c \
+	tdfx_span.c \
+	tdfx_state.c \
+	tdfx_tex.c \
+	tdfx_texman.c \
+	tdfx_texstate.c \
+	tdfx_tris.c \
+	tdfx_vb.c
+
+SRCS = \
+	$(COMMON_SOURCES) \
+	$(DRIVER_SOURCES)
+
+DRIVER_DEFINES = -I$(MESA)/drivers/dri/tdfx/server
+
+.include <bsd.xorg.mk>
+
+.PATH: $(MESA)/drivers/dri/tdfx
diff --git a/lib/libGL/dri/unichrome/Makefile b/lib/libGL/dri/unichrome/Makefile
new file mode 100644
index 000000000..695b3d9f3
--- /dev/null
+++ b/lib/libGL/dri/unichrome/Makefile
@@ -0,0 +1,28 @@
+#	$OpenBSD: Makefile,v 1.1 2007/12/04 22:00:28 matthieu Exp $
+
+LIB=	unichrome_dri.so
+
+DRIVER_SOURCES = \
+	via_context.c \
+	via_fb.c \
+	via_tex.c \
+	via_ioctl.c \
+	via_memcpy.c \
+	via_render.c \
+	via_screen.c \
+	via_span.c \
+	via_state.c \
+	via_texcombine.c \
+	via_tris.c 
+
+SRCS = \
+	$(COMMON_SOURCES) \
+	$(DRIVER_SOURCES)
+
+DRIVER_DEFINES = -I$(MESA)/drivers/dri/unichrome/server \
+		-I$(MESA)/drivers/dri/unichrome
+
+.include <bsd.xorg.mk>
+
+.PATH: $(MESA)/drivers/dri/unichrome
+