Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/trunk]: src/external/mit/xorg delete tools/glsl, is hasn't been used for...
details: https://anonhg.NetBSD.org/src/rev/3a9226a62fc4
branches: trunk
changeset: 805057:3a9226a62fc4
user: mrg <mrg%NetBSD.org@localhost>
date: Mon Dec 15 00:20:29 2014 +0000
description:
delete tools/glsl, is hasn't been used for a while.
move Makefile.glsl into libGL.
diffstat:
external/mit/xorg/lib/dri/libmesa/Makefile | 4 +-
external/mit/xorg/lib/libGL/Makefile | 4 +-
external/mit/xorg/lib/libGL/Makefile.glslsrcs | 100 +++++++++++++++++++++++++
external/mit/xorg/lib/libOSMesa/libmesa.mk | 4 +-
external/mit/xorg/tools/glsl/Makefile | 19 ----
external/mit/xorg/tools/glsl/Makefile.glsl | 7 -
external/mit/xorg/tools/glsl/Makefile.glslsrcs | 100 -------------------------
7 files changed, 106 insertions(+), 132 deletions(-)
diffs (296 lines):
diff -r 5aa5a28222b0 -r 3a9226a62fc4 external/mit/xorg/lib/dri/libmesa/Makefile
--- a/external/mit/xorg/lib/dri/libmesa/Makefile Sun Dec 14 23:49:45 2014 +0000
+++ b/external/mit/xorg/lib/dri/libmesa/Makefile Mon Dec 15 00:20:29 2014 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2014/07/13 16:35:49 joerg Exp $
+# $NetBSD: Makefile,v 1.14 2014/12/15 00:20:29 mrg Exp $
.include <bsd.own.mk>
@@ -24,7 +24,7 @@
CFLAGS+= -pthread
.include "../../libOSMesa/libmesa.mk"
-.include "../../../tools/glsl/Makefile.glslsrcs"
+.include "../../libGL/Makefile.glslsrcs"
SRCS+= ${SRCS.glsl}
diff -r 5aa5a28222b0 -r 3a9226a62fc4 external/mit/xorg/lib/libGL/Makefile
--- a/external/mit/xorg/lib/libGL/Makefile Sun Dec 14 23:49:45 2014 +0000
+++ b/external/mit/xorg/lib/libGL/Makefile Mon Dec 15 00:20:29 2014 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.19 2014/07/09 20:22:56 riastradh Exp $
+# $NetBSD: Makefile,v 1.20 2014/12/15 00:20:29 mrg Exp $
.include <bsd.own.mk>
@@ -57,7 +57,7 @@
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}
diff -r 5aa5a28222b0 -r 3a9226a62fc4 external/mit/xorg/lib/libGL/Makefile.glslsrcs
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/external/mit/xorg/lib/libGL/Makefile.glslsrcs Mon Dec 15 00:20:29 2014 +0000
@@ -0,0 +1,100 @@
+# $NetBSD: Makefile.glslsrcs,v 1.1 2014/12/15 00:20:29 mrg 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
diff -r 5aa5a28222b0 -r 3a9226a62fc4 external/mit/xorg/lib/libOSMesa/libmesa.mk
--- a/external/mit/xorg/lib/libOSMesa/libmesa.mk Sun Dec 14 23:49:45 2014 +0000
+++ b/external/mit/xorg/lib/libOSMesa/libmesa.mk Mon Dec 15 00:20:29 2014 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: libmesa.mk,v 1.8 2014/07/09 20:22:56 riastradh Exp $
+# $NetBSD: libmesa.mk,v 1.9 2014/12/15 00:20:29 mrg Exp $
#
# Consumer of this Makefile should set MESA_SRC_MODULES.
@@ -338,7 +338,7 @@
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
diff -r 5aa5a28222b0 -r 3a9226a62fc4 external/mit/xorg/tools/glsl/Makefile
--- a/external/mit/xorg/tools/glsl/Makefile Sun Dec 14 23:49:45 2014 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,19 +0,0 @@
-# $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>
diff -r 5aa5a28222b0 -r 3a9226a62fc4 external/mit/xorg/tools/glsl/Makefile.glsl
--- a/external/mit/xorg/tools/glsl/Makefile.glsl Sun Dec 14 23:49:45 2014 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,7 +0,0 @@
-# $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})
diff -r 5aa5a28222b0 -r 3a9226a62fc4 external/mit/xorg/tools/glsl/Makefile.glslsrcs
--- a/external/mit/xorg/tools/glsl/Makefile.glslsrcs Sun Dec 14 23:49:45 2014 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,100 +0,0 @@
-# $NetBSD: Makefile.glslsrcs,v 1.2 2014/07/09 20:22:56 riastradh 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
Home |
Main Index |
Thread Index |
Old Index