head	1.3;
access;
symbols
	perseant-exfatfs-base-20250801:1.3
	perseant-exfatfs-base-20240630:1.3
	perseant-exfatfs:1.3.0.16
	perseant-exfatfs-base:1.3
	cjep_sun2x:1.3.0.14
	cjep_sun2x-base:1.3
	cjep_staticlib_x-base1:1.3
	cjep_staticlib_x:1.3.0.12
	cjep_staticlib_x-base:1.3
	phil-wifi-20200421:1.3
	phil-wifi-20200411:1.3
	phil-wifi-20200406:1.3
	pgoyette-compat-merge-20190127:1.3
	pgoyette-compat-20190127:1.3
	pgoyette-compat-20190118:1.3
	pgoyette-compat-1226:1.3
	pgoyette-compat-1126:1.3
	pgoyette-compat-1020:1.3
	pgoyette-compat-0930:1.3
	pgoyette-compat-0906:1.3
	netbsd-7-2-RELEASE:1.2.2.1
	pgoyette-compat-0728:1.3
	pgoyette-compat-0625:1.3
	pgoyette-compat-0521:1.3
	pgoyette-compat-0502:1.3
	pgoyette-compat-0422:1.3
	pgoyette-compat-0415:1.3
	pgoyette-compat-0407:1.3
	pgoyette-compat-0330:1.3
	pgoyette-compat-0322:1.3
	pgoyette-compat-0315:1.3
	netbsd-7-1-2-RELEASE:1.2.2.1
	pgoyette-compat:1.3.0.10
	pgoyette-compat-base:1.3
	netbsd-7-1-1-RELEASE:1.2.2.1
	perseant-stdc-iso10646:1.3.0.8
	perseant-stdc-iso10646-base:1.3
	prg-localcount2-base3:1.3
	prg-localcount2-base2:1.3
	prg-localcount2-base1:1.3
	prg-localcount2:1.3.0.6
	prg-localcount2-base:1.3
	pgoyette-localcount-20170426:1.3
	bouyer-socketcan-base1:1.3
	pgoyette-localcount-20170320:1.3
	netbsd-7-1:1.2.2.1.0.4
	netbsd-7-1-RELEASE:1.2.2.1
	netbsd-7-1-RC2:1.2.2.1
	bouyer-socketcan:1.3.0.4
	bouyer-socketcan-base:1.3
	pgoyette-localcount-20170107:1.3
	netbsd-7-1-RC1:1.2.2.1
	pgoyette-localcount-20161104:1.3
	netbsd-7-0-2-RELEASE:1.2.2.1
	localcount-20160914:1.3
	pgoyette-localcount-20160806:1.3
	pgoyette-localcount-20160726:1.3
	pgoyette-localcount:1.3.0.2
	pgoyette-localcount-base:1.3
	netbsd-7-0-1-RELEASE:1.2.2.1
	netbsd-7-0:1.2.2.1.0.2
	netbsd-7-0-RELEASE:1.2.2.1
	netbsd-7-0-RC3:1.2.2.1
	netbsd-7-0-RC2:1.2.2.1
	netbsd-7-0-RC1:1.2.2.1
	netbsd-6-0-6-RELEASE:1.1
	netbsd-6-1-5-RELEASE:1.1
	netbsd-7:1.2.0.2
	netbsd-7-base:1.2
	yamt-pagecache-base9:1.1
	yamt-pagecache-tag8:1.1
	netbsd-6-1-4-RELEASE:1.1
	netbsd-6-0-5-RELEASE:1.1
	tls-earlyentropy:1.1.0.22
	tls-earlyentropy-base:1.2
	riastradh-xf86-video-intel-2-7-1-pre-2-21-15:1.1
	riastradh-drm2-base3:1.1
	netbsd-6-1-3-RELEASE:1.1
	netbsd-6-0-4-RELEASE:1.1
	netbsd-6-1-2-RELEASE:1.1
	netbsd-6-0-3-RELEASE:1.1
	netbsd-6-1-1-RELEASE:1.1
	riastradh-drm2-base2:1.1
	riastradh-drm2-base1:1.1
	riastradh-drm2:1.1.0.16
	riastradh-drm2-base:1.1
	netbsd-6-1:1.1.0.20
	netbsd-6-0-2-RELEASE:1.1
	netbsd-6-1-RELEASE:1.1
	netbsd-6-1-RC4:1.1
	netbsd-6-1-RC3:1.1
	agc-symver:1.1.0.18
	agc-symver-base:1.1
	netbsd-6-1-RC2:1.1
	netbsd-6-1-RC1:1.1
	yamt-pagecache-base8:1.1
	netbsd-6-0-1-RELEASE:1.1
	yamt-pagecache-base7:1.1
	matt-nb6-plus-nbase:1.1
	yamt-pagecache-base6:1.1
	netbsd-6-0:1.1.0.14
	netbsd-6-0-RELEASE:1.1
	netbsd-6-0-RC2:1.1
	tls-maxphys:1.1.0.12
	tls-maxphys-base:1.2
	matt-nb6-plus:1.1.0.10
	matt-nb6-plus-base:1.1
	netbsd-6-0-RC1:1.1
	yamt-pagecache-base5:1.1
	yamt-pagecache-base4:1.1
	netbsd-6:1.1.0.8
	netbsd-6-base:1.1
	yamt-pagecache-base3:1.1
	yamt-pagecache-base2:1.1
	yamt-pagecache:1.1.0.6
	yamt-pagecache-base:1.1
	cherry-xenmp:1.1.0.4
	cherry-xenmp-base:1.1
	bouyer-quota2-nbase:1.1
	bouyer-quota2:1.1.0.2
	bouyer-quota2-base:1.1
	matt-mips64-premerge-20101231:1.1;
