Build infrastructure for Mesa 7.8.1.

This commit is contained in:
matthieu 2010-05-22 20:14:14 +00:00
parent e4fce73489
commit 23bbc6ddb4
18 changed files with 447 additions and 87 deletions

View File

@ -1,21 +1,21 @@
# $OpenBSD: Makefile,v 1.26 2010/05/08 14:15:29 matthieu Exp $ # $OpenBSD: Makefile,v 1.27 2010/05/22 20:14:14 matthieu Exp $
.include <bsd.xconf.mk> .include <bsd.xconf.mk>
.if ${XENOCARA_BUILD_DRI:L} == "yes" .if ${XENOCARA_BUILD_DRI:L} == "yes"
SUBDIR=libmesa dri SUBDIR=glsl libmesa/shader/slang/library libmesa dri
.endif .endif
LIB= GL LIB= GL
MESA= ${.CURDIR}/../../dist/Mesa/src/mesa MESA= ${.CURDIR}/../../dist/Mesa/src/mesa
GL= ${.CURDIR}/../../dist/Mesa/src/GL GL= ${.CURDIR}/../../dist/Mesa/src/GL
GLX= ${.CURDIR}/../../dist/Mesa/src/glx/x11 GLX= ${.CURDIR}/../../dist/Mesa/src/glx
MESA_INCLUDE= ${.CURDIR}/../../dist/Mesa/include MESA_INCLUDE= ${.CURDIR}/../../dist/Mesa/include
MESA_DRI= ${.CURDIR}/../../dist/Mesa/src/mesa/drivers/dri MESA_DRI= ${.CURDIR}/../../dist/Mesa/src/mesa/drivers/dri
MESA_MAJOR= 7 MESA_MAJOR= 7
MESA_MINOR= 4 MESA_MINOR= 8
MESA_TINY= 2 MESA_TINY= 1
DRI_DRIVER_INSTALL_DIR= ${X11BASE}/lib/modules/dri DRI_DRIVER_INSTALL_DIR= ${X11BASE}/lib/modules/dri
@ -69,9 +69,10 @@ INCS= \
osmesa.h osmesa.h
GLAPI_SOURCES= \ GLAPI_SOURCES= \
dispatch.c \
glapi.c \ glapi.c \
glapi_dispatch.c \
glapi_getproc.c \ glapi_getproc.c \
glapi_nop.c \
glthread.c \ glthread.c \
$(ASM_API) $(ASM_API)
@ -163,6 +164,7 @@ gl.pc: ${MESA}/gl.pc.in Makefile
-e 's,@GL_PC_REQ_PRIV@,libdrm >= 2.4.3 dri2proto >= 1.99.3 x11 xext xxf86vm xdamage xfixes,' \ -e 's,@GL_PC_REQ_PRIV@,libdrm >= 2.4.3 dri2proto >= 1.99.3 x11 xext xxf86vm xdamage xfixes,' \
-e 's,@GL_PC_LIB_PRIV@,-L${LIBDIR} -lXxf86vm -lXext -lXdamage -lXfixes -lX11 -lXau -lXdmcp,' \ -e 's,@GL_PC_LIB_PRIV@,-L${LIBDIR} -lXxf86vm -lXext -lXdamage -lXfixes -lX11 -lXau -lXdmcp,' \
-e 's,@GL_PC_CFLAGS@,-I${INCSDIR},' \ -e 's,@GL_PC_CFLAGS@,-I${INCSDIR},' \
-e 's,@GL_LIB@,GL,' \
-e 's,@VERSION@,$(MESA_MAJOR).$(MESA_MINOR).$(MESA_TINY),' \ -e 's,@VERSION@,$(MESA_MAJOR).$(MESA_MINOR).$(MESA_TINY),' \
< ${MESA}/gl.pc.in > gl.pc < ${MESA}/gl.pc.in > gl.pc

View File

@ -1,14 +1,16 @@
# $OpenBSD: Makefile,v 1.8 2010/05/08 14:15:29 matthieu Exp $ # $OpenBSD: Makefile,v 1.9 2010/05/22 20:14:14 matthieu Exp $
SUBDIR= swrast SUBDIR= swrast
.if ${MACHINE} == i386 || ${MACHINE} == amd64 .if ${MACHINE} == i386 || ${MACHINE} == amd64
SUBDIR+= i810 i915 i965 mach64 mga r128 \ SUBDIR+= i810 i915 i965 \
r200 r300 radeon s3v savage sis tdfx trident radeon r200 r300
.endif # not ready
.if ${MACHINE} == sparc64 # mach64 mga r128 s3v savage sis tdfx trident
SUBDIR+= mach64 r128 r200 r300 radeon
.endif .endif
#.if ${MACHINE} == sparc64
#SUBDIR+= mach64 r128 r200 r300 radeon
#.endif
build depend all install clean cleandir: _SUBDIRUSE build depend all install clean cleandir: _SUBDIRUSE

