build fixes for Mesa 7.7.1. introduce r600 driver!
This commit is contained in:
parent
7f287d45d8
commit
3172c38b29
12
external/mit/xorg/lib/dri/Makefile
vendored
12
external/mit/xorg/lib/dri/Makefile
vendored
@ -1,16 +1,16 @@
|
||||
# $NetBSD: Makefile,v 1.13 2009/08/27 04:36:40 mrg Exp $
|
||||
# $NetBSD: Makefile,v 1.14 2010/05/23 21:31:52 mrg Exp $
|
||||
|
||||
SUBDIR= libmesa .WAIT
|
||||
|
||||
.if ${MACHINE_ARCH} == "alpha"
|
||||
SUBDIR+= mach64 mga r128 r200 r300 radeon s3v savage sis tdfx trident
|
||||
SUBDIR+= mach64 mga r128 r200 r300 r600 radeon savage sis tdfx
|
||||
.elif ${MACHINE} == "macppc"
|
||||
SUBDIR+= mach64 mga r128 r200 r300 radeon tdfx
|
||||
SUBDIR+= mach64 mga r128 r200 r300 r600 radeon tdfx
|
||||
.elif ${MACHINE_ARCH} == "sparc64" || ${MACHINE_ARCH} == "sparc"
|
||||
SUBDIR+= mach64 mga r128 r200 r300 radeon
|
||||
SUBDIR+= mach64 mga r128 r200 r300 r600 radeon
|
||||
.elif ${MACHINE_ARCH} == "i386" || ${MACHINE_ARCH} == "x86_64"
|
||||
SUBDIR+= i810 i915 i965 mach64 mga r128 r200 r300 radeon s3v \
|
||||
savage sis tdfx trident unichrome
|
||||
SUBDIR+= i810 i915 i965 mach64 mga r128 r200 r300 r600 radeon \
|
||||
savage sis tdfx unichrome
|
||||
.endif
|
||||
|
||||
SUBDIR+= swrast
|
||||
|
3
external/mit/xorg/lib/dri/dri.mk
vendored
3
external/mit/xorg/lib/dri/dri.mk
vendored
@ -1,4 +1,4 @@
|
||||
# $NetBSD: dri.mk,v 1.9 2010/05/22 22:43:57 mrg Exp $
|
||||
# $NetBSD: dri.mk,v 1.10 2010/05/23 21:31:52 mrg Exp $
|
||||
|
||||
# XXX DRI_LIB_DEPS
|
||||
|
||||
@ -33,6 +33,7 @@ CPPFLAGS+= -Wno-stack-protector
|
||||
SRCS+= driverfuncs.c utils.c
|
||||
.else
|
||||
SRCS+= dri_util.c drirenderbuffer.c driverfuncs.c texmem.c
|
||||
SRCS+= dri_metaops.c
|
||||
SRCS+= utils.c vblank.c xmlconfig.c
|
||||
.endif
|
||||
|
||||
|
12
external/mit/xorg/lib/dri/i915/Makefile
vendored
12
external/mit/xorg/lib/dri/i915/Makefile
vendored
@ -1,4 +1,4 @@
|
||||
# $NetBSD: Makefile,v 1.8 2010/05/22 22:44:16 mrg Exp $
|
||||
# $NetBSD: Makefile,v 1.9 2010/05/23 21:31:52 mrg Exp $
|
||||
|
||||
MODULE= i915
|
||||
|
||||
@ -12,7 +12,6 @@ SRCS= \
|
||||
i830_metaops.c \
|
||||
i830_state.c \
|
||||
i830_texblend.c \
|
||||
i830_tex.c \
|
||||
i830_texstate.c \
|
||||
i830_vtbl.c \
|
||||
intel_render.c \
|
||||
@ -20,8 +19,8 @@ SRCS= \
|
||||
intel_buffer_objects.c \
|
||||
intel_batchbuffer.c \
|
||||
intel_clear.c \
|
||||
intel_extensions.c \
|
||||
intel_mipmap_tree.c \
|
||||
i915_tex_layout.c \
|
||||
intel_tex_layout.c \
|
||||
intel_tex_image.c \
|
||||
intel_tex_subimage.c \
|
||||
@ -37,7 +36,7 @@ SRCS= \
|
||||
intel_buffers.c \
|
||||
intel_blit.c \
|
||||
intel_swapbuffers.c \
|
||||
i915_tex.c \
|
||||
i915_tex_layout.c \
|
||||
i915_texstate.c \
|
||||
i915_context.c \
|
||||
i915_debug.c \
|
||||
@ -52,9 +51,9 @@ SRCS= \
|
||||
intel_screen.c \
|
||||
intel_span.c \
|
||||
intel_state.c \
|
||||
intel_syncobj.c \
|
||||
intel_tris.c \
|
||||
intel_fbo.c \
|
||||
intel_depthstencil.c
|
||||
intel_fbo.c
|
||||
|
||||
CPPFLAGS+= -DI915 -DDRM_VBLANK_FLIP=DRM_VBLANK_FLIP
|
||||
|
||||
@ -62,5 +61,6 @@ LIBDPLIBS+= drm_intel ${.CURDIR}/../../libdrm_intel
|
||||
|
||||
COPTS.intel_context.c+= -Wno-error # XXX
|
||||
COPTS.intel_swapbuffers.c+= -Wno-error # XXX
|
||||
COPTS.intel_tex.c+= -Wno-error # XXX
|
||||
|
||||
.include "${.CURDIR}/../dri.mk"
|
||||
|
9
external/mit/xorg/lib/dri/i965/Makefile
vendored
9
external/mit/xorg/lib/dri/i965/Makefile
vendored
@ -1,4 +1,4 @@
|
||||
# $NetBSD: Makefile,v 1.10 2010/05/22 22:44:16 mrg Exp $
|
||||
# $NetBSD: Makefile,v 1.11 2010/05/23 21:31:52 mrg Exp $
|
||||
|
||||
MODULE= i965
|
||||
|
||||
@ -16,7 +16,7 @@ SRCS= \
|
||||
intel_clear.c \
|
||||
intel_context.c \
|
||||
intel_decode.c \
|
||||
intel_depthstencil.c \
|
||||
intel_extensions.c \
|
||||
intel_fbo.c \
|
||||
intel_mipmap_tree.c \
|
||||
intel_regions.c \
|
||||
@ -26,8 +26,10 @@ SRCS= \
|
||||
intel_pixel_bitmap.c \
|
||||
intel_pixel_copy.c \
|
||||
intel_pixel_draw.c \
|
||||
intel_pixel_read.c \
|
||||
intel_state.c \
|
||||
intel_swapbuffers.c \
|
||||
intel_syncobj.c \
|
||||
intel_tex.c \
|
||||
intel_tex_copy.c \
|
||||
intel_tex_format.c \
|
||||
@ -45,6 +47,7 @@ SRCS= \
|
||||
brw_clip_util.c \
|
||||
brw_context.c \
|
||||
brw_curbe.c \
|
||||
brw_disasm.c \
|
||||
brw_draw.c \
|
||||
brw_draw_upload.c \
|
||||
brw_eu.c \
|
||||
@ -73,6 +76,7 @@ SRCS= \
|
||||
brw_vs_constval.c \
|
||||
brw_vs_emit.c \
|
||||
brw_vs_state.c \
|
||||
brw_vs_surface_state.c \
|
||||
brw_vtbl.c \
|
||||
brw_wm.c \
|
||||
brw_wm_debug.c \
|
||||
@ -93,5 +97,6 @@ LIBDPLIBS+= drm_intel ${.CURDIR}/../../libdrm_intel
|
||||
|
||||
COPTS.intel_context.c+= -Wno-error # XXX
|
||||
COPTS.intel_swapbuffers.c+= -Wno-error # XXX
|
||||
COPTS.intel_tex.c+= -Wno-error # XXX
|
||||
|
||||
.include "${.CURDIR}/../dri.mk"
|
||||
|
10
external/mit/xorg/lib/dri/libmesa/Makefile
vendored
10
external/mit/xorg/lib/dri/libmesa/Makefile
vendored
@ -1,4 +1,4 @@
|
||||
# $NetBSD: Makefile,v 1.6 2010/05/23 01:59:12 mrg Exp $
|
||||
# $NetBSD: Makefile,v 1.7 2010/05/23 21:31:52 mrg Exp $
|
||||
|
||||
.include <bsd.own.mk>
|
||||
|
||||
@ -7,7 +7,7 @@ LIBISMODULE= yes
|
||||
|
||||
SHLIB_MAJOR= 0
|
||||
|
||||
MESA_SRC_MODULES= glapi main math vbo tnl shader swrast slang ss
|
||||
MESA_SRC_MODULES= glapi main math vbo tnl shader swrast slang ss common
|
||||
|
||||
CPPFLAGS+= -I${X11SRCDIR.MesaLib}/src/mesa/main \
|
||||
-I${X11SRCDIR.MesaLib}/src/mesa/glapi \
|
||||
@ -17,9 +17,11 @@ CPPFLAGS+= -I${X11SRCDIR.MesaLib}/src/mesa/main \
|
||||
-I${X11SRCDIR.MesaLib}/include \
|
||||
-I${DESTDIR}${X11INCDIR}/X11
|
||||
|
||||
|
||||
CPPFLAGS+= ${X11FLAGS.THREADLIB} \
|
||||
-DPTHREADS -D_NETBSD_SOURCE -DUSE_EXTERNAL_DXTN_LIB=1 \
|
||||
-DHAVE_ALIAS
|
||||
-DHAVE_ALIAS -DIN_DRI_DRIVER
|
||||
#CPPFLAGS+= -DGLX_DIRECT_RENDERING -DGLX_INDIRECT_RENDERING -DHAVE_POSIX_MEMALIGN
|
||||
CFLAGS+= -pthread
|
||||
|
||||
.include "../../libOSMesa/libmesa.mk"
|
||||
@ -28,4 +30,6 @@ CFLAGS+= -pthread
|
||||
|
||||
LIBDIR= ${X11USRLIBDIR}/modules/dri
|
||||
|
||||
#LIBDPLIBS+= GL ${.CURDIR}/../../libGL
|
||||
|
||||
.include <bsd.lib.mk>
|
||||
|
42
external/mit/xorg/lib/dri/r200/Makefile
vendored
42
external/mit/xorg/lib/dri/r200/Makefile
vendored
@ -1,18 +1,48 @@
|
||||
# $NetBSD: Makefile,v 1.4 2009/06/11 01:47:08 mrg Exp $
|
||||
# $NetBSD: Makefile,v 1.5 2010/05/23 21:31:53 mrg Exp $
|
||||
|
||||
MODULE= r200
|
||||
|
||||
CPPFLAGS+= -DRADEON_COMMON=1 -DRADEON_COMMON_FOR_R200
|
||||
CPPFLAGS+= -DRADEON_COMMON=1 -DRADEON_COMMON_FOR_R200 -DRADEON_R200
|
||||
CPPFLAGS+= -DHAVE_LIBDRM_RADEON
|
||||
|
||||
CPPFLAGS+= -I${X11SRCDIR.MesaLib}/src/mesa/drivers/dri/r200 \
|
||||
-I${X11SRCDIR.MesaLib}/src/mesa/drivers/dri/radeon \
|
||||
-I${X11SRCDIR.MesaLib}/src/mesa/drivers/dri/radeon/server
|
||||
|
||||
DRI_EXTRA_PATHS= ${X11SRCDIR.MesaLib}/src/mesa/drivers/dri/radeon
|
||||
SRCS= 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
|
||||
SRCS= \
|
||||
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 \
|
||||
r200_context.c \
|
||||
r200_ioctl.c \
|
||||
r200_state.c \
|
||||
r200_state_init.c \
|
||||
r200_cmdbuf.c \
|
||||
r200_pixel.c \
|
||||
r200_tex.c \
|
||||
r200_texstate.c \
|
||||
r200_tcl.c \
|
||||
r200_swtcl.c \
|
||||
r200_maos.c \
|
||||
r200_sanity.c \
|
||||
r200_fragshader.c \
|
||||
r200_vertprog.c \
|
||||
radeon_screen.c
|
||||
|
||||
SRCS+= \
|
||||
radeon_cs_space_drm.c \
|
||||
radeon_bo.c \
|
||||
radeon_cs.c
|
||||
|
||||
# XXX
|
||||
.if ${MACHINE_ARCH} == "sparc64"
|
||||
|
46
external/mit/xorg/lib/dri/r300/Makefile
vendored
46
external/mit/xorg/lib/dri/r300/Makefile
vendored
@ -1,9 +1,11 @@
|
||||
# $NetBSD: Makefile,v 1.3 2009/06/11 01:47:08 mrg Exp $
|
||||
# $NetBSD: Makefile,v 1.4 2010/05/23 21:31:53 mrg Exp $
|
||||
|
||||
MODULE= r300
|
||||
|
||||
CPPFLAGS+= -DCOMPILE_R300 -DR200_MERGED=0 \
|
||||
-DRADEON_COMMON=1 -DRADEON_COMMON_FOR_R300
|
||||
-DRADEON_COMMON=1 -DRADEON_COMMON_FOR_R300 \
|
||||
-DRADEON_R300
|
||||
CPPFLAGS+= -DHAVE_LIBDRM_RADEON
|
||||
|
||||
CPPFLAGS+= -I${X11SRCDIR.MesaLib}/src/mesa/drivers/dri/r300 \
|
||||
-I${X11SRCDIR.MesaLib}/src/mesa/drivers/dri/radeon \
|
||||
@ -11,35 +13,45 @@ CPPFLAGS+= -I${X11SRCDIR.MesaLib}/src/mesa/drivers/dri/r300 \
|
||||
|
||||
DRI_EXTRA_PATHS= ${X11SRCDIR.MesaLib}/src/mesa/drivers/dri/radeon
|
||||
SRCS= \
|
||||
radeon_screen.c \
|
||||
radeon_context.c \
|
||||
radeon_ioctl.c \
|
||||
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_state.c \
|
||||
r300_mem.c \
|
||||
radeon_queryobj.c \
|
||||
radeon_texture.c \
|
||||
radeon_screen.c \
|
||||
r300_context.c \
|
||||
r300_draw.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.c \
|
||||
r300_fragprog_swizzle.c \
|
||||
r300_fragprog_emit.c \
|
||||
r500_fragprog.c \
|
||||
r500_fragprog_emit.c \
|
||||
r300_fragprog_common.c \
|
||||
r300_shader.c \
|
||||
radeon_mesa_to_rc.c \
|
||||
r300_emit.c \
|
||||
r300_swtcl.c
|
||||
|
||||
SRCS+= \
|
||||
radeon_cs_space_drm.c \
|
||||
radeon_bo.c \
|
||||
radeon_cs.c
|
||||
|
||||
# ../common/mm.c \
|
||||
# ../common/vblank.c \
|
||||
# ../common/xmlconfig.c \
|
||||
# ../common/dri_util.c \
|
||||
|
||||
COPTS.radeon_screen.c= -Wno-error # XXX const
|
||||
|
||||
.include "${.CURDIR}/../dri.mk"
|
||||
|
53
external/mit/xorg/lib/dri/r600/Makefile
vendored
Normal file
53
external/mit/xorg/lib/dri/r600/Makefile
vendored
Normal file
@ -0,0 +1,53 @@
|
||||
# $NetBSD: Makefile,v 1.1 2010/05/23 21:31:53 mrg Exp $
|
||||
|
||||
MODULE= r600
|
||||
|
||||
CPPFLAGS+= -DRADEON_COMMON=1 -DRADEON_R600
|
||||
CPPFLAGS+= -DHAVE_LIBDRM_RADEON
|
||||
|
||||
CPPFLAGS+= -I${X11SRCDIR.MesaLib}/src/mesa/drivers/dri/r600 \
|
||||
-I${X11SRCDIR.MesaLib}/src/mesa/drivers/dri/radeon \
|
||||
-I${X11SRCDIR.MesaLib}/src/mesa/drivers/dri/radeon/server
|
||||
|
||||
DRI_EXTRA_PATHS= ${X11SRCDIR.MesaLib}/src/mesa/drivers/dri/radeon
|
||||
SRCS= \
|
||||
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_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 \
|
||||
r700_debug.c
|
||||
|
||||
SRCS+= \
|
||||
radeon_cs_space_drm.c \
|
||||
radeon_bo.c \
|
||||
radeon_cs.c
|
||||
|
||||
COPTS.radeon_screen.c= -Wno-error # XXX const
|
||||
|
||||
.include "${.CURDIR}/../dri.mk"
|
40
external/mit/xorg/lib/dri/radeon/Makefile
vendored
40
external/mit/xorg/lib/dri/radeon/Makefile
vendored
@ -1,13 +1,41 @@
|
||||
# $NetBSD: Makefile,v 1.4 2009/06/11 01:47:08 mrg Exp $
|
||||
# $NetBSD: Makefile,v 1.5 2010/05/23 21:31:53 mrg Exp $
|
||||
|
||||
MODULE= radeon
|
||||
|
||||
CPPFLAGS+= -DRADEON_COMMON=0
|
||||
CPPFLAGS+= -DRADEON_COMMON=0 -DRADEON_R100
|
||||
CPPFLAGS+= -DHAVE_LIBDRM_RADEON
|
||||
|
||||
SRCS= 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
|
||||
CPPFLAGS+= -I${X11SRCDIR.MesaLib}/src/mesa/drivers/dri/radeon
|
||||
|
||||
SRCS= \
|
||||
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_context.c \
|
||||
radeon_ioctl.c \
|
||||
radeon_screen.c \
|
||||
radeon_state.c \
|
||||
radeon_state_init.c \
|
||||
radeon_tex.c \
|
||||
radeon_texstate.c \
|
||||
radeon_tcl.c \
|
||||
radeon_swtcl.c \
|
||||
radeon_maos.c \
|
||||
radeon_sanity.c \
|
||||
|
||||
SRCS+= \
|
||||
radeon_cs_space_drm.c \
|
||||
radeon_bo.c \
|
||||
radeon_cs.c
|
||||
|
||||
# XXX
|
||||
.if ${MACHINE_ARCH} == "sparc64"
|
||||
|
273
external/mit/xorg/lib/libGL/Makefile.mesa
vendored
273
external/mit/xorg/lib/libGL/Makefile.mesa
vendored
@ -1,77 +1,86 @@
|
||||
|
||||
SRCS.mesa= api_arrayelt.c \
|
||||
api_exec.c \
|
||||
api_loopback.c \
|
||||
api_noop.c \
|
||||
api_validate.c \
|
||||
accum.c \
|
||||
attrib.c \
|
||||
arrayobj.c \
|
||||
blend.c \
|
||||
bufferobj.c \
|
||||
buffers.c \
|
||||
clear.c \
|
||||
clip.c \
|
||||
colortab.c \
|
||||
context.c \
|
||||
convolve.c \
|
||||
debug.c \
|
||||
depth.c \
|
||||
depthstencil.c \
|
||||
dlist.c \
|
||||
dlopen.c \
|
||||
drawpix.c \
|
||||
enable.c \
|
||||
enums.c \
|
||||
MESAeval.c \
|
||||
execmem.c \
|
||||
extensions.c \
|
||||
fbobject.c \
|
||||
feedback.c \
|
||||
ffvertex_prog.c \
|
||||
fog.c \
|
||||
framebuffer.c \
|
||||
get.c \
|
||||
getstring.c \
|
||||
hash.c \
|
||||
hint.c \
|
||||
histogram.c \
|
||||
image.c \
|
||||
imports.c \
|
||||
light.c \
|
||||
lines.c \
|
||||
matrix.c \
|
||||
mipmap.c \
|
||||
mm.c \
|
||||
multisample.c \
|
||||
MESApixel.c \
|
||||
pixelstore.c \
|
||||
points.c \
|
||||
polygon.c \
|
||||
queryobj.c \
|
||||
rastpos.c \
|
||||
rbadaptors.c \
|
||||
readpix.c \
|
||||
renderbuffer.c \
|
||||
scissor.c \
|
||||
shaders.c \
|
||||
state.c \
|
||||
stencil.c \
|
||||
texcompress.c \
|
||||
texcompress_s3tc.c \
|
||||
texcompress_fxt1.c \
|
||||
texenv.c \
|
||||
texenvprogram.c \
|
||||
texformat.c \
|
||||
texgen.c \
|
||||
teximage.c \
|
||||
texobj.c \
|
||||
texparam.c \
|
||||
texrender.c \
|
||||
texstate.c \
|
||||
texstore.c \
|
||||
varray.c \
|
||||
vtxfmt.c
|
||||
SRCS.mesa= \
|
||||
api_arrayelt.c \
|
||||
api_exec.c \
|
||||
api_loopback.c \
|
||||
api_noop.c \
|
||||
api_validate.c \
|
||||
accum.c \
|
||||
attrib.c \
|
||||
arrayobj.c \
|
||||
blend.c \
|
||||
bufferobj.c \
|
||||
buffers.c \
|
||||
clear.c \
|
||||
clip.c \
|
||||
colortab.c \
|
||||
context.c \
|
||||
convolve.c \
|
||||
cpuinfo.c \
|
||||
debug.c \
|
||||
depth.c \
|
||||
depthstencil.c \
|
||||
dlist.c \
|
||||
dlopen.c \
|
||||
drawpix.c \
|
||||
enable.c \
|
||||
enums.c \
|
||||
eval.c \
|
||||
execmem.c \
|
||||
extensions.c \
|
||||
fbobject.c \
|
||||
feedback.c \
|
||||
ffvertex_prog.c \
|
||||
fog.c \
|
||||
formats.c \
|
||||
framebuffer.c \
|
||||
get.c \
|
||||
getstring.c \
|
||||
hash.c \
|
||||
hint.c \
|
||||
histogram.c \
|
||||
image.c \
|
||||
imports.c \
|
||||
light.c \
|
||||
lines.c \
|
||||
matrix.c \
|
||||
mipmap.c \
|
||||
mm.c \
|
||||
multisample.c \
|
||||
pixel.c \
|
||||
pixelstore.c \
|
||||
points.c \
|
||||
polygon.c \
|
||||
queryobj.c \
|
||||
rastpos.c \
|
||||
rbadaptors.c \
|
||||
readpix.c \
|
||||
remap.c \
|
||||
renderbuffer.c \
|
||||
scissor.c \
|
||||
shaders.c \
|
||||
shared.c \
|
||||
state.c \
|
||||
stencil.c \
|
||||
syncobj.c \
|
||||
texcompress.c \
|
||||
texcompress_s3tc.c \
|
||||
texcompress_fxt1.c \
|
||||
texenv.c \
|
||||
texenvprogram.c \
|
||||
texfetch.c \
|
||||
texformat.c \
|
||||
texgen.c \
|
||||
texgetimage.c \
|
||||
teximage.c \
|
||||
texobj.c \
|
||||
texparam.c \
|
||||
texrender.c \
|
||||
texstate.c \
|
||||
texstore.c \
|
||||
varray.c \
|
||||
viewport.c \
|
||||
vtxfmt.c
|
||||
|
||||
|
||||
# XXX avoid source name clashes with glx
|
||||
@ -83,75 +92,79 @@ BUILDSYMLINKS= ${X11SRCDIR.MesaLib}/src/mesa/main/pixel.c MESApixel.c \
|
||||
|
||||
# math
|
||||
.PATH: ${X11SRCDIR.MesaLib}/src/mesa/math
|
||||
SRCS.math= m_debug_clip.c \
|
||||
m_debug_norm.c \
|
||||
m_debug_xform.c \
|
||||
m_eval.c \
|
||||
m_matrix.c \
|
||||
m_translate.c \
|
||||
m_vector.c \
|
||||
m_xform.c
|
||||
SRCS.math= \
|
||||
m_debug_clip.c \
|
||||
m_debug_norm.c \
|
||||
m_debug_xform.c \
|
||||
m_eval.c \
|
||||
m_matrix.c \
|
||||
m_translate.c \
|
||||
m_vector.c
|
||||
|
||||
SRCS.math+= \
|
||||
m_xform.c
|
||||
|
||||
|
||||
# swrast
|
||||
.PATH: ${X11SRCDIR.MesaLib}/src/mesa/swrast
|
||||
SRCS.swrast= _aaline.c \
|
||||
s_aatriangle.c \
|
||||
s_accum.c \
|
||||
s_alpha.c \
|
||||
s_atifragshader.c \
|
||||
s_bitmap.c \
|
||||
s_blend.c \
|
||||
s_blit.c \
|
||||
s_buffers.c \
|
||||
s_copypix.c \
|
||||
s_context.c \
|
||||
s_depth.c \
|
||||
s_drawpix.c \
|
||||
s_feedback.c \
|
||||
s_fog.c \
|
||||
s_fragprog.c \
|
||||
s_imaging.c \
|
||||
s_lines.c \
|
||||
s_logic.c \
|
||||
s_masking.c \
|
||||
s_points.c \
|
||||
s_readpix.c \
|
||||
s_span.c \
|
||||
s_stencil.c \
|
||||
s_texcombine.c \
|
||||
s_texfilter.c \
|
||||
s_texstore.c \
|
||||
s_triangle.c \
|
||||
s_zoom.c
|
||||
SRCS.swrast= \
|
||||
s_aaline.c \
|
||||
s_aatriangle.c \
|
||||
s_accum.c \
|
||||
s_alpha.c \
|
||||
s_atifragshader.c \
|
||||
s_bitmap.c \
|
||||
s_blend.c \
|
||||
s_blit.c \
|
||||
s_clear.c \
|
||||
s_copypix.c \
|
||||
s_context.c \
|
||||
s_depth.c \
|
||||
s_drawpix.c \
|
||||
s_feedback.c \
|
||||
s_fog.c \
|
||||
s_fragprog.c \
|
||||
s_lines.c \
|
||||
s_logic.c \
|
||||
s_masking.c \
|
||||
s_points.c \
|
||||
s_readpix.c \
|
||||
s_span.c \
|
||||
s_stencil.c \
|
||||
s_texcombine.c \
|
||||
s_texfilter.c \
|
||||
s_triangle.c \
|
||||
s_zoom.c
|
||||
|
||||
|
||||
# swrast_setup
|
||||
.PATH: ${X11SRCDIR.MesaLib}/src/mesa/swrast_setup
|
||||
SRCS.ss= ss_context.c \
|
||||
ss_triangle.c
|
||||
SRCS.ss= \
|
||||
ss_context.c \
|
||||
ss_triangle.c
|
||||
|
||||
|
||||
# tnl
|
||||
.PATH: ${X11SRCDIR.MesaLib}/src/mesa/tnl
|
||||
SRCS.tnl= t_context.c \
|
||||
t_pipeline.c \
|
||||
t_draw.c \
|
||||
t_rasterpos.c \
|
||||
t_vb_program.c \
|
||||
t_vb_render.c \
|
||||
t_vb_texgen.c \
|
||||
t_vb_texmat.c \
|
||||
t_vb_vertex.c \
|
||||
t_vb_cull.c \
|
||||
t_vb_fog.c \
|
||||
t_vb_light.c \
|
||||
t_vb_normals.c
|
||||
t_vb_points.c \
|
||||
t_vp_build.c \
|
||||
t_vertex.c \
|
||||
t_vertex_sse.c \
|
||||
t_vertex_generic.c
|
||||
SRCS.tnl= \
|
||||
t_context.c \
|
||||
t_pipeline.c \
|
||||
t_draw.c \
|
||||
t_rasterpos.c \
|
||||
t_vb_program.c \
|
||||
t_vb_render.c \
|
||||
t_vb_texgen.c \
|
||||
t_vb_texmat.c \
|
||||
t_vb_vertex.c \
|
||||
t_vb_cull.c \
|
||||
t_vb_fog.c \
|
||||
t_vb_light.c \
|
||||
t_vb_normals.c \
|
||||
t_vb_points.c \
|
||||
t_vp_build.c \
|
||||
t_vertex.c \
|
||||
t_vertex_sse.c \
|
||||
t_vertex_generic.c
|
||||
|
||||
|
||||
.for fn in ${SRCS.glx} ${SRCS.dri} ${SRCS.mesa}
|
||||
|
146
external/mit/xorg/lib/libOSMesa/libmesa.mk
vendored
146
external/mit/xorg/lib/libOSMesa/libmesa.mk
vendored
@ -1,4 +1,4 @@
|
||||
# $NetBSD: libmesa.mk,v 1.4 2009/06/16 00:26:11 mrg Exp $
|
||||
# $NetBSD: libmesa.mk,v 1.5 2010/05/23 21:31:53 mrg Exp $
|
||||
#
|
||||
# Consumer of this Makefile should set MESA_SRC_MODULES.
|
||||
|
||||
@ -24,6 +24,7 @@ SRCS.main= \
|
||||
colortab.c \
|
||||
context.c \
|
||||
convolve.c \
|
||||
cpuinfo.c \
|
||||
debug.c \
|
||||
depth.c \
|
||||
depthstencil.c \
|
||||
@ -39,6 +40,7 @@ SRCS.main= \
|
||||
feedback.c \
|
||||
ffvertex_prog.c \
|
||||
fog.c \
|
||||
formats.c \
|
||||
framebuffer.c \
|
||||
get.c \
|
||||
getstring.c \
|
||||
@ -61,18 +63,23 @@ SRCS.main= \
|
||||
rastpos.c \
|
||||
rbadaptors.c \
|
||||
readpix.c \
|
||||
remap.c \
|
||||
renderbuffer.c \
|
||||
scissor.c \
|
||||
shaders.c \
|
||||
shared.c \
|
||||
state.c \
|
||||
stencil.c \
|
||||
syncobj.c \
|
||||
texcompress.c \
|
||||
texcompress_s3tc.c \
|
||||
texcompress_fxt1.c \
|
||||
texenv.c \
|
||||
texenvprogram.c \
|
||||
texfetch.c \
|
||||
texformat.c \
|
||||
texgen.c \
|
||||
texgetimage.c \
|
||||
teximage.c \
|
||||
texobj.c \
|
||||
texparam.c \
|
||||
@ -80,8 +87,17 @@ SRCS.main= \
|
||||
texstate.c \
|
||||
texstore.c \
|
||||
varray.c \
|
||||
viewport.c \
|
||||
vtxfmt.c
|
||||
|
||||
# GL API sources
|
||||
PATHS.glapi= glapi main
|
||||
SRCS.glapi= \
|
||||
dispatch.c \
|
||||
glapi.c \
|
||||
glapi_getproc.c \
|
||||
glthread.c
|
||||
|
||||
# Math sources
|
||||
PATHS.math= math
|
||||
SRCS.math= \
|
||||
@ -91,11 +107,13 @@ SRCS.math= \
|
||||
m_eval.c \
|
||||
m_matrix.c \
|
||||
m_translate.c \
|
||||
m_vector.c \
|
||||
m_vector.c
|
||||
|
||||
SRCS.math+= \
|
||||
m_xform.c
|
||||
|
||||
# Software raster sources
|
||||
PATHS.swrast= swrast swrast_setup
|
||||
PATHS.swrast= swrast swrast_setup
|
||||
INCLUDES.swrast= shader
|
||||
SRCS.swrast= \
|
||||
s_aaline.c \
|
||||
@ -106,7 +124,7 @@ SRCS.swrast= \
|
||||
s_bitmap.c \
|
||||
s_blend.c \
|
||||
s_blit.c \
|
||||
s_buffers.c \
|
||||
s_clear.c \
|
||||
s_copypix.c \
|
||||
s_context.c \
|
||||
s_depth.c \
|
||||
@ -114,7 +132,6 @@ SRCS.swrast= \
|
||||
s_feedback.c \
|
||||
s_fog.c \
|
||||
s_fragprog.c \
|
||||
s_imaging.c \
|
||||
s_lines.c \
|
||||
s_logic.c \
|
||||
s_masking.c \
|
||||
@ -124,15 +141,14 @@ SRCS.swrast= \
|
||||
s_stencil.c \
|
||||
s_texcombine.c \
|
||||
s_texfilter.c \
|
||||
s_texstore.c \
|
||||
s_triangle.c \
|
||||
s_zoom.c
|
||||
|
||||
# swrast_setup
|
||||
.PATH: ${X11SRCDIR.MesaLib}/src/mesa/swrast_setup
|
||||
.PATH: ${X11SRCDIR.MesaLib}/src/mesa/swrast_setup
|
||||
SRCS.ss= \
|
||||
ss_context.c \
|
||||
ss_triangle.c
|
||||
ss_triangle.c
|
||||
|
||||
# TNL sources
|
||||
PATHS.tnl= tnl
|
||||
@ -155,7 +171,7 @@ SRCS.tnl= \
|
||||
t_vp_build.c \
|
||||
t_vertex.c \
|
||||
t_vertex_sse.c \
|
||||
t_vertex_generic.c
|
||||
t_vertex_generic.c
|
||||
|
||||
# VBO sources
|
||||
PATHS.vbo= vbo
|
||||
@ -173,73 +189,121 @@ SRCS.vbo= \
|
||||
vbo_save.c \
|
||||
vbo_save_api.c \
|
||||
vbo_save_draw.c \
|
||||
vbo_save_loopback.c
|
||||
vbo_save_loopback.c
|
||||
|
||||
COPTS.vbo_save_draw.c= -Wno-error
|
||||
|
||||
# statetracker
|
||||
|
||||
# Shader sources
|
||||
PATHS.shader= shader shader/grammar
|
||||
PATHS.shader= shader shader/grammar
|
||||
INCLUDES.shader= shader/slang shader/grammar
|
||||
SRCS.shader= \
|
||||
arbprogparse.c \
|
||||
arbprogram.c \
|
||||
atifragshader.c \
|
||||
grammar_mesa.c \
|
||||
hash_table.c \
|
||||
lex.yy.c \
|
||||
nvfragparse.c \
|
||||
nvprogram.c \
|
||||
nvvertparse.c \
|
||||
program.c \
|
||||
program_parse.tab.c \
|
||||
program_parse_extra.c \
|
||||
prog_cache.c \
|
||||
prog_debug.c \
|
||||
prog_execute.c \
|
||||
prog_instruction.c \
|
||||
prog_noise.c \
|
||||
prog_optimize.c \
|
||||
prog_parameter.c \
|
||||
prog_parameter_layout.c \
|
||||
prog_print.c \
|
||||
prog_statevars.c \
|
||||
prog_uniform.c \
|
||||
programopt.c \
|
||||
shader_api.c \
|
||||
symbol_table.c \
|
||||
shader_api.c
|
||||
|
||||
# Shader language sources
|
||||
PATHS.slang= shader/slang
|
||||
INCLUDES.slang= shader shader/grammar
|
||||
SRCS.slang= \
|
||||
slang_builtin.c \
|
||||
slang_codegen.c \
|
||||
slang_compile.c \
|
||||
slang_compile_function.c \
|
||||
slang_compile_operation.c \
|
||||
slang_compile_struct.c \
|
||||
slang_compile_variable.c \
|
||||
slang_emit.c \
|
||||
slang_ir.c \
|
||||
slang_label.c \
|
||||
slang_link.c \
|
||||
slang_log.c \
|
||||
slang_mem.c \
|
||||
slang_preprocess.c \
|
||||
slang_print.c \
|
||||
slang_simplify.c \
|
||||
slang_storage.c \
|
||||
slang_typeinfo.c \
|
||||
slang_vartable.c \
|
||||
slang_builtin.c \
|
||||
slang_codegen.c \
|
||||
slang_compile.c \
|
||||
slang_compile_function.c \
|
||||
slang_compile_operation.c \
|
||||
slang_compile_struct.c \
|
||||
slang_compile_variable.c \
|
||||
slang_emit.c \
|
||||
slang_ir.c \
|
||||
slang_label.c \
|
||||
slang_link.c \
|
||||
slang_log.c \
|
||||
slang_mem.c \
|
||||
slang_preprocess.c \
|
||||
slang_print.c \
|
||||
slang_simplify.c \
|
||||
slang_storage.c \
|
||||
slang_typeinfo.c \
|
||||
slang_vartable.c \
|
||||
slang_utility.c
|
||||
|
||||
# GL API sources
|
||||
PATHS.glapi= glapi main
|
||||
SRCS.glapi= \
|
||||
dispatch.c \
|
||||
glapi.c \
|
||||
glapi_getproc.c \
|
||||
glthread.c
|
||||
.if 0
|
||||
ASM_C_SOURCES = \
|
||||
x86/common_x86.c \
|
||||
x86/x86_xform.c \
|
||||
x86/3dnow.c \
|
||||
x86/sse.c \
|
||||
x86/rtasm/x86sse.c \
|
||||
sparc/sparc.c \
|
||||
ppc/common_ppc.c \
|
||||
x86-64/x86-64.c
|
||||
|
||||
X86_SOURCES = \
|
||||
x86/common_x86_asm.S \
|
||||
x86/x86_xform2.S \
|
||||
x86/x86_xform3.S \
|
||||
x86/x86_xform4.S \
|
||||
x86/x86_cliptest.S \
|
||||
x86/mmx_blend.S \
|
||||
x86/3dnow_xform1.S \
|
||||
x86/3dnow_xform2.S \
|
||||
x86/3dnow_xform3.S \
|
||||
x86/3dnow_xform4.S \
|
||||
x86/3dnow_normal.S \
|
||||
x86/sse_xform1.S \
|
||||
x86/sse_xform2.S \
|
||||
x86/sse_xform3.S \
|
||||
x86/sse_xform4.S \
|
||||
x86/sse_normal.S \
|
||||
x86/read_rgba_span_x86.S
|
||||
|
||||
X86_API = \
|
||||
x86/glapi_x86.S
|
||||
|
||||
X86-64_SOURCES = \
|
||||
x86-64/xform4.S
|
||||
|
||||
X86-64_API = \
|
||||
x86-64/glapi_x86-64.S
|
||||
|
||||
SPARC_SOURCES = \
|
||||
sparc/clip.S \
|
||||
sparc/norm.S \
|
||||
sparc/xform.S
|
||||
|
||||
SPARC_API = \
|
||||
sparc/glapi_sparc.S
|
||||
.endif
|
||||
|
||||
# Common driver sources
|
||||
PATHS.common= drivers/common
|
||||
INCLUDES.common= shader
|
||||
SRCS.common= \
|
||||
driverfuncs.c
|
||||
|
||||
driverfuncs.c \
|
||||
meta.c
|
||||
|
||||
# OSMesa driver sources
|
||||
PATHS.osmesa= drivers/osmesa
|
||||
|
Loading…
Reference in New Issue
Block a user