[src/trunk]: src/external/mit/xorg Update reachover makefiles for MesaLib 7.1...

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

details:   https://anonhg.NetBSD.org/src/rev/0736ecdf4b09
branches:  trunk
changeset: 330462:0736ecdf4b09
user:      riastradh <riastradh%NetBSD.org@localhost>
date:      Wed Jul 09 20:22:55 2014 +0000

description:
Update reachover makefiles for MesaLib 7.11.2.

With the new GL shader compiler, glsl-compile is no longer needed as
a tool, but the shader compiler is now duplicated in several
libraries, so (XXX) external/mit/xorg/tools/glsl should be turned
into a proper library that libGL and libmesa can link against.

diffstat:

 external/mit/xorg/lib/dri/dri.mk               |   23 +-
 external/mit/xorg/lib/dri/i915/Makefile        |    5 +-
 external/mit/xorg/lib/dri/i965/Makefile        |   33 +++-
 external/mit/xorg/lib/dri/libmesa/Makefile     |   20 +-
 external/mit/xorg/lib/dri/r128/Makefile        |    3 +-
 external/mit/xorg/lib/dri/r200/Makefile        |   10 +-
 external/mit/xorg/lib/dri/r300/Makefile        |   14 +-
 external/mit/xorg/lib/dri/r600/Makefile        |    5 +-
 external/mit/xorg/lib/dri/radeon/Makefile      |   18 +-
 external/mit/xorg/lib/dri/s3v/Makefile         |    5 +-
 external/mit/xorg/lib/dri/swrast/Makefile      |    4 +-
 external/mit/xorg/lib/dri/tdfx/Makefile        |    3 +-
 external/mit/xorg/lib/libGL/Makefile           |   61 ++++---
 external/mit/xorg/lib/libOSMesa/Makefile       |    5 +-
 external/mit/xorg/lib/libOSMesa/libmesa.mk     |  192 +++++++++---------------
 external/mit/xorg/lib/libdrm_radeon/Makefile   |    4 +-
 external/mit/xorg/tools/Makefile               |    4 +-
 external/mit/xorg/tools/glsl/Makefile.glslsrcs |  118 ++++++++++++--
 18 files changed, 275 insertions(+), 252 deletions(-)

diffs (truncated from 1067 to 300 lines):

diff -r 426a8a617f92 -r 0736ecdf4b09 external/mit/xorg/lib/dri/dri.mk
--- a/external/mit/xorg/lib/dri/dri.mk  Wed Jul 09 16:30:11 2014 +0000
+++ b/external/mit/xorg/lib/dri/dri.mk  Wed Jul 09 20:22:55 2014 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: dri.mk,v 1.12 2012/03/10 20:52:30 tron Exp $
+# $NetBSD: dri.mk,v 1.13 2014/07/09 20:22:55 riastradh Exp $
 
 # XXX DRI_LIB_DEPS
 
@@ -8,15 +8,15 @@
 
 SHLIB_MAJOR=   0
 
-CPPFLAGS+=     -I${X11SRCDIR.MesaLib}/src/mesa/main \
-               -I${X11SRCDIR.MesaLib}/src/mesa/glapi \
-               -I${X11SRCDIR.MesaLib}/src/mesa/shader \
-               -I${X11SRCDIR.MesaLib}/src/mesa/drivers/dri/common \
-               -I${X11SRCDIR.MesaLib}/src/mesa/drivers/dri/${MODULE}/server \
-               -I${X11SRCDIR.MesaLib}/src/mesa \
-               -I${X11SRCDIR.MesaLib}/include \
-               -I${DESTDIR}${X11INCDIR}/libdrm \
-               -I${DESTDIR}${X11INCDIR}/X11
+CPPFLAGS+= \
+       -I${X11SRCDIR.MesaLib}/src/mesa/drivers/dri/common \
+       -I${X11SRCDIR.MesaLib}/src/mesa/drivers/dri/${MODULE}/server \
+       -I${X11SRCDIR.MesaLib}/include \
+       -I${X11SRCDIR.MesaLib}/src/mapi \
+       -I${X11SRCDIR.MesaLib}/src/mesa \
+       -I${X11SRCDIR.MesaLib}/src/egl/main \
+       -I${X11SRCDIR.MesaLib}/src/egl/drivers/dri \
+       -I${DESTDIR}${X11INCDIR}/libdrm
 
 CPPFLAGS+=     -D_NETBSD_SOURCE -DPTHREADS -DUSE_EXTERNAL_DXTN_LIB=1 \
                -DIN_DRI_DRIVER -DGLX_DIRECT_RENDERING \