View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile.inc,v 1.9 2009/05/17 20:20:23 matthieu Exp $ # $OpenBSD: Makefile.inc,v 1.10 2010/05/22 20:14:14 matthieu Exp $
.include <bsd.xconf.mk> .include <bsd.xconf.mk>
MESA= ${.CURDIR}/../../../../dist/Mesa/src/mesa MESA= ${.CURDIR}/../../../../dist/Mesa/src/mesa
@ -6,15 +6,27 @@ TOP= ${.CURDIR}/../../../../dist/Mesa
DRI_DRIVER_INSTALL_DIR= ${X11BASE}/lib/modules/dri DRI_DRIVER_INSTALL_DIR= ${X11BASE}/lib/modules/dri
COMMON_SOURCES = \ COMMON_GALLIUM_SOURCES = \
utils.c \ utils.c \
texmem.c \
vblank.c \ vblank.c \
dri_util.c \ dri_util.c \
xmlconfig.c \ xmlconfig.c \
drirenderbuffer.c
CFLAGS+= -DIN_DRI_DRIVER -DGLX_DIRECT_RENDERING -DPTHREADS $(INCLUDES) $(DRIVER_DEFINES) COMMON_SOURCES = $(COMMON_GALLIUM_SOURCES) \
driverfuncs.c \
texmem.c \
drirenderbuffer.c \
dri_metaops.c
CFLAGS+= -g -DIN_DRI_DRIVER -DGLX_DIRECT_RENDERING -DPTHREADS \
$(INCLUDES) $(DRIVER_DEFINES)
.if (${COMPILER_VERSION:L:Mgcc[34]*} != "")
CFLAGS += -std=c99
.endif
t:
@echo x${COMPILER_VERSION:L:Mgcc[34]*}x
INCLUDES = \ INCLUDES = \
-I$(TOP)/src/mesa/drivers/dri/common \ -I$(TOP)/src/mesa/drivers/dri/common \
@ -43,8 +55,13 @@ CPPFLAGS += \
CPPFLAGS += -DUSE_X86_64_ASM CPPFLAGS += -DUSE_X86_64_ASM
.endif .endif
LDADD= ../../libmesa/libmesa_pic.a -L${X11BASE}/lib -lX11 -lexpat -ldrm -lm LDADD= ../../libmesa/libmesa_pic.a \
DPADD= ../../libmesa/libmesa_pic.a ../../glsl/pp/libglslpp_pic.a \
../../glsl/cl/libglslcl_pic.a \
-L${X11BASE}/lib -lX11 -lexpat -ldrm -lm
DPADD= ../../libmesa/libmesa_pic.a \
../../glsl/pp/libglslpp_pic.a \
../../glsl/cl/libglslcl_pic.a
.PATH: ${MESA}/drivers/dri/common .PATH: ${MESA}/drivers/dri/common
.PATH: ${MESA}/drivers/common .PATH: ${MESA}/drivers/common

View File

@ -1,13 +1,11 @@
# $OpenBSD: Makefile,v 1.5 2009/05/17 20:20:23 matthieu Exp $ # $OpenBSD: Makefile,v 1.6 2010/05/22 20:14:14 matthieu Exp $
LIB= i915_dri.so LIB= i915_dri.so
DRIVER_SOURCES = \ DRIVER_SOURCES = \
i830_context.c \ i830_context.c \
i830_metaops.c \
i830_state.c \ i830_state.c \
i830_texblend.c \ i830_texblend.c \
i830_tex.c \
i830_texstate.c \ i830_texstate.c \
i830_vtbl.c \ i830_vtbl.c \
intel_render.c \ intel_render.c \
@ -15,8 +13,8 @@ DRIVER_SOURCES = \
intel_buffer_objects.c \ intel_buffer_objects.c \
intel_batchbuffer.c \ intel_batchbuffer.c \
intel_clear.c \ intel_clear.c \
intel_extensions.c \
intel_mipmap_tree.c \ intel_mipmap_tree.c \
i915_tex_layout.c \
intel_tex_layout.c \ intel_tex_layout.c \
intel_tex_image.c \ intel_tex_image.c \
intel_tex_subimage.c \ intel_tex_subimage.c \
@ -31,14 +29,12 @@ DRIVER_SOURCES = \
intel_pixel_read.c \ intel_pixel_read.c \
intel_buffers.c \ intel_buffers.c \
intel_blit.c \ intel_blit.c \
intel_swapbuffers.c \ i915_tex_layout.c \
i915_tex.c \
i915_texstate.c \ i915_texstate.c \
i915_context.c \ i915_context.c \
i915_debug.c \ i915_debug.c \
i915_debug_fp.c \ i915_debug_fp.c \
i915_fragprog.c \ i915_fragprog.c \
i915_metaops.c \
i915_program.c \ i915_program.c \
i915_state.c \ i915_state.c \
i915_vtbl.c \ i915_vtbl.c \
@ -47,9 +43,10 @@ DRIVER_SOURCES = \
intel_screen.c \ intel_screen.c \
intel_span.c \ intel_span.c \
intel_state.c \ intel_state.c \
intel_syncobj.c \
intel_tris.c \ intel_tris.c \
intel_fbo.c \ intel_fbo.c
intel_depthstencil.c
SRCS= \ SRCS= \
$(COMMON_SOURCES) \ $(COMMON_SOURCES) \

