Module Name: src
Committed By: snj
Date: Tue Dec 23 01:44:24 UTC 2014
Modified Files:
src/external/mit/xorg/lib/dri/libmesa [netbsd-7]: Makefile
src/external/mit/xorg/lib/libGL [netbsd-7]: Makefile
src/external/mit/xorg/lib/libOSMesa [netbsd-7]: libmesa.mk
Added Files:
src/external/mit/xorg/lib/libGL [netbsd-7]: Makefile.glslsrcs
Removed Files:
src/external/mit/xorg/tools/glsl [netbsd-7]: Makefile Makefile.glsl
Makefile.glslsrcs
Log Message:
Pull up following revision(s) (requested by mrg in ticket #340):
external/mit/xorg/tools/glsl/Makefile.glslsrcs: file removal
external/mit/xorg/lib/libGL/Makefile: revision 1.20
external/mit/xorg/lib/libGL/Makefile.glslsrcs: revision 1.1
external/mit/xorg/lib/libOSMesa/libmesa.mk: revision 1.9
external/mit/xorg/lib/dri/libmesa/Makefile: revision 1.14
external/mit/xorg/tools/glsl/Makefile: file removal
external/mit/xorg/tools/glsl/Makefile.glsl: file removal
delete tools/glsl, is hasn't been used for a while.
move Makefile.glsl into libGL.
To generate a diff of this commit:
cvs rdiff -u -r1.13 -r1.13.2.1 src/external/mit/xorg/lib/dri/libmesa/Makefile
cvs rdiff -u -r1.19 -r1.19.2.1 src/external/mit/xorg/lib/libGL/Makefile
cvs rdiff -u -r0 -r1.2.2.2 src/external/mit/xorg/lib/libGL/Makefile.glslsrcs
cvs rdiff -u -r1.8 -r1.8.2.1 src/external/mit/xorg/lib/libOSMesa/libmesa.mk
cvs rdiff -u -r1.1 -r0 src/external/mit/xorg/tools/glsl/Makefile \
src/external/mit/xorg/tools/glsl/Makefile.glsl
cvs rdiff -u -r1.2 -r0 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/libmesa/Makefile
diff -u src/external/mit/xorg/lib/dri/libmesa/Makefile:1.13 src/external/mit/xorg/lib/dri/libmesa/Makefile:1.13.2.1
--- src/external/mit/xorg/lib/dri/libmesa/Makefile:1.13 Sun Jul 13 16:35:49 2014
+++ src/external/mit/xorg/lib/dri/libmesa/Makefile Tue Dec 23 01:44:24 2014
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2014/07/13 16:35:49 joerg Exp $
+# $NetBSD: Makefile,v 1.13.2.1 2014/12/23 01:44:24 snj Exp $
.include <bsd.own.mk>
@@ -24,7 +24,7 @@ CPPFLAGS+= ${X11FLAGS.THREADLIB} \
CFLAGS+= -pthread
.include "../../libOSMesa/libmesa.mk"
-.include "../../../tools/glsl/Makefile.glslsrcs"
+.include "../../libGL/Makefile.glslsrcs"
SRCS+= ${SRCS.glsl}
Index: src/external/mit/xorg/lib/libGL/Makefile
diff -u src/external/mit/xorg/lib/libGL/Makefile:1.19 src/external/mit/xorg/lib/libGL/Makefile:1.19.2.1
--- src/external/mit/xorg/lib/libGL/Makefile:1.19 Wed Jul 9 20:22:56 2014
+++ src/external/mit/xorg/lib/libGL/Makefile Tue Dec 23 01:44:24 2014
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.19 2014/07/09 20:22:56 riastradh Exp $
+# $NetBSD: Makefile,v 1.19.2.1 2014/12/23 01:44:24 snj Exp $
.include <bsd.own.mk>
@@ -57,7 +57,7 @@ INCS= GLwDrawA.h GLwDrawAP.h GLwMDrawA.h
INCSDIR=${X11INCDIR}/GL
# XXX Create a separate libglsl rather than copying this...
-.include "../../tools/glsl/Makefile.glslsrcs"
+.include "Makefile.glslsrcs"
SRCS+= ${SRCS.dri} ${SRCS.glx} ${SRCS.glsl} ${SRCS.mapi}
Index: src/external/mit/xorg/lib/libOSMesa/libmesa.mk
diff -u src/external/mit/xorg/lib/libOSMesa/libmesa.mk:1.8 src/external/mit/xorg/lib/libOSMesa/libmesa.mk:1.8.2.1
--- src/external/mit/xorg/lib/libOSMesa/libmesa.mk:1.8 Wed Jul 9 20:22:56 2014
+++ src/external/mit/xorg/lib/libOSMesa/libmesa.mk Tue Dec 23 01:44:24 2014
@@ -1,4 +1,4 @@
-# $NetBSD: libmesa.mk,v 1.8 2014/07/09 20:22:56 riastradh Exp $
+# $NetBSD: libmesa.mk,v 1.8.2.1 2014/12/23 01:44:24 snj Exp $
#
# Consumer of this Makefile should set MESA_SRC_MODULES.
@@ -338,7 +338,7 @@ CPPFLAGS+= -I${X11SRCDIR.MesaLib}/src/${
LIBDPLIBS= m ${NETBSDSRCDIR}/lib/libm
# build the shader headers
-.include "../../tools/glsl/Makefile.glsl"
+#.include "../../tools/glsl/Makefile.glsl"
CPPFLAGS+= -I.
CPPFLAGS+= -I${X11SRCDIR.MesaLib}/include
Added files:
Index: src/external/mit/xorg/lib/libGL/Makefile.glslsrcs
diff -u /dev/null src/external/mit/xorg/lib/libGL/Makefile.glslsrcs:1.2.2.2
--- /dev/null Tue Dec 23 01:44:25 2014
+++ src/external/mit/xorg/lib/libGL/Makefile.glslsrcs Tue Dec 23 01:44:24 2014
@@ -0,0 +1,100 @@
+# $NetBSD: Makefile.glslsrcs,v 1.2.2.2 2014/12/23 01:44:24 snj Exp $
+
+# Derived loosely from src/glsl/Makefile.
+
+# XXX Now that we don't need glsl-compile as a tool, this should just
+# be made into a library instead.
+
+.PATH: ${X11SRCDIR.MesaLib}/src/glsl
+.PATH: ${X11SRCDIR.MesaLib}/src/glsl/glcpp
+
+CPPFLAGS+= -I${X11SRCDIR.MesaLib}/include
+CPPFLAGS+= -I${X11SRCDIR.MesaLib}/src/glsl
+CPPFLAGS+= -I${X11SRCDIR.MesaLib}/src/mapi
+CPPFLAGS+= -I${X11SRCDIR.MesaLib}/src/mesa
+
+SRCS.glsl.libglcpp= \
+ glcpp-lex.c \
+ glcpp-parse.c \
+ pp.c
+
+SRCS.glsl.glcpp= \
+ ${SRCS.glsl.libglcpp} \
+ strtod.c \
+ glcpp.c
+
+SRCS.glsl.c= \
+ strtod.c \
+ ralloc.c \
+ ${SRCS.glsl.libglcpp}
+
+SRCS.glsl.cxx= \
+ ast_expr.cpp \
+ ast_function.cpp \
+ ast_to_hir.cpp \
+ ast_type.cpp \
+ glsl_lexer.cpp \
+ glsl_parser.cpp \
+ glsl_parser_extras.cpp \
+ glsl_types.cpp \
+ glsl_symbol_table.cpp \
+ hir_field_selection.cpp \
+ ir_basic_block.cpp \
+ ir_clone.cpp \
+ ir_constant_expression.cpp \
+ ir.cpp \
+ ir_expression_flattening.cpp \
+ ir_function_can_inline.cpp \
+ ir_function_detect_recursion.cpp \
+ ir_function.cpp \
+ ir_hierarchical_visitor.cpp \
+ ir_hv_accept.cpp \
+ ir_import_prototypes.cpp \
+ ir_print_visitor.cpp \
+ ir_reader.cpp \
+ ir_rvalue_visitor.cpp \
+ ir_set_program_inouts.cpp \
+ ir_validate.cpp \
+ ir_variable.cpp \
+ ir_variable_refcount.cpp \
+ linker.cpp \
+ link_functions.cpp \
+ loop_analysis.cpp \
+ loop_controls.cpp \
+ loop_unroll.cpp \
+ lower_discard.cpp \
+ lower_if_to_cond_assign.cpp \
+ lower_instructions.cpp \
+ lower_jumps.cpp \
+ lower_mat_op_to_vec.cpp \
+ lower_noise.cpp \
+ lower_texture_projection.cpp \
+ lower_variable_index_to_cond_assign.cpp \
+ lower_vec_index_to_cond_assign.cpp \
+ lower_vec_index_to_swizzle.cpp \
+ lower_vector.cpp \
+ opt_algebraic.cpp \
+ opt_constant_folding.cpp \
+ opt_constant_propagation.cpp \
+ opt_constant_variable.cpp \
+ opt_copy_propagation.cpp \
+ opt_copy_propagation_elements.cpp \
+ opt_dead_code.cpp \
+ opt_dead_code_local.cpp \
+ opt_dead_functions.cpp \
+ opt_discard_simplification.cpp \
+ opt_function_inlining.cpp \
+ opt_if_simplification.cpp \
+ opt_noop_swizzle.cpp \
+ opt_redundant_jumps.cpp \
+ opt_structure_splitting.cpp \
+ opt_swizzle_swizzle.cpp \
+ opt_tree_grafting.cpp \
+ s_expression.cpp
+
+SRCS.glsl= \
+ ${SRCS.glsl.c} \
+ ${SRCS.glsl.cxx}
+
+SRCS.glsl+= \
+ builtin_function.cpp