@@ -30,10 +30,9 @@
 .PATH: ${X11SRCDIR.MesaLib}/src/mesa/drivers/dri/common \
        ${X11SRCDIR.MesaLib}/src/mesa/drivers/common
 .if (${MODULE} == "swrast")
-SRCS+= driverfuncs.c utils.c
+SRCS+= drisw_util.c 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 426a8a617f92 -r 0736ecdf4b09 external/mit/xorg/lib/dri/i915/Makefile
--- a/external/mit/xorg/lib/dri/i915/Makefile   Wed Jul 09 16:30:11 2014 +0000
+++ b/external/mit/xorg/lib/dri/i915/Makefile   Wed Jul 09 20:22:55 2014 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2011/08/11 23:15:36 joerg Exp $
+# $NetBSD: Makefile,v 1.12 2014/07/09 20:22:55 riastradh Exp $
 
 MODULE=        i915
 
@@ -19,6 +19,7 @@
        intel_batchbuffer.c \
        intel_clear.c \
        intel_extensions.c \
+       intel_extensions_es.c \
        intel_mipmap_tree.c \
        intel_tex_layout.c \
        intel_tex_image.c \
@@ -56,8 +57,6 @@
 
 LIBDPLIBS+=    drm_intel       ${.CURDIR}/../../libdrm_intel
 
-COPTS.intel_context.c+=        -Wno-error      # XXX
-COPTS.intel_tex.c+=    -Wno-error      # XXX
 CWARNFLAGS.clang+=     -Wno-tautological-compare -Wno-format \
                        -Wno-constant-logical-operand
 
diff -r 426a8a617f92 -r 0736ecdf4b09 external/mit/xorg/lib/dri/i965/Makefile
--- a/external/mit/xorg/lib/dri/i965/Makefile   Wed Jul 09 16:30:11 2014 +0000
+++ b/external/mit/xorg/lib/dri/i965/Makefile   Wed Jul 09 20:22:55 2014 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2012/03/22 23:46:27 joerg Exp $
+# $NetBSD: Makefile,v 1.15 2014/07/09 20:22:55 riastradh Exp $
 
 MODULE=        i965
 
@@ -17,6 +17,7 @@
        intel_context.c \
        intel_decode.c \
        intel_extensions.c \
+       intel_extensions_es.c \
        intel_fbo.c \
        intel_mipmap_tree.c \
        intel_regions.c \
@@ -58,6 +59,7 @@
        brw_gs_emit.c \
        brw_gs_state.c \
        brw_misc_state.c \
+       brw_optimize.c \
        brw_program.c \
        brw_queryobj.c \
        brw_sf.c \
@@ -82,7 +84,6 @@
        brw_wm_emit.c \
        brw_wm_fp.c \
        brw_wm_iz.c \
-       brw_wm_glsl.c \
        brw_wm_pass0.c \
        brw_wm_pass1.c \
        brw_wm_pass2.c \
@@ -99,14 +100,32 @@
        gen6_urb.c \
        gen6_viewport_state.c \
        gen6_vs_state.c \
-       gen6_wm_state.c
+       gen6_wm_state.c \
+       gen7_cc_state.c \
+       gen7_clip_state.c \
+       gen7_disable.c \
+       gen7_misc_state.c \
+       gen7_sampler_state.c \
+       gen7_sf_state.c \
+       gen7_urb.c \
+       gen7_viewport_state.c \
+       gen7_vs_state.c \
+       gen7_wm_state.c \
+       gen7_wm_surface_state.c
 
-COPTS.brw_draw_upload.c=       -Wno-error
+SRCS+= \
+       brw_cubemap_normalize.cpp \
+       brw_fs.cpp \
+       brw_fs_emit.cpp \
+       brw_fs_visitor.cpp \
+       brw_fs_channel_expressions.cpp \
+       brw_fs_reg_allocate.cpp \
+       brw_fs_schedule_instructions.cpp \
+       brw_fs_vector_splitting.cpp \
+       brw_shader.cpp
+
 CWARNFLAGS.clang+=     -Wno-format -Wno-switch
 
 LIBDPLIBS+=    drm_intel       ${.CURDIR}/../../libdrm_intel
 