View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.4 2009/05/17 20:20:23 matthieu Exp $ # $OpenBSD: Makefile,v 1.5 2010/05/22 20:14:14 matthieu Exp $
LIB= i965_dri.so LIB= i965_dri.so
@ -10,7 +10,7 @@ DRIVER_SOURCES = \
intel_clear.c \ intel_clear.c \
intel_context.c \ intel_context.c \
intel_decode.c \ intel_decode.c \
intel_depthstencil.c \ intel_extensions.c \
intel_fbo.c \ intel_fbo.c \
intel_mipmap_tree.c \ intel_mipmap_tree.c \
intel_regions.c \ intel_regions.c \
@ -20,8 +20,9 @@ DRIVER_SOURCES = \
intel_pixel_bitmap.c \ intel_pixel_bitmap.c \
intel_pixel_copy.c \ intel_pixel_copy.c \
intel_pixel_draw.c \ intel_pixel_draw.c \
intel_pixel_read.c \
intel_state.c \ intel_state.c \
intel_swapbuffers.c \ intel_syncobj.c \
intel_tex.c \ intel_tex.c \
intel_tex_copy.c \ intel_tex_copy.c \
intel_tex_format.c \ intel_tex_format.c \
@ -39,6 +40,7 @@ DRIVER_SOURCES = \
brw_clip_util.c \ brw_clip_util.c \
brw_context.c \ brw_context.c \
brw_curbe.c \ brw_curbe.c \
brw_disasm.c \
brw_draw.c \ brw_draw.c \
brw_draw_upload.c \ brw_draw_upload.c \
brw_eu.c \ brw_eu.c \
@ -67,6 +69,7 @@ DRIVER_SOURCES = \
brw_vs_constval.c \ brw_vs_constval.c \
brw_vs_emit.c \ brw_vs_emit.c \
brw_vs_state.c \ brw_vs_state.c \
brw_vs_surface_state.c \
brw_vtbl.c \ brw_vtbl.c \
brw_wm.c \ brw_wm.c \
brw_wm_debug.c \ brw_wm_debug.c \
@ -79,7 +82,18 @@ DRIVER_SOURCES = \
brw_wm_pass2.c \ brw_wm_pass2.c \
brw_wm_sampler_state.c \ brw_wm_sampler_state.c \
brw_wm_state.c \ brw_wm_state.c \
brw_wm_surface_state.c brw_wm_surface_state.c \
gen6_cc.c \
gen6_clip_state.c \
gen6_depthstencil.c \
gen6_gs_state.c \
gen6_sampler_state.c \
gen6_scissor_state.c \
gen6_sf_state.c \
gen6_urb.c \
gen6_viewport_state.c \
gen6_vs_state.c \
gen6_wm_state.c
SRCS = \ SRCS = \
$(COMMON_SOURCES) \ $(COMMON_SOURCES) \

View File