locks; strict;
comment	@# @;


1.3
date	2014.12.15.00.20.29;	author mrg;	state dead;
branches;
next	1.2;
commitid	gOa1i3AQClDsl42y;

1.2
date	2014.07.09.20.22.56;	author riastradh;	state Exp;
branches
	1.2.2.1;
next	1.1;
commitid	TCU62SXGWdah6KHx;

1.1
date	2010.07.19.05.34.28;	author mrg;	state Exp;
branches
	1.1.12.1
	1.1.22.1;
next	;

1.2.2.1
date	2014.12.23.01.44.24;	author snj;	state dead;
branches;
next	;
commitid	tJrwtBpHnY9px63y;

1.1.12.1
date	2014.08.20.00.00.16;	author tls;	state Exp;
branches;
next	;
commitid	jTnpym9Qu0o4R1Nx;

1.1.22.1
date	2014.08.10.06.50.58;	author tls;	state Exp;
branches;
next	;
commitid	DgL6ai6yRo4DAMLx;


desc
@@


1.3
log
@delete tools/glsl, is hasn't been used for a while.
move Makefile.glsl into libGL.
@
text
@#	$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
@


1.2
log
@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.
@
text
@d1 1
a1 1
#	$NetBSD: Makefile.glslsrcs,v 1.1 2010/07/19 05:34:28 mrg Exp $
@


1.2.2.1
log
@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.
@
text
@d1 1
a1 1
#	$NetBSD: Makefile.glslsrcs,v 1.2 2014/07/09 20:22:56 riastradh Exp $
@


1.1
log
@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
@
text
@d1 1
a1 1
#	$NetBSD$
d3 1
a3 16
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
d5 2
a6 2
SRCS.cl=	\
	sl_cl_parse.c
d8 93
a100 2
.PATH:	${X11SRCDIR.MesaLib}/src/glsl/pp
.PATH:	${X11SRCDIR.MesaLib}/src/glsl/cl
@


1.1.12.1
log
@Rebase to HEAD as of a few days ago.
@
text
@d3 16
a18 1
# Derived loosely from src/glsl/Makefile.
d20 2
a21 2
# XXX Now that we don't need glsl-compile as a tool, this should just
# be made into a library instead.
d23 2
a24 93
.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
@


1.1.22.1
log
@Rebase.
@
text
@d1 1
a1 1
#	$NetBSD: Makefile.glslsrcs,v 1.2 2014/07/09 20:22:56 riastradh Exp $
d3 16
a18 1
# Derived loosely from src/glsl/Makefile.
d20 2
a21 2
# XXX Now that we don't need glsl-compile as a tool, this should just
# be made into a library instead.
d23 2
a24 93
.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
@