-COPTS.intel_context.c+=        -Wno-error      # XXX
-COPTS.intel_tex.c+=    -Wno-error      # XXX
-
 .include "${.CURDIR}/../dri.mk"
diff -r 426a8a617f92 -r 0736ecdf4b09 external/mit/xorg/lib/dri/libmesa/Makefile
--- a/external/mit/xorg/lib/dri/libmesa/Makefile        Wed Jul 09 16:30:11 2014 +0000
+++ b/external/mit/xorg/lib/dri/libmesa/Makefile        Wed Jul 09 20:22:55 2014 +0000
@@ -1,23 +1,21 @@
-#      $NetBSD: Makefile,v 1.11 2013/02/09 17:18:01 christos Exp $
+#      $NetBSD: Makefile,v 1.12 2014/07/09 20:22:55 riastradh Exp $
 
 .include <bsd.own.mk>
 
 _LIB_PREFIX=   lib
 LIB=           mesa_dri
 LIBISMODULE=   yes
+LIBISCXX=      yes
 
 SHLIB_MAJOR=   0
 
-MESA_SRC_MODULES=      glapi main math vbo tnl shader swrast slang ss common
+MESA_SRC_MODULES=      main math vbo tnl program swrast ss common
 
-CPPFLAGS+=     -I${X11SRCDIR.MesaLib}/src/mesa/main \
-               -I${X11SRCDIR.MesaLib}/src/mesa/glapi \
-               -I${X11SRCDIR.MesaLib}/src/mesa/shader \
-               -I${X11SRCDIR.MesaLib}/src/mesa/drivers/dri/common \
-               -I${X11SRCDIR.MesaLib}/src/mesa \
-               -I${X11SRCDIR.MesaLib}/include \
-               -I${DESTDIR}${X11INCDIR}/X11
-
+CPPFLAGS+=     \
+       -I${X11SRCDIR.MesaLib}/include \
+       -I${X11SRCDIR.MesaLib}/src/glsl \
+       -I${X11SRCDIR.MesaLib}/src/mesa \
+       -I${X11SRCDIR.MesaLib}/src/mapi
 
 CPPFLAGS+=     ${X11FLAGS.THREADLIB} \
                -DPTHREADS -D_NETBSD_SOURCE -DUSE_EXTERNAL_DXTN_LIB=1 \
@@ -28,7 +26,7 @@
 .include "../../libOSMesa/libmesa.mk"
 .include "../../../tools/glsl/Makefile.glslsrcs"
 
-SRCS+=  ${SRCS.pp} ${SRCS.cl}
+SRCS+=  ${SRCS.glsl}
 
 .include <bsd.x11.mk>
 
diff -r 426a8a617f92 -r 0736ecdf4b09 external/mit/xorg/lib/dri/r128/Makefile
--- a/external/mit/xorg/lib/dri/r128/Makefile   Wed Jul 09 16:30:11 2014 +0000
+++ b/external/mit/xorg/lib/dri/r128/Makefile   Wed Jul 09 20:22:55 2014 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2011/08/11 23:15:37 joerg Exp $
+# $NetBSD: Makefile,v 1.5 2014/07/09 20:22:55 riastradh Exp $
 
 MODULE=        r128
 
@@ -6,7 +6,6 @@
        r128_screen.c r128_tex.c r128_tris.c r128_ioctl.c r128_span.c \
        r128_texmem.c
 
-COPTS.r128_span.c=  -Wno-error # XXX const
 CWARNFLAGS.clang+=     -Wno-constant-logical-operand
 
 .include "${.CURDIR}/../dri.mk"
diff -r 426a8a617f92 -r 0736ecdf4b09 external/mit/xorg/lib/dri/r200/Makefile
--- a/external/mit/xorg/lib/dri/r200/Makefile   Wed Jul 09 16:30:11 2014 +0000
+++ b/external/mit/xorg/lib/dri/r200/Makefile   Wed Jul 09 20:22:55 2014 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2011/08/11 23:15:37 joerg Exp $
+# $NetBSD: Makefile,v 1.9 2014/07/09 20:22:55 riastradh Exp $
 
 MODULE=        r200
 
@@ -30,7 +30,6 @@
        r200_state.c \
        r200_state_init.c \
        r200_cmdbuf.c \