@ -1,30 +1,51 @@
# $OpenBSD: Makefile,v 1.1 2007/12/04 22:00:27 matthieu Exp $ # $OpenBSD: Makefile,v 1.2 2010/05/22 20:14:14 matthieu Exp $
LIB= r200_dri.so LIB= r200_dri.so
CS_SOURCES = \
radeon_cs_space_drm.c \
radeon_bo.c \
radeon_cs.c
RADEON_COMMON_SOURCES = \
radeon_bo_legacy.c \
radeon_common_context.c \
radeon_common.c \
radeon_cs_legacy.c \
radeon_dma.c \
radeon_debug.c \
radeon_fbo.c \
radeon_lock.c \
radeon_mipmap_tree.c \
radeon_queryobj.c \
radeon_span.c \
radeon_texture.c \
radeon_tex_copy.c
DRIVER_SOURCES = r200_context.c \ DRIVER_SOURCES = r200_context.c \
r200_ioctl.c \ r200_ioctl.c \
r200_lock.c \
r200_state.c \ r200_state.c \
r200_state_init.c \ r200_state_init.c \
r200_cmdbuf.c \ r200_cmdbuf.c \
r200_pixel.c \ r200_pixel.c \
r200_tex.c \ r200_tex.c \
r200_texmem.c \
r200_texstate.c \ r200_texstate.c \
r200_tcl.c \ r200_tcl.c \
r200_swtcl.c \ r200_swtcl.c \
r200_span.c \
r200_maos.c \ r200_maos.c \
r200_sanity.c \ r200_sanity.c \
r200_fragshader.c \ r200_fragshader.c \
r200_vertprog.c \ r200_vertprog.c \
r200_blit.c \
radeon_screen.c \ radeon_screen.c \
$(EGL_SOURCES) $(EGL_SOURCES) \
$(RADEON_COMMON_SOURCES) \
$(CS_SOURCES)
SRCS = $(COMMON_SOURCES) $(DRIVER_SOURCES) SRCS = $(COMMON_SOURCES) $(DRIVER_SOURCES)
DRIVER_DEFINES = -DRADEON_COMMON=1 -DRADEON_COMMON_FOR_R200 \ DRIVER_DEFINES = -DRADEON_R200 \
-DRADEON_COMMON=1 -DRADEON_COMMON_FOR_R200 \
-I$(MESA)/drivers/dri/r200 \ -I$(MESA)/drivers/dri/r200 \
-I$(MESA)/drivers/dri/r200/server \ -I$(MESA)/drivers/dri/r200/server \
-I$(MESA)/drivers/dri/radeon \ -I$(MESA)/drivers/dri/radeon \

View File

@ -1,49 +1,85 @@
# $OpenBSD: Makefile,v 1.3 2009/05/17 20:20:23 matthieu Exp $ # $OpenBSD: Makefile,v 1.4 2010/05/22 20:14:15 matthieu Exp $
LIB= r300_dri.so LIB= r300_dri.so
CS_SOURCES = \
radeon_cs_space_drm.c \
radeon_bo.c \
radeon_cs.c
COMMON_SOURCES = \ COMMON_SOURCES = \
driverfuncs.c \
mm.c \
utils.c \ utils.c \
texmem.c \ texmem.c \
vblank.c \ vblank.c \
dri_util.c \
xmlconfig.c \ xmlconfig.c \
drirenderbuffer.c dri_util.c
RADEON_COMMON_SOURCES = \
radeon_bo_legacy.c \
radeon_buffer_objects.c \
radeon_common_context.c \
radeon_common.c \
radeon_cs_legacy.c \
radeon_dma.c \
radeon_debug.c \
radeon_fbo.c \
radeon_lock.c \
radeon_mipmap_tree.c \
radeon_span.c \
radeon_queryobj.c \
radeon_texture.c \
radeon_tex_copy.c
DRIVER_SOURCES = \ DRIVER_SOURCES = \
radeon_screen.c \ radeon_screen.c \
radeon_context.c \ r300_blit.c \
radeon_ioctl.c \
radeon_lock.c \
radeon_span.c \
radeon_state.c \
r300_mem.c \
\
r300_context.c \ r300_context.c \
r300_ioctl.c \ r300_draw.c \
r300_cmdbuf.c \ r300_cmdbuf.c \
r300_state.c \ r300_state.c \
r300_render.c \ r300_render.c \
r300_texmem.c \
r300_tex.c \ r300_tex.c \
r300_texstate.c \ r300_texstate.c \
radeon_program.c \
radeon_program_alu.c \
radeon_program_pair.c \
radeon_nqssadce.c \
r300_vertprog.c \ r300_vertprog.c \
r300_fragprog.c \ r300_fragprog_common.c \
r300_fragprog_swizzle.c \
r300_fragprog_emit.c \
r500_fragprog.c \
r500_fragprog_emit.c \
r300_shader.c \ r300_shader.c \
radeon_mesa_to_rc.c \
r300_emit.c \ r300_emit.c \
r300_swtcl.c r300_swtcl.c \
$(RADEON_COMMON_SOURCES) \
$(EGL_SOURCES) \
$(CS_SOURCES)
SRCS = $(COMMON_SOURCES) $(DRIVER_SOURCES) COMPILER_SOURCES = \
radeon_code.c \
radeon_compiler.c \
radeon_program.c \
radeon_program_print.c \
radeon_opcodes.c \
radeon_program_alu.c \
radeon_program_pair.c \
radeon_pair_translate.c \
radeon_pair_schedule.c \
radeon_pair_regalloc.c \
radeon_dataflow.c \
radeon_dataflow_deadcode.c \
radeon_dataflow_swizzles.c \
r3xx_fragprog.c \
r300_fragprog.c \
r300_fragprog_swizzle.c \
r300_fragprog_emit.c \
r500_fragprog.c \
r500_fragprog_emit.c \
r3xx_vertprog.c \
r3xx_vertprog_dump.c \
memory_pool.c
DRIVER_DEFINES = -DCOMPILE_R300 -DR200_MERGED=0 \ SRCS = $(COMMON_SOURCES) $(DRIVER_SOURCES) $(COMPILER_SOURCES)
DRIVER_DEFINES = -DRADEON_R300 \
-DCOMPILE_R300 -DR200_MERGED=0 \
-DRADEON_COMMON=1 -DRADEON_COMMON_FOR_R300 \ -DRADEON_COMMON=1 -DRADEON_COMMON_FOR_R300 \
-I$(MESA)/drivers/dri/r300 \ -I$(MESA)/drivers/dri/r300 \
-I$(MESA)/drivers/dri/r300/server \ -I$(MESA)/drivers/dri/r300/server \
@ -53,5 +89,5 @@ DRIVER_DEFINES = -DCOMPILE_R300 -DR200_MERGED=0 \
.include <bsd.xorg.mk> .include <bsd.xorg.mk>
.PATH: $(MESA)/drivers/dri/r300 .PATH: $(MESA)/drivers/dri/r300
.PATH: $(MESA)/drivers/dri/r300/compiler
.PATH: $(MESA)/drivers/dri/radeon .PATH: $(MESA)/drivers/dri/radeon

