[src/trunk]: src/external/mit/xorg/lib build fixes for Mesa 7.7.1. introduce...

[mrg <mrg%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/2013a54f1e63
branches:  trunk
changeset: 755137:2013a54f1e63
user:      mrg <mrg%NetBSD.org@localhost>
date:      Sun May 23 21:31:52 2010 +0000

description:
build fixes for Mesa 7.7.1.  introduce r600 driver!

diffstat:

 external/mit/xorg/lib/dri/Makefile         |   12 +-
 external/mit/xorg/lib/dri/dri.mk           |    3 +-
 external/mit/xorg/lib/dri/i915/Makefile    |   12 +-
 external/mit/xorg/lib/dri/i965/Makefile    |    9 +-
 external/mit/xorg/lib/dri/libmesa/Makefile |   10 +-
 external/mit/xorg/lib/dri/r200/Makefile    |   42 +++-
 external/mit/xorg/lib/dri/r300/Makefile    |   46 +++-
 external/mit/xorg/lib/dri/r600/Makefile    |   53 +++++
 external/mit/xorg/lib/dri/radeon/Makefile  |   40 +++-
 external/mit/xorg/lib/libGL/Makefile.mesa  |  273 +++++++++++++++-------------
 external/mit/xorg/lib/libOSMesa/libmesa.mk |  146 +++++++++++----
 11 files changed, 428 insertions(+), 218 deletions(-)

diffs (truncated from 1013 to 300 lines):

diff -r 4bdf7cb637a3 -r 2013a54f1e63 external/mit/xorg/lib/dri/Makefile
--- a/external/mit/xorg/lib/dri/Makefile        Sun May 23 21:23:59 2010 +0000
+++ b/external/mit/xorg/lib/dri/Makefile        Sun May 23 21:31:52 2010 +0000
@@ -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
diff -r 4bdf7cb637a3 -r 2013a54f1e63 external/mit/xorg/lib/dri/dri.mk
--- a/external/mit/xorg/lib/dri/dri.mk  Sun May 23 21:23:59 2010 +0000
+++ b/external/mit/xorg/lib/dri/dri.mk  Sun May 23 21:31:52 2010 +0000
@@ -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 @@
 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
 
diff -r 4bdf7cb637a3 -r 2013a54f1e63 external/mit/xorg/lib/dri/i915/Makefile
--- a/external/mit/xorg/lib/dri/i915/Makefile   Sun May 23 21:23:59 2010 +0000
+++ b/external/mit/xorg/lib/dri/i915/Makefile   Sun May 23 21:31:52 2010 +0000
@@ -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 @@
        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 @@
        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 @@
        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 @@
        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 @@
 
 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"
diff -r 4bdf7cb637a3 -r 2013a54f1e63 external/mit/xorg/lib/dri/i965/Makefile
--- a/external/mit/xorg/lib/dri/i965/Makefile   Sun May 23 21:23:59 2010 +0000
+++ b/external/mit/xorg/lib/dri/i965/Makefile   Sun May 23 21:31:52 2010 +0000
@@ -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 @@
        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 @@
        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 @@
        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 @@
        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 @@
 
 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"
diff -r 4bdf7cb637a3 -r 2013a54f1e63 external/mit/xorg/lib/dri/libmesa/Makefile
--- a/external/mit/xorg/lib/dri/libmesa/Makefile        Sun May 23 21:23:59 2010 +0000
+++ b/external/mit/xorg/lib/dri/libmesa/Makefile        Sun May 23 21:31:52 2010 +0000
@@ -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 @@
 
 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 @@
                -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 @@
 
 LIBDIR=                ${X11USRLIBDIR}/modules/dri
 
+#LIBDPLIBS+=   GL      ${.CURDIR}/../../libGL
+
 .include <bsd.lib.mk>
diff -r 4bdf7cb637a3 -r 2013a54f1e63 external/mit/xorg/lib/dri/r200/Makefile
--- a/external/mit/xorg/lib/dri/r200/Makefile   Sun May 23 21:23:59 2010 +0000
+++ b/external/mit/xorg/lib/dri/r200/Makefile   Sun May 23 21:31:52 2010 +0000
@@ -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"
diff -r 4bdf7cb637a3 -r 2013a54f1e63 external/mit/xorg/lib/dri/r300/Makefile
--- a/external/mit/xorg/lib/dri/r300/Makefile   Sun May 23 21:23:59 2010 +0000
+++ b/external/mit/xorg/lib/dri/r300/Makefile   Sun May 23 21:31:52 2010 +0000
@@ -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 @@
 
 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 \