Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/trunk]: src/external/mit/xorg updates for Mesa 7.8.2:
details: https://anonhg.NetBSD.org/src/rev/08dc7feefada
branches: trunk
changeset: 756472:08dc7feefada
user: mrg <mrg%NetBSD.org@localhost>
date: Mon Jul 19 05:34:24 2010 +0000
description:
updates for Mesa 7.8.2:
- build glsl as a host tool
- add the glsl objects to libmesa
- add/remove new/deleted sources for various components
- adjust the libmesa/libGL builds to pull in the new glsl objects
- re-apply the BUILDSYMLINK hack for eval.c/pixel.c/pixelstore.c
- use glsl to build the slang headers on the fly
diffstat:
external/mit/xorg/lib/dri/i915/Makefile | 6 +-
external/mit/xorg/lib/dri/i965/Makefile | 17 +-
external/mit/xorg/lib/dri/libmesa/Makefile | 5 +-
external/mit/xorg/lib/dri/r200/Makefile | 4 +-
external/mit/xorg/lib/dri/r300/Makefile | 5 +-
external/mit/xorg/lib/dri/r600/Makefile | 8 +-
external/mit/xorg/lib/dri/radeon/Makefile | 4 +-
external/mit/xorg/lib/libGL/Makefile | 24 ++-
external/mit/xorg/lib/libGLU/Makefile | 4 +-
external/mit/xorg/lib/libOSMesa/libmesa.mk | 71 ++++++++-
external/mit/xorg/lib/libglut/Makefile | 4 +-
external/mit/xorg/server/xorg-server/GL/GLcore/Makefile.GLcore | 5 +-
external/mit/xorg/server/xorg-server/GL/glx/Makefile.glx | 6 +-
external/mit/xorg/server/xorg-server/glx/Makefile.glx | 6 +-
external/mit/xorg/server/xorg-server/os/Makefile | 3 +-
external/mit/xorg/tools/Makefile | 4 +-
external/mit/xorg/tools/glsl/Makefile | 19 ++
external/mit/xorg/tools/glsl/Makefile.glsl | 7 +
external/mit/xorg/tools/glsl/Makefile.glslsrcs | 24 +++
19 files changed, 176 insertions(+), 50 deletions(-)
diffs (truncated from 636 to 300 lines):
diff -r d56c2a9e81ba -r 08dc7feefada external/mit/xorg/lib/dri/i915/Makefile
--- a/external/mit/xorg/lib/dri/i915/Makefile Mon Jul 19 05:01:07 2010 +0000
+++ b/external/mit/xorg/lib/dri/i915/Makefile Mon Jul 19 05:34:24 2010 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2010/05/23 21:31:52 mrg Exp $
+# $NetBSD: Makefile,v 1.10 2010/07/19 05:34:24 mrg Exp $
MODULE= i915
@@ -9,7 +9,6 @@
DRI_EXTRA_PATHS= ${X11SRCDIR.MesaLib}/src/mesa/drivers/dri/intel
SRCS= \
i830_context.c \
- i830_metaops.c \
i830_state.c \
i830_texblend.c \
i830_texstate.c \
@@ -35,14 +34,12 @@
intel_pixel_read.c \
intel_buffers.c \
intel_blit.c \
- intel_swapbuffers.c \
i915_tex_layout.c \
i915_texstate.c \
i915_context.c \
i915_debug.c \
i915_debug_fp.c \
i915_fragprog.c \
- i915_metaops.c \
i915_program.c \
i915_state.c \
i915_vtbl.c \
@@ -60,7 +57,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"
diff -r d56c2a9e81ba -r 08dc7feefada external/mit/xorg/lib/dri/i965/Makefile
--- a/external/mit/xorg/lib/dri/i965/Makefile Mon Jul 19 05:01:07 2010 +0000
+++ b/external/mit/xorg/lib/dri/i965/Makefile Mon Jul 19 05:34:24 2010 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2010/05/23 21:31:52 mrg Exp $
+# $NetBSD: Makefile,v 1.12 2010/07/19 05:34:24 mrg Exp $
MODULE= i965
@@ -28,7 +28,6 @@
intel_pixel_draw.c \
intel_pixel_read.c \
intel_state.c \
- intel_swapbuffers.c \
intel_syncobj.c \
intel_tex.c \
intel_tex_copy.c \
@@ -89,14 +88,24 @@
brw_wm_pass2.c \
brw_wm_sampler_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
COPTS.brw_draw_upload.c= -Wno-error
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"
diff -r d56c2a9e81ba -r 08dc7feefada external/mit/xorg/lib/dri/libmesa/Makefile
--- a/external/mit/xorg/lib/dri/libmesa/Makefile Mon Jul 19 05:01:07 2010 +0000
+++ b/external/mit/xorg/lib/dri/libmesa/Makefile Mon Jul 19 05:34:24 2010 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2010/05/23 21:31:52 mrg Exp $
+# $NetBSD: Makefile,v 1.8 2010/07/19 05:34:24 mrg Exp $
.include <bsd.own.mk>
@@ -25,6 +25,9 @@
CFLAGS+= -pthread
.include "../../libOSMesa/libmesa.mk"
+.include "../../../tools/glsl/Makefile.glslsrcs"
+
+SRCS+= ${SRCS.pp} ${SRCS.cl}
.include <bsd.x11.mk>
diff -r d56c2a9e81ba -r 08dc7feefada external/mit/xorg/lib/dri/r200/Makefile
--- a/external/mit/xorg/lib/dri/r200/Makefile Mon Jul 19 05:01:07 2010 +0000
+++ b/external/mit/xorg/lib/dri/r200/Makefile Mon Jul 19 05:34:24 2010 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2010/05/23 23:21:30 mrg Exp $
+# $NetBSD: Makefile,v 1.7 2010/07/19 05:34:24 mrg Exp $
MODULE= r200
@@ -22,7 +22,9 @@
radeon_mipmap_tree.c \
radeon_queryobj.c \
radeon_span.c \
+ radeon_tex_copy.c \
radeon_texture.c \
+ r200_blit.c \
r200_context.c \
r200_ioctl.c \
r200_state.c \
diff -r d56c2a9e81ba -r 08dc7feefada external/mit/xorg/lib/dri/r300/Makefile
--- a/external/mit/xorg/lib/dri/r300/Makefile Mon Jul 19 05:01:07 2010 +0000
+++ b/external/mit/xorg/lib/dri/r300/Makefile Mon Jul 19 05:34:24 2010 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2010/05/27 01:20:14 mrg Exp $
+# $NetBSD: Makefile,v 1.7 2010/07/19 05:34:25 mrg Exp $
MODULE= r300
@@ -27,11 +27,12 @@
radeon_mipmap_tree.c \
radeon_span.c \
radeon_queryobj.c \
+ radeon_tex_copy.c \
radeon_texture.c \
radeon_screen.c \
+ r300_blit.c \
r300_context.c \
r300_draw.c \
- r300_ioctl.c \
r300_cmdbuf.c \
r300_state.c \
r300_render.c \
diff -r d56c2a9e81ba -r 08dc7feefada external/mit/xorg/lib/dri/r600/Makefile
--- a/external/mit/xorg/lib/dri/r600/Makefile Mon Jul 19 05:01:07 2010 +0000
+++ b/external/mit/xorg/lib/dri/r600/Makefile Mon Jul 19 05:34:24 2010 +0000
@@ -1,7 +1,10 @@
-# $NetBSD: Makefile,v 1.2 2010/05/23 23:21:31 mrg Exp $
+# $NetBSD: Makefile,v 1.3 2010/07/19 05:34:25 mrg Exp $
MODULE= r600
+# Uses C99 for() variable decls.
+COPTS+= -std=c99
+
CPPFLAGS+= -DRADEON_COMMON=1 -DRADEON_R600
CPPFLAGS+= -DHAVE_LIBDRM_RADEON
@@ -25,6 +28,8 @@
radeon_texture.c \
radeon_queryobj.c \
radeon_screen.c \
+ radeon_tex_copy.c \
+ r600_blit.c \
r600_context.c \
r600_cmdbuf.c \
r600_emit.c \
@@ -51,5 +56,6 @@
LIBDPLIBS+= drm_radeon ${.CURDIR}/../../libdrm_radeon
COPTS.radeon_screen.c= -Wno-error # XXX const
+COPTS.r700_assembler.c= -Wno-error # XXX pointer casts
.include "${.CURDIR}/../dri.mk"
diff -r d56c2a9e81ba -r 08dc7feefada external/mit/xorg/lib/dri/radeon/Makefile
--- a/external/mit/xorg/lib/dri/radeon/Makefile Mon Jul 19 05:01:07 2010 +0000
+++ b/external/mit/xorg/lib/dri/radeon/Makefile Mon Jul 19 05:34:24 2010 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2010/05/23 23:21:31 mrg Exp $
+# $NetBSD: Makefile,v 1.7 2010/07/19 05:34:26 mrg Exp $
MODULE= radeon
@@ -8,6 +8,7 @@
CPPFLAGS+= -I${X11SRCDIR.MesaLib}/src/mesa/drivers/dri/radeon
SRCS= \
+ radeon_blit.c \
radeon_bo_legacy.c \
radeon_common_context.c \
radeon_common.c \
@@ -26,6 +27,7 @@
radeon_state.c \
radeon_state_init.c \
radeon_tex.c \
+ radeon_tex_copy.c \
radeon_texstate.c \
radeon_tcl.c \
radeon_swtcl.c \
diff -r d56c2a9e81ba -r 08dc7feefada external/mit/xorg/lib/libGL/Makefile
--- a/external/mit/xorg/lib/libGL/Makefile Mon Jul 19 05:01:07 2010 +0000
+++ b/external/mit/xorg/lib/libGL/Makefile Mon Jul 19 05:34:24 2010 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2010/05/28 06:22:05 mrg Exp $
+# $NetBSD: Makefile,v 1.15 2010/07/19 05:34:26 mrg Exp $
.include <bsd.own.mk>
@@ -7,7 +7,7 @@
SUBDIR= internal
# glx
-.PATH: ${X11SRCDIR.MesaLib}/src/glx/x11
+.PATH: ${X11SRCDIR.MesaLib}/src/glx
SRCS.glx= glcontextmodes.c clientattrib.c compsize.c eval.c glxcmds.c \
glxext.c glxextensions.c indirect.c indirect_init.c \
indirect_size.c indirect_window_pos.c \
@@ -18,7 +18,7 @@
glxcurrent.c indirect_texture_compression.c
.PATH: ${X11SRCDIR.MesaLib}/src/mesa/glapi
-SRCS.glx+= glapi.c glapi_getproc.c glthread.c
+SRCS.glx+= glapi.c glapi_dispatch.c glapi_getproc.c glapi_nop.c glthread.c
# XXX see TODO
#.if ${MACHINE_ARCH} == "i386"
@@ -38,10 +38,10 @@
.endfor
.endif
+MESA_SRC_MODULES= main math vbo tnl shader swrast slang glapi common \
+ osmesa ss
-# mesa
-.PATH: ${X11SRCDIR.MesaLib}/src/mesa/main
-SRCS.mesa= dispatch.c
+.include "../libOSMesa/libmesa.mk"
.PATH: ${X11SRCDIR.MesaLib}/src/glw
@@ -52,7 +52,11 @@
xmesa_xf86.h
INCSDIR=${X11INCDIR}/GL
-SRCS+= ${SRCS.dri} ${SRCS.mesa} ${SRCS.glx}
+SRCS+= ${SRCS.dri} ${SRCS.glx}
+
+.include "../../tools/glsl/Makefile.glslsrcs"
+
+SRCS+= ${SRCS.pp} ${SRCS.cl}
CPPFLAGS+= -I${DESTDIR}${X11INCDIR}/GL \
-I${DESTDIR}${X11INCDIR}/X11 \
@@ -60,7 +64,7 @@
-I${DESTDIR}${X11INCDIR}/libdrm \
-I${X11SRCDIR.MesaLib}/include \
-I${X11SRCDIR.MesaLib}/include/GL/internal \
- -I${X11SRCDIR.MesaLib}/src/mesa \
+ -I${X11SRCDIR.MesaLib}/src/mesa/main \
-I${X11SRCDIR.MesaLib}/src/mesa/glapi \
-I${X11SRCDIR.MesaLib}/src/mesa \
${X11FLAGS.THREADLIB}
@@ -94,13 +98,15 @@
# XXX XXX
COPTS.dri_glx.c= -Wno-error
+COPTS.dri2_glx.c= -Wno-error
+COPTS.drisw_glx.c= -Wno-error
COPTS.glxext.c= -Wno-error
COPTS.indirect_vertex_program.c= -Wno-error
MKLINT=no
PKGCONFIG= gl
PKGDIST.gl= ${X11SRCDIR.MesaLib}/src/mesa
-PKGCONFIG_VERSION.gl= 7.7.1
+PKGCONFIG_VERSION.gl= 7.8.2
.include <bsd.x11.mk>
.include <bsd.lib.mk>
diff -r d56c2a9e81ba -r 08dc7feefada external/mit/xorg/lib/libGLU/Makefile
--- a/external/mit/xorg/lib/libGLU/Makefile Mon Jul 19 05:01:07 2010 +0000
+++ b/external/mit/xorg/lib/libGLU/Makefile Mon Jul 19 05:34:24 2010 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2010/05/28 06:22:05 mrg Exp $
+# $NetBSD: Makefile,v 1.7 2010/07/19 05:34:26 mrg Exp $
NOLINT= 1 # XTODO: tess.ln SIGSEGVs lint :(
@@ -84,7 +84,7 @@
PKGCONFIG= glu
PKGDIST.glu= ${X11SRCDIR.MesaLib}/src/glu
-PKGCONFIG_VERSION.glu= 7.7.1
+PKGCONFIG_VERSION.glu= 7.8.2
.include <bsd.x11.mk>
.include <bsd.lib.mk>
diff -r d56c2a9e81ba -r 08dc7feefada external/mit/xorg/lib/libOSMesa/libmesa.mk
Home |
Main Index |
Thread Index |
Old Index