View File

@ -0,0 +1,66 @@
# $OpenBSD: Makefile,v 1.1 2010/05/22 20:14:15 matthieu Exp $
LIB= r600_dri.so
COMMON_SOURCES = \
driverfuncs.c \
mm.c \
utils.c \
texmem.c \
vblank.c \
xmlconfig.c \
dri_util.c
RADEON_COMMON_SOURCES = \
radeon_bo_legacy.c \
radeon_common_context.c \
radeon_buffer_objects.c \
radeon_common.c \
radeon_cs_legacy.c \
radeon_dma.c \
radeon_debug.c \
radeon_fbo.c \
radeon_lock.c \
radeon_mipmap_tree.c \
radeon_span.c \
radeon_texture.c \
radeon_queryobj.c \
radeon_tex_copy.c
DRIVER_SOURCES = \
radeon_screen.c \
r600_context.c \
r600_cmdbuf.c \
r600_emit.c \
r700_assembler.c \
r700_fragprog.c \
r700_vertprog.c \
r700_shader.c \
r700_shaderinst.c \
r700_ioctl.c \
r700_oglprog.c \
r700_chip.c \
r700_state.c \
r700_clear.c \
r700_render.c \
r600_tex.c \
r600_texstate.c \
r600_blit.c \
r700_debug.c \
$(RADEON_COMMON_SOURCES) \
$(EGL_SOURCES) \
$(CS_SOURCES)
SRCS = $(COMMON_SOURCES) $(DRIVER_SOURCES)
DRIVER_DEFINES = -DRADEON_R600 \
-I$(MESA)/drivers/dri/r600 \
-I$(MESA)/drivers/dri/r600/server \
-I$(MESA)/drivers/dri/radeon \
-I$(MESA)/drivers/dri/radeon/server
.include <bsd.xorg.mk>
.PATH: $(MESA)/drivers/dri/r600
.PATH: $(MESA)/drivers/dri/radeon

View File

@ -1,29 +1,50 @@
# $OpenBSD: Makefile,v 1.1 2007/12/04 22:00:27 matthieu Exp $ # $OpenBSD: Makefile,v 1.2 2010/05/22 20:14:15 matthieu Exp $
LIB= radeon_dri.so LIB= radeon_dri.so
CS_SOURCES = \
radeon_cs_space_drm.c \
radeon_bo.c \
radeon_cs.c
RADEON_COMMON_SOURCES = \
radeon_bo_legacy.c \
radeon_common_context.c \
radeon_common.c \
radeon_cs_legacy.c \
radeon_dma.c \
radeon_debug.c \
radeon_fbo.c \
radeon_lock.c \
radeon_mipmap_tree.c \
radeon_queryobj.c \
radeon_span.c \
radeon_texture.c \
radeon_tex_copy.c
DRIVER_SOURCES = \ DRIVER_SOURCES = \
radeon_context.c \ radeon_context.c \
radeon_ioctl.c \ radeon_ioctl.c \
radeon_lock.c \
radeon_screen.c \ radeon_screen.c \
radeon_state.c \ radeon_state.c \
radeon_state_init.c \ radeon_state_init.c \
radeon_tex.c \ radeon_tex.c \
radeon_texmem.c \
radeon_texstate.c \ radeon_texstate.c \
radeon_tcl.c \ radeon_tcl.c \
radeon_swtcl.c \ radeon_swtcl.c \
radeon_span.c \
radeon_maos.c \ radeon_maos.c \
radeon_sanity.c radeon_sanity.c \
radeon_blit.c \
$(RADEON_COMMON_SOURCES)
SRCS = \ SRCS = \
$(COMMON_SOURCES) \ $(COMMON_SOURCES) \
$(DRIVER_SOURCES) $(DRIVER_SOURCES) \
$(CS_SOURCES)
DRIVER_DEFINES = -DRADEON_COMMON=0 \ DRIVER_DEFINES = -DRADEON_R100 -DRADEON_COMMON=0 \
-I$(MESA)/drivers/dri/radeon/server -I$(MESA)/drivers/dri/radeon/server \
-I$(MESA)/drivers/dri/radeon
.include <bsd.xorg.mk> .include <bsd.xorg.mk>

