Module Name: src
Committed By: mrg
Date: Mon Jul 19 05:34:28 UTC 2010
Modified Files:
src/external/mit/xorg/lib/dri/i915: Makefile
src/external/mit/xorg/lib/dri/i965: Makefile
src/external/mit/xorg/lib/dri/libmesa: Makefile
src/external/mit/xorg/lib/dri/r200: Makefile
src/external/mit/xorg/lib/dri/r300: Makefile
src/external/mit/xorg/lib/dri/r600: Makefile
src/external/mit/xorg/lib/dri/radeon: Makefile
src/external/mit/xorg/lib/libGL: Makefile
src/external/mit/xorg/lib/libGLU: Makefile
src/external/mit/xorg/lib/libOSMesa: libmesa.mk
src/external/mit/xorg/lib/libglut: Makefile
src/external/mit/xorg/server/xorg-server/GL/GLcore: Makefile.GLcore
src/external/mit/xorg/server/xorg-server/GL/glx: Makefile.glx
src/external/mit/xorg/server/xorg-server/glx: Makefile.glx
src/external/mit/xorg/server/xorg-server/os: Makefile
src/external/mit/xorg/tools: Makefile
Added Files:
src/external/mit/xorg/tools/glsl: Makefile Makefile.glsl
Makefile.glslsrcs
Log Message:
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
To generate a diff of this commit:
cvs rdiff -u -r1.9 -r1.10 src/external/mit/xorg/lib/dri/i915/Makefile
cvs rdiff -u -r1.11 -r1.12 src/external/mit/xorg/lib/dri/i965/Makefile
cvs rdiff -u -r1.7 -r1.8 src/external/mit/xorg/lib/dri/libmesa/Makefile
cvs rdiff -u -r1.6 -r1.7 src/external/mit/xorg/lib/dri/r200/Makefile
cvs rdiff -u -r1.6 -r1.7 src/external/mit/xorg/lib/dri/r300/Makefile
cvs rdiff -u -r1.2 -r1.3 src/external/mit/xorg/lib/dri/r600/Makefile
cvs rdiff -u -r1.6 -r1.7 src/external/mit/xorg/lib/dri/radeon/Makefile
cvs rdiff -u -r1.14 -r1.15 src/external/mit/xorg/lib/libGL/Makefile
cvs rdiff -u -r1.6 -r1.7 src/external/mit/xorg/lib/libGLU/Makefile
cvs rdiff -u -r1.5 -r1.6 src/external/mit/xorg/lib/libOSMesa/libmesa.mk
cvs rdiff -u -r1.5 -r1.6 src/external/mit/xorg/lib/libglut/Makefile
cvs rdiff -u -r1.2 -r1.3 \
src/external/mit/xorg/server/xorg-server/GL/GLcore/Makefile.GLcore
cvs rdiff -u -r1.5 -r1.6 \
src/external/mit/xorg/server/xorg-server/GL/glx/Makefile.glx
cvs rdiff -u -r1.5 -r1.6 \
src/external/mit/xorg/server/xorg-server/glx/Makefile.glx
cvs rdiff -u -r1.6 -r1.7 src/external/mit/xorg/server/xorg-server/os/Makefile
cvs rdiff -u -r1.2 -r1.3 src/external/mit/xorg/tools/Makefile
cvs rdiff -u -r0 -r1.1 src/external/mit/xorg/tools/glsl/Makefile \
src/external/mit/xorg/tools/glsl/Makefile.glsl \
src/external/mit/xorg/tools/glsl/Makefile.glslsrcs
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/mit/xorg/lib/dri/i915/Makefile
diff -u src/external/mit/xorg/lib/dri/i915/Makefile:1.9 src/external/mit/xorg/lib/dri/i915/Makefile:1.10
--- src/external/mit/xorg/lib/dri/i915/Makefile:1.9 Sun May 23 21:31:52 2010
+++ src/external/mit/xorg/lib/dri/i915/Makefile Mon Jul 19 05:34:24 2010
@@ -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"
Index: src/external/mit/xorg/lib/dri/i965/Makefile
diff -u src/external/mit/xorg/lib/dri/i965/Makefile:1.11 src/external/mit/xorg/lib/dri/i965/Makefile:1.12
--- src/external/mit/xorg/lib/dri/i965/Makefile:1.11 Sun May 23 21:31:52 2010
+++ src/external/mit/xorg/lib/dri/i965/Makefile Mon Jul 19 05:34:24 2010
@@ -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"
Index: src/external/mit/xorg/lib/dri/libmesa/Makefile
diff -u src/external/mit/xorg/lib/dri/libmesa/Makefile:1.7 src/external/mit/xorg/lib/dri/libmesa/Makefile:1.8
--- src/external/mit/xorg/lib/dri/libmesa/Makefile:1.7 Sun May 23 21:31:52 2010
+++ src/external/mit/xorg/lib/dri/libmesa/Makefile Mon Jul 19 05:34:24 2010
@@ -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>
Index: src/external/mit/xorg/lib/dri/r200/Makefile
diff -u src/external/mit/xorg/lib/dri/r200/Makefile:1.6 src/external/mit/xorg/lib/dri/r200/Makefile:1.7
--- src/external/mit/xorg/lib/dri/r200/Makefile:1.6 Sun May 23 23:21:30 2010
+++ src/external/mit/xorg/lib/dri/r200/Makefile Mon Jul 19 05:34:24 2010
@@ -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 \
Index: src/external/mit/xorg/lib/dri/r300/Makefile
diff -u src/external/mit/xorg/lib/dri/r300/Makefile:1.6 src/external/mit/xorg/lib/dri/r300/Makefile:1.7
--- src/external/mit/xorg/lib/dri/r300/Makefile:1.6 Thu May 27 01:20:14 2010
+++ src/external/mit/xorg/lib/dri/r300/Makefile Mon Jul 19 05:34:25 2010
@@ -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 \
Index: src/external/mit/xorg/lib/dri/r600/Makefile
diff -u src/external/mit/xorg/lib/dri/r600/Makefile:1.2 src/external/mit/xorg/lib/dri/r600/Makefile:1.3
--- src/external/mit/xorg/lib/dri/r600/Makefile:1.2 Sun May 23 23:21:31 2010
+++ src/external/mit/xorg/lib/dri/r600/Makefile Mon Jul 19 05:34:25 2010
@@ -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"
Index: src/external/mit/xorg/lib/dri/radeon/Makefile
diff -u src/external/mit/xorg/lib/dri/radeon/Makefile:1.6 src/external/mit/xorg/lib/dri/radeon/Makefile:1.7
--- src/external/mit/xorg/lib/dri/radeon/Makefile:1.6 Sun May 23 23:21:31 2010
+++ src/external/mit/xorg/lib/dri/radeon/Makefile Mon Jul 19 05:34:26 2010
@@ -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 \
Index: src/external/mit/xorg/lib/libGL/Makefile
diff -u src/external/mit/xorg/lib/libGL/Makefile:1.14 src/external/mit/xorg/lib/libGL/Makefile:1.15
--- src/external/mit/xorg/lib/libGL/Makefile:1.14 Fri May 28 06:22:05 2010
+++ src/external/mit/xorg/lib/libGL/Makefile Mon Jul 19 05:34:26 2010
@@ -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>
Index: src/external/mit/xorg/lib/libGLU/Makefile
diff -u src/external/mit/xorg/lib/libGLU/Makefile:1.6 src/external/mit/xorg/lib/libGLU/Makefile:1.7
--- src/external/mit/xorg/lib/libGLU/Makefile:1.6 Fri May 28 06:22:05 2010
+++ src/external/mit/xorg/lib/libGLU/Makefile Mon Jul 19 05:34:26 2010
@@ -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>
Index: src/external/mit/xorg/lib/libOSMesa/libmesa.mk
diff -u src/external/mit/xorg/lib/libOSMesa/libmesa.mk:1.5 src/external/mit/xorg/lib/libOSMesa/libmesa.mk:1.6
--- src/external/mit/xorg/lib/libOSMesa/libmesa.mk:1.5 Sun May 23 21:31:53 2010
+++ src/external/mit/xorg/lib/libOSMesa/libmesa.mk Mon Jul 19 05:34:27 2010
@@ -1,4 +1,4 @@
-# $NetBSD: libmesa.mk,v 1.5 2010/05/23 21:31:53 mrg Exp $
+# $NetBSD: libmesa.mk,v 1.6 2010/07/19 05:34:27 mrg Exp $
#
# Consumer of this Makefile should set MESA_SRC_MODULES.
@@ -22,6 +22,7 @@
clear.c \
clip.c \
colortab.c \
+ condrender.c \
context.c \
convolve.c \
cpuinfo.c \
@@ -33,7 +34,7 @@
drawpix.c \
enable.c \
enums.c \
- eval.c \
+ MESAeval.c \
execmem.c \
extensions.c \
fbobject.c \
@@ -55,8 +56,8 @@
mipmap.c \
mm.c \
multisample.c \
- pixel.c \
- pixelstore.c \
+ MESApixel.c \
+ MESApixelstore.c \
points.c \
polygon.c \
queryobj.c \
@@ -87,15 +88,23 @@
texstate.c \
texstore.c \
varray.c \
+ version.c \
viewport.c \
vtxfmt.c
+# XXX avoid source name clashes with glx
+.PATH: ${X11SRCDIR.MesaLib}/src/mesa/main
+BUILDSYMLINKS= ${X11SRCDIR.MesaLib}/src/mesa/main/pixel.c MESApixel.c \
+ ${X11SRCDIR.MesaLib}/src/mesa/main/pixelstore.c MESApixelstore.c \
+ ${X11SRCDIR.MesaLib}/src/mesa/main/eval.c MESAeval.c
+
# GL API sources
PATHS.glapi= glapi main
SRCS.glapi= \
- dispatch.c \
glapi.c \
+ glapi_dispatch.c \
glapi_getproc.c \
+ glapi_nop.c \
glthread.c
# Math sources
@@ -196,13 +205,12 @@
# statetracker
# Shader sources
-PATHS.shader= shader shader/grammar
-INCLUDES.shader= shader/slang shader/grammar
+PATHS.shader= shader
+INCLUDES.shader= shader/slang
SRCS.shader= \
arbprogparse.c \
arbprogram.c \
atifragshader.c \
- grammar_mesa.c \
hash_table.c \
lex.yy.c \
nvfragparse.c \
@@ -227,7 +235,7 @@
# Shader language sources
PATHS.slang= shader/slang
-INCLUDES.slang= shader shader/grammar
+INCLUDES.slang= shader
SRCS.slang= \
slang_builtin.c \
slang_codegen.c \
@@ -242,7 +250,6 @@
slang_link.c \
slang_log.c \
slang_mem.c \
- slang_preprocess.c \
slang_print.c \
slang_simplify.c \
slang_storage.c \
@@ -330,3 +337,47 @@
.endfor
LIBDPLIBS= m ${NETBSDSRCDIR}/lib/libm
+
+# build the shader headers
+.include "../../tools/glsl/Makefile.glsl"
+
+CPPFLAGS+= -I.
+
+# XXXX
+${SRCS.slang}: library/slang_120_core_gc.h \
+ library/slang_builtin_120_common_gc.h \
+ library/slang_builtin_120_fragment_gc.h \
+ library/slang_common_builtin_gc.h \
+ library/slang_core_gc.h \
+ library/slang_fragment_builtin_gc.h \
+ library/slang_vertex_builtin_gc.h
+
+library/slang_120_core_gc.h: slang_120_core.gc
+ -...@mkdir -p library
+ $(GLSL) fragment $> library/slang_120_core_gc.h
+
+library/slang_builtin_120_common_gc.h: slang_builtin_120_common.gc
+ -...@mkdir -p library
+ $(GLSL) fragment $> library/slang_builtin_120_common_gc.h
+
+library/slang_builtin_120_fragment_gc.h: slang_builtin_120_fragment.gc
+ -...@mkdir -p library
+ $(GLSL) fragment $> library/slang_builtin_120_fragment_gc.h
+
+library/slang_common_builtin_gc.h: slang_common_builtin.gc
+ -...@mkdir -p library
+ $(GLSL) fragment $> library/slang_common_builtin_gc.h
+
+library/slang_core_gc.h: slang_core.gc
+ -...@mkdir -p library
+ $(GLSL) fragment $> library/slang_core_gc.h
+
+library/slang_fragment_builtin_gc.h: slang_fragment_builtin.gc
+ -...@mkdir -p library
+ $(GLSL) fragment $> library/slang_fragment_builtin_gc.h
+
+library/slang_vertex_builtin_gc.h: slang_vertex_builtin.gc
+ -...@mkdir -p library
+ $(GLSL) vertex $> library/slang_vertex_builtin_gc.h
+
+.PATH: ${X11SRCDIR.MesaLib}/src/mesa/shader/slang/library
Index: src/external/mit/xorg/lib/libglut/Makefile
diff -u src/external/mit/xorg/lib/libglut/Makefile:1.5 src/external/mit/xorg/lib/libglut/Makefile:1.6
--- src/external/mit/xorg/lib/libglut/Makefile:1.5 Fri May 28 06:22:05 2010
+++ src/external/mit/xorg/lib/libglut/Makefile Mon Jul 19 05:34:27 2010
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2010/05/28 06:22:05 mrg Exp $
+# $NetBSD: Makefile,v 1.6 2010/07/19 05:34:27 mrg Exp $
.include <bsd.own.mk>
@@ -74,7 +74,7 @@
PKGCONFIG= glut
PKGDIST.glut= ${X11SRCDIR.MesaGLUT}/src/glut/glx
-PKGCONFIG_VERSION.glut= 7.7.1
+PKGCONFIG_VERSION.glut= 7.8.2
.include <bsd.x11.mk>
.include <bsd.lib.mk>
Index: src/external/mit/xorg/server/xorg-server/GL/GLcore/Makefile.GLcore
diff -u src/external/mit/xorg/server/xorg-server/GL/GLcore/Makefile.GLcore:1.2 src/external/mit/xorg/server/xorg-server/GL/GLcore/Makefile.GLcore:1.3
--- src/external/mit/xorg/server/xorg-server/GL/GLcore/Makefile.GLcore:1.2 Thu Jun 11 05:43:15 2009
+++ src/external/mit/xorg/server/xorg-server/GL/GLcore/Makefile.GLcore Mon Jul 19 05:34:27 2010
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.GLcore,v 1.2 2009/06/11 05:43:15 mrg Exp $
+# $NetBSD: Makefile.GLcore,v 1.3 2010/07/19 05:34:27 mrg Exp $
SRCS.GLcore= \
${SRCS.main} \
@@ -166,6 +166,7 @@
.PATH: ${X11SRCDIR.MesaLib}/src/mesa/shader/grammar
SRCS.grammar= \
grammar_mesa.c
+SRCS.grammar=
.PATH: ${X11SRCDIR.MesaLib}/src/mesa/shader/slang
SRCS.slang= \
@@ -182,7 +183,6 @@
slang_link.c \
slang_log.c \
slang_mem.c \
- slang_preprocess.c \
slang_print.c \
slang_simplify.c \
slang_storage.c \
@@ -228,7 +228,6 @@
-I${X11SRCDIR.MesaLib}/src/mesa/glapi \
-I${X11SRCDIR.MesaLib}/src/mesa/main \
-I${X11SRCDIR.MesaLib}/src/mesa/shader \
- -I${X11SRCDIR.MesaLib}/src/mesa/shader/grammar \
-I${X11SRCDIR.MesaLib}/src/mesa/shader/slang \
-I${X11SRCDIR.xorg-server}/include
Index: src/external/mit/xorg/server/xorg-server/GL/glx/Makefile.glx
diff -u src/external/mit/xorg/server/xorg-server/GL/glx/Makefile.glx:1.5 src/external/mit/xorg/server/xorg-server/GL/glx/Makefile.glx:1.6
--- src/external/mit/xorg/server/xorg-server/GL/glx/Makefile.glx:1.5 Thu Oct 8 19:06:51 2009
+++ src/external/mit/xorg/server/xorg-server/GL/glx/Makefile.glx Mon Jul 19 05:34:27 2010
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile.glx,v 1.5 2009/10/08 19:06:51 snj Exp $
+# $NetBSD: Makefile.glx,v 1.6 2010/07/19 05:34:27 mrg Exp $
.PATH: ${X11SRCDIR.xorg-server}/GL/glx
.PATH: ${X11SRCDIR.MesaLib}/src/mesa/glapi
-.PATH: ${X11SRCDIR.MesaLib}/src/glx/x11
+.PATH: ${X11SRCDIR.MesaLib}/src/glx
SRCS.glx= \
glxcmds.c \
@@ -46,7 +46,7 @@
-I${X11SRCDIR.xorg-server}/include \
-I${X11SRCDIR.xorg-server}/GL/glx \
-I${X11SRCDIR.MesaLib}/include \
- -I${X11SRCDIR.MesaLib}/src/glx/x11 \
+ -I${X11SRCDIR.MesaLib}/src/glx \
-I${X11SRCDIR.MesaLib}/src/mesa/main \
-I${X11SRCDIR.MesaLib}/src/mesa/glapi \
-I${DESTDIR}${X11INCDIR}/drm \
Index: src/external/mit/xorg/server/xorg-server/glx/Makefile.glx
diff -u src/external/mit/xorg/server/xorg-server/glx/Makefile.glx:1.5 src/external/mit/xorg/server/xorg-server/glx/Makefile.glx:1.6
--- src/external/mit/xorg/server/xorg-server/glx/Makefile.glx:1.5 Sat May 22 22:50:23 2010
+++ src/external/mit/xorg/server/xorg-server/glx/Makefile.glx Mon Jul 19 05:34:27 2010
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile.glx,v 1.5 2010/05/22 22:50:23 mrg Exp $
+# $NetBSD: Makefile.glx,v 1.6 2010/07/19 05:34:27 mrg Exp $
.PATH: ${X11SRCDIR.xorg-server}/glx
.PATH: ${X11SRCDIR.MesaLib}/src/mesa/glapi
-.PATH: ${X11SRCDIR.MesaLib}/src/glx/x11
+.PATH: ${X11SRCDIR.MesaLib}/src/glx
SRCS.glx= \
indirect_dispatch.c \
@@ -47,7 +47,7 @@
-I${X11SRCDIR.xorg-server}/glx \
-I${X11SRCDIR.xorg-server}/Xext \
-I${X11SRCDIR.MesaLib}/include \
- -I${X11SRCDIR.MesaLib}/src/glx/x11 \
+ -I${X11SRCDIR.MesaLib}/src/glx \
-I${X11SRCDIR.MesaLib}/src/mesa \
-I${X11SRCDIR.MesaLib}/src/mesa/main \
-I${X11SRCDIR.MesaLib}/src/mesa/glapi \
Index: src/external/mit/xorg/server/xorg-server/os/Makefile
diff -u src/external/mit/xorg/server/xorg-server/os/Makefile:1.6 src/external/mit/xorg/server/xorg-server/os/Makefile:1.7
--- src/external/mit/xorg/server/xorg-server/os/Makefile:1.6 Sat May 22 05:45:02 2010
+++ src/external/mit/xorg/server/xorg-server/os/Makefile Mon Jul 19 05:34:27 2010
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2010/05/22 05:45:02 mrg Exp $
+# $NetBSD: Makefile,v 1.7 2010/07/19 05:34:27 mrg Exp $
.include "../Makefile.serverlib"
.include "../Makefile.servermod"
@@ -59,6 +59,7 @@
COPTS.xdmauth.c= -Wno-error # XXX
COPTS.xstrans.c= -Wno-error # XXX
+COPTS.access.c= -Wno-error # XXX bigreqstr.h
COPTS.io.c= -Wno-error # XXX bigreqstr.h
.include <bsd.x11.mk>
Index: src/external/mit/xorg/tools/Makefile
diff -u src/external/mit/xorg/tools/Makefile:1.2 src/external/mit/xorg/tools/Makefile:1.3
--- src/external/mit/xorg/tools/Makefile:1.2 Mon Apr 20 05:11:19 2009
+++ src/external/mit/xorg/tools/Makefile Mon Jul 19 05:34:27 2010
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2009/04/20 05:11:19 mrg Exp $
+# $NetBSD: Makefile,v 1.3 2010/07/19 05:34:27 mrg Exp $
.include <bsd.own.mk>
@@ -11,7 +11,7 @@
# XXX pswrap/gen_matypes -- missing
-SUBDIR+=bdftopcf fc-cache ucs2any
+SUBDIR+=bdftopcf fc-cache ucs2any glsl
SUBDIR+=makekeys mkfontscale .WAIT xkbcomp
.include <bsd.subdir.mk>
Added files:
Index: src/external/mit/xorg/tools/glsl/Makefile
diff -u /dev/null src/external/mit/xorg/tools/glsl/Makefile:1.1
--- /dev/null Mon Jul 19 05:34:28 2010
+++ src/external/mit/xorg/tools/glsl/Makefile Mon Jul 19 05:34:28 2010
@@ -0,0 +1,19 @@
+# $NetBSD: Makefile,v 1.1 2010/07/19 05:34:28 mrg Exp $
+
+NOMAN= 1
+
+.include <bsd.own.mk>
+
+.PATH: ${X11SRCDIR.MesaLib}/src/glsl/apps
+
+.include "Makefile.glslsrcs"
+
+HOSTPROG= glsl-compile
+
+SRCS= compile.c
+
+SRCS+= ${SRCS.pp} ${SRCS.cl}
+
+# also: process.c purify.c tokenise.c version.c
+
+.include <bsd.hostprog.mk>
Index: src/external/mit/xorg/tools/glsl/Makefile.glsl
diff -u /dev/null src/external/mit/xorg/tools/glsl/Makefile.glsl:1.1
--- /dev/null Mon Jul 19 05:34:28 2010
+++ src/external/mit/xorg/tools/glsl/Makefile.glsl Mon Jul 19 05:34:28 2010
@@ -0,0 +1,7 @@
+# $NetBSD: Makefile.glsl,v 1.1 2010/07/19 05:34:28 mrg Exp $
+
+GLSLDIR!= cd ${NETBSDSRCDIR}/external/mit/xorg/tools/glsl && ${PRINTOBJDIR}
+GLSL= ${GLSLDIR}/glsl-compile
+
+${GLSL}:
+ (cd ${NETBSDSRCDIR}/external/mit/xorg/tools/glsl && ${MAKE})
Index: src/external/mit/xorg/tools/glsl/Makefile.glslsrcs
diff -u /dev/null src/external/mit/xorg/tools/glsl/Makefile.glslsrcs:1.1
--- /dev/null Mon Jul 19 05:34:28 2010
+++ src/external/mit/xorg/tools/glsl/Makefile.glslsrcs Mon Jul 19 05:34:28 2010
@@ -0,0 +1,24 @@
+# $NetBSD: Makefile.glslsrcs,v 1.1 2010/07/19 05:34:28 mrg Exp $
+
+SRCS.pp= \
+ 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
+
+SRCS.cl= \
+ sl_cl_parse.c
+
+.PATH: ${X11SRCDIR.MesaLib}/src/glsl/pp
+.PATH: ${X11SRCDIR.MesaLib}/src/glsl/cl