-       r200_pixel.c \
        r200_tex.c \
        r200_texstate.c \
        r200_tcl.c \
@@ -48,13 +47,6 @@
 
 LIBDPLIBS+=    drm_radeon      ${.CURDIR}/../../libdrm_radeon
 
-# XXX
-.if ${MACHINE_ARCH} == "sparc64"
-COPTS.r200_tcl.c=      -Wno-error
-.endif
-
-COPTS.radeon_screen.c=  -Wno-error     # XXX const
-
 CWARNFLAGS.clang+=     -Wno-format -Wno-constant-logical-operand \
                        -Wno-empty-body
 
diff -r 426a8a617f92 -r 0736ecdf4b09 external/mit/xorg/lib/dri/r300/Makefile
--- a/external/mit/xorg/lib/dri/r300/Makefile   Wed Jul 09 16:30:11 2014 +0000
+++ b/external/mit/xorg/lib/dri/r300/Makefile   Wed Jul 09 20:22:55 2014 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2011/08/11 23:15:37 joerg Exp $
+# $NetBSD: Makefile,v 1.9 2014/07/09 20:22:55 riastradh Exp $
 
 MODULE=        r300
 
@@ -10,7 +10,8 @@
 CPPFLAGS+=     -I${X11SRCDIR.MesaLib}/src/mesa/drivers/dri/r300 \
                -I${X11SRCDIR.MesaLib}/src/mesa/drivers/dri/r300/compiler \
                -I${X11SRCDIR.MesaLib}/src/mesa/drivers/dri/radeon \
-               -I${X11SRCDIR.MesaLib}/src/mesa/drivers/dri/radeon/server
+               -I${X11SRCDIR.MesaLib}/src/mesa/drivers/dri/radeon/server \
+               -I${X11SRCDIR.MesaLib}/src/glsl
 
 DRI_EXTRA_PATHS=       ${X11SRCDIR.MesaLib}/src/mesa/drivers/dri/radeon \
                        ${X11SRCDIR.MesaLib}/src/mesa/drivers/dri/r300/compiler
@@ -77,15 +78,8 @@
 
 LIBDPLIBS+=    drm_radeon      ${.CURDIR}/../../libdrm_radeon
 
-#      ../common/mm.c \
-#      ../common/vblank.c \
-#      ../common/xmlconfig.c \
-#      ../common/dri_util.c \
-
-COPTS.radeon_screen.c=  -Wno-error     # XXX const
-
 # uses C99 variable decl scoping
-CFLAGS+=       -std=c99        
+CFLAGS+=       -std=c99
 
 CWARNFLAGS.clang+=     -Wno-empty-body -Wno-format -Wno-constant-conversion \
                        -Wno-constant-logical-operand
diff -r 426a8a617f92 -r 0736ecdf4b09 external/mit/xorg/lib/dri/r600/Makefile
--- a/external/mit/xorg/lib/dri/r600/Makefile   Wed Jul 09 16:30:11 2014 +0000
+++ b/external/mit/xorg/lib/dri/r600/Makefile   Wed Jul 09 20:22:55 2014 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2011/08/11 23:15:37 joerg Exp $
+# $NetBSD: Makefile,v 1.5 2014/07/09 20:22:55 riastradh Exp $
 
 MODULE=        r600
 
@@ -55,9 +55,6 @@
 
 LIBDPLIBS+=    drm_radeon      ${.CURDIR}/../../libdrm_radeon
 
-COPTS.radeon_screen.c=  -Wno-error     # XXX const
-COPTS.r700_assembler.c=  -Wno-error    # XXX pointer casts
-
 CWARNFLAGS.clang+=     -Wno-constant-logical-operand -Wno-empty-body \
                        -Wno-format
 
diff -r 426a8a617f92 -r 0736ecdf4b09 external/mit/xorg/lib/dri/radeon/Makefile
--- a/external/mit/xorg/lib/dri/radeon/Makefile Wed Jul 09 16:30:11 2014 +0000
+++ b/external/mit/xorg/lib/dri/radeon/Makefile Wed Jul 09 20:22:55 2014 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2011/08/11 23:15:37 joerg Exp $
+# $NetBSD: Makefile,v 1.9 2014/07/09 20:22:55 riastradh Exp $
 
 MODULE=        radeon
 
@@ -10,6 +10,7 @@