View File

@ -1,8 +1,8 @@
# $OpenBSD: Makefile,v 1.2 2008/11/05 07:18:25 todd Exp $ # $OpenBSD: Makefile,v 1.3 2010/05/22 20:14:15 matthieu Exp $
LIB= swrast_dri.so LIB= swrast_dri.so
.if ${MACHINE} == "sparc" .if ${MACHINE_ARCH} == "sparc"
PICFLAG = -fPIC PICFLAG = -fPIC
.endif .endif

7
lib/libGL/glsl/Makefile Normal file
View File

@ -0,0 +1,7 @@
# $OpenBSD: Makefile,v 1.1 2010/05/22 20:14:15 matthieu Exp $
SUBDIR= pp cl apps
build depend all install clean cleandir: _SUBDIRUSE
.include <bsd.xorg.mk>

View File

@ -0,0 +1,37 @@
# $OpenBSD: Makefile.inc,v 1.1 2010/05/22 20:14:15 matthieu Exp $
.if ${MACHINE_ARCH} == powerpc || ${MACHINE_ARCH} == sparc
PICFLAG=-fPIC
.endif
OBJS = ${C_SOURCES:.c=.so}
CPPFLAGS = \
-I${.CURDIR} ${LIBRARY_INCLUDES}
all: ${LIB}_pic.a
${LIB}_pic.a: ${OBJS} $(DPADD)
@rm -f ${LIB}_pic.a
@${AR} cq ${LIB}_pic.a `${LORDER} ${OBJS} | tsort -q`
${RANLIB} ${LIB}_pic.a
clean:
rm -f ${LIB}_pic.a ${OBJS}
cleandir: clean
install:
@echo "noting to install"
.SUFFIXES:
.SUFFIXES: .a .c .o .so
.c.so:
${COMPILE.c} ${PICFLAG} -DPIC ${.IMPSRC} -o ${.TARGET}.o
@${LD} -X -r ${.TARGET}.o -o ${.TARGET}
@rm -f ${.TARGET}.o
.include <bsd.dep.mk>

View File

@ -0,0 +1,37 @@
# $OpenBSD: Makefile,v 1.1 2010/05/22 20:14:15 matthieu Exp $
TOP= ${.CURDIR}/../../../../dist/Mesa
LIBS = \
../pp/libglslpp_pic.a \
../cl/libglslcl_pic.a
SOURCES = \
compile.c \
process.c \
purify.c \
tokenise.c \
version.c
APPS = $(SOURCES:%.c=%)
CPPFLAGS = -I${.CURDIR}
.SUFFIXES:
.SUFFIXES: .c
.c:
${CC} ${LDFLAGS} -o ${.TARGET} ${.IMPSRC} ${LIBS}
all: ${APPS}
install:
clean:
rm -f ${APPS}
cleandir: clean
.include <bsd.xorg.mk>
.PATH: ${TOP}/src/glsl/apps

View File

@ -0,0 +1,15 @@
# $OpenBSD: Makefile,v 1.1 2010/05/22 20:14:15 matthieu Exp $
TOP= ${.CURDIR}/../../../../dist/Mesa
C_SOURCES = \
sl_cl_parse.c
LIB= libglslcl
test:
@echo ${.OBJDIR}
.include <bsd.xorg.mk>
.PATH: ${TOP}/src/glsl/cl

View File

@ -0,0 +1,26 @@
# $OpenBSD: Makefile,v 1.1 2010/05/22 20:14:15 matthieu Exp $
TOP= ${.CURDIR}/../../../../dist/Mesa
C_SOURCES= \
sl_pp_context.c \
sl_pp_define.c \
sl_pp_dict.c \
sl_pp_error.c \
sl_pp_expression.c \
sl_pp_extension.c \
sl_pp_if.c \
sl_pp_line.c \
sl_pp_macro.c \
sl_pp_pragma.c \
sl_pp_process.c \
sl_pp_purify.c \
sl_pp_token.c \
sl_pp_token_util.c \
sl_pp_version.c
LIB= libglslpp
.include <bsd.xorg.mk>
.PATH: ${TOP}/src/glsl/pp

View File

@ -1,8 +1,10 @@
# $OpenBSD: Makefile,v 1.9 2010/02/03 12:44:10 matthieu Exp $ # $OpenBSD: Makefile,v 1.10 2010/05/22 20:14:15 matthieu Exp $
MESA= ${.CURDIR}/../../../dist/Mesa/src/mesa MESA= ${.CURDIR}/../../../dist/Mesa/src/mesa
MESA_INCLUDE= ${.CURDIR}/../../../dist/Mesa/include MESA_INCLUDE= ${.CURDIR}/../../../dist/Mesa/include
SUBDIR = shader/slang/library
CPP= cpp -notraditional CPP= cpp -notraditional
CPPFLAGS+= \ CPPFLAGS+= \
@ -17,6 +19,7 @@ CPPFLAGS+= \
-I${MESA}/shader \ -I${MESA}/shader \
-I${MESA}/shader/grammar \ -I${MESA}/shader/grammar \
-I${MESA}/shader/slang \ -I${MESA}/shader/slang \
-I${.OBJDIR}/shader/slang \
-I${X11BASE}/include \ -I${X11BASE}/include \
-I/usr/include/dev/pci/drm \ -I/usr/include/dev/pci/drm \
-DGLX_INDIRECT_RENDERING \ -DGLX_INDIRECT_RENDERING \
@ -56,8 +59,10 @@ MAIN_SOURCES= \
clear.c \ clear.c \
clip.c \ clip.c \
colortab.c \ colortab.c \
condrender.c \
context.c \ context.c \
convolve.c \ convolve.c \
cpuinfo.c \
debug.c \ debug.c \
depth.c \ depth.c \
depthstencil.c \ depthstencil.c \
@ -73,6 +78,7 @@ MAIN_SOURCES= \
feedback.c \ feedback.c \
ffvertex_prog.c \ ffvertex_prog.c \
fog.c \ fog.c \
formats.c \
framebuffer.c \ framebuffer.c \
get.c \ get.c \
getstring.c \ getstring.c \
@ -95,18 +101,23 @@ MAIN_SOURCES= \
rastpos.c \ rastpos.c \
rbadaptors.c \ rbadaptors.c \
readpix.c \ readpix.c \
remap.c \
renderbuffer.c \ renderbuffer.c \
scissor.c \ scissor.c \
shaders.c \ shaders.c \
shared.c \
state.c \ state.c \
stencil.c \ stencil.c \
syncobj.c \
texcompress.c \ texcompress.c \
texcompress_s3tc.c \ texcompress_s3tc.c \
texcompress_fxt1.c \ texcompress_fxt1.c \
texenv.c \ texenv.c \
texenvprogram.c \ texenvprogram.c \
texfetch.c \
texformat.c \ texformat.c \
texgen.c \ texgen.c \
texgetimage.c \
teximage.c \ teximage.c \
texobj.c \ texobj.c \
texparam.c \ texparam.c \
@ -114,6 +125,8 @@ MAIN_SOURCES= \
texstate.c \ texstate.c \
texstore.c \ texstore.c \
varray.c \ varray.c \
version.c \
viewport.c \
vtxfmt.c vtxfmt.c
# math # math
@ -137,7 +150,7 @@ SWRAST_SOURCES= \
s_bitmap.c \ s_bitmap.c \
s_blend.c \ s_blend.c \
s_blit.c \ s_blit.c \
s_buffers.c \ s_clear.c \
s_copypix.c \ s_copypix.c \
s_context.c \ s_context.c \
s_depth.c \ s_depth.c \
@ -145,7 +158,6 @@ SWRAST_SOURCES= \
s_feedback.c \ s_feedback.c \
s_fog.c \ s_fog.c \
s_fragprog.c \ s_fragprog.c \
s_imaging.c \
s_lines.c \ s_lines.c \
s_logic.c \ s_logic.c \
s_masking.c \ s_masking.c \
@ -155,7 +167,6 @@ SWRAST_SOURCES= \
s_stencil.c \ s_stencil.c \
s_texcombine.c \ s_texcombine.c \
s_texfilter.c \ s_texfilter.c \
s_texstore.c \
s_triangle.c \ s_triangle.c \
s_zoom.c s_zoom.c
@ -206,21 +217,26 @@ SHADER_SOURCES= \
arbprogparse.c \ arbprogparse.c \
arbprogram.c \ arbprogram.c \
atifragshader.c \ atifragshader.c \
grammar_mesa.c \ hash_table.c \
lex.yy.c \
nvfragparse.c \ nvfragparse.c \
nvprogram.c \ nvprogram.c \
nvvertparse.c \ nvvertparse.c \
program.c \ program.c \
program_parse.tab.c \
program_parse_extra.c \
prog_cache.c \ prog_cache.c \
prog_debug.c \
prog_execute.c \ prog_execute.c \
prog_instruction.c \ prog_instruction.c \
prog_noise.c \ prog_noise.c \
prog_optimize.c \
prog_parameter.c \ prog_parameter.c \
prog_parameter_layout.c \
prog_print.c \ prog_print.c \
prog_statevars.c \ prog_statevars.c \
prog_uniform.c \ prog_uniform.c \
programopt.c \ programopt.c \
symbol_table.c \
shader_api.c shader_api.c
# shader/slang # shader/slang
@ -238,7 +254,6 @@ SLANG_SOURCES= \
slang_link.c \ slang_link.c \
slang_log.c \ slang_log.c \
slang_mem.c \ slang_mem.c \
slang_preprocess.c \
slang_print.c \ slang_print.c \
slang_simplify.c \ slang_simplify.c \
slang_storage.c \ slang_storage.c \
@ -249,7 +264,7 @@ SLANG_SOURCES= \
.if ${MACHINE_ARCH} == i386 .if ${MACHINE_ARCH} == i386
ASM_C_SOURCES= \ ASM_C_SOURCES= \
common_x86.c \ common_x86.c \
x86.c \ x86_xform.c \
3dnow.c \ 3dnow.c \
sse.c \ sse.c \
x86sse.c x86sse.c
@ -294,7 +309,8 @@ ASM_C_SOURCES= \
.endif .endif
COMMON_DRIVER_SOURCES = \ COMMON_DRIVER_SOURCES = \
driverfuncs.c driverfuncs.c \
meta.c
MESA_SOURCES = \ MESA_SOURCES = \
$(MAIN_SOURCES) \ $(MAIN_SOURCES) \
@ -315,14 +331,14 @@ OBJS+= ${SRCS:N*.h:R:S/$/.so/g}
LIB= libmesa LIB= libmesa
all: ${LIB}_pic.a all: _SUBDIRUSE ${LIB}_pic.a
obj: _xenocara_obj obj: _xenocara_obj
install: install:
@echo "Not installing libmesa" @echo "Not installing libmesa"
clean: clean: _SUBDIRUSE
rm -f ${LIB}_pic.a ${OBJS} $(CLEANFILES) rm -f ${LIB}_pic.a ${OBJS} $(CLEANFILES)
cleandir: clean cleandir: clean
@ -409,8 +425,9 @@ x86_xform4.so: matypes.h
.PATH: ${MESA}/vbo .PATH: ${MESA}/vbo
.PATH: ${MESA}/drivers/common .PATH: ${MESA}/drivers/common
.include <bsd.xorg.mk> .include <bsd.xorg.mk>
.if ${MACHINE} == sparc .if ${MACHINE_ARCH} == powerpc || ${MACHINE_ARCH} == sparc
PICFLAG=-fPIC PICFLAG=-fPIC
.endif .endif

View File

@ -0,0 +1,45 @@
# $OpenBSD: Makefile,v 1.1 2010/05/22 20:14:15 matthieu Exp $
TOP = ${.CURDIR}/../../../../../../dist/Mesa
GLSL_CL = ../../../../glsl/apps/compile
d = ${TOP}/src/mesa/shader/slang/library
#
# builtin library sources
#
BUILTIN = slang_common_builtin_gc.h slang_core_gc.h slang_fragment_builtin_gc.h slang_vertex_builtin_gc.h
BUILTIN += slang_120_core_gc.h slang_builtin_120_common_gc.h slang_builtin_120_fragment_gc.h
all: ${BUILTIN}
clean:
rm -f *_gc.h
install:
slang_120_core_gc.h: ${d}/slang_120_core.gc
$(GLSL_CL) fragment ${d}/slang_120_core.gc slang_120_core_gc.h
slang_builtin_120_common_gc.h: ${d}/slang_builtin_120_common.gc
$(GLSL_CL) fragment ${d}/slang_builtin_120_common.gc slang_builtin_120_common_gc.h
slang_builtin_120_fragment_gc.h: ${d}/slang_builtin_120_fragment.gc
$(GLSL_CL) fragment ${d}/slang_builtin_120_fragment.gc slang_builtin_120_fragment_gc.h
slang_common_builtin_gc.h: ${d}/slang_common_builtin.gc
$(GLSL_CL) fragment ${d}/slang_common_builtin.gc slang_common_builtin_gc.h
slang_core_gc.h: ${d}/slang_core.gc
$(GLSL_CL) fragment ${d}/slang_core.gc slang_core_gc.h
slang_fragment_builtin_gc.h: ${d}/slang_fragment_builtin.gc
$(GLSL_CL) fragment ${d}/slang_fragment_builtin.gc slang_fragment_builtin_gc.h
slang_vertex_builtin_gc.h: ${d}/slang_vertex_builtin.gc
$(GLSL_CL) vertex ${d}/slang_vertex_builtin.gc slang_vertex_builtin_gc.h
.include <bsd.xorg.mk>

View File

@ -1,2 +1,2 @@
major=9 major=10
minor=1 minor=0