glsl_compiler: Re-enable building glsl_compiler
This allows application developers to use Mesa's compiler as a
standalone validator for their shaders.
This is mostly a revert of commit 569f0e4
.
Signed-off-by: Ian Romanick <ian.d.romanick@intel.com>
Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
This commit is contained in:
parent
5d6b0e7f1b
commit
75e9bd13c4
|
@ -49,6 +49,8 @@ check_PROGRAMS = \
|
|||
tests/sampler-types-test \
|
||||
tests/uniform-initializer-test
|
||||
|
||||
noinst_PROGRAMS = glsl_compiler
|
||||
|
||||
tests_uniform_initializer_test_SOURCES = \
|
||||
$(top_srcdir)/src/mesa/main/hash_table.c \
|
||||
$(top_srcdir)/src/mesa/main/imports.c \
|
||||
|
@ -99,6 +101,15 @@ libglsl_la_SOURCES = \
|
|||
glsl_parser.cpp \
|
||||
$(LIBGLSL_FILES)
|
||||
|
||||
glsl_compiler_SOURCES = \
|
||||
$(top_srcdir)/src/mesa/main/hash_table.c \
|
||||
$(top_srcdir)/src/mesa/main/imports.c \
|
||||
$(top_srcdir)/src/mesa/program/prog_hash_table.c \
|
||||
$(top_srcdir)/src/mesa/program/symbol_table.c \
|
||||
$(GLSL_COMPILER_CXX_FILES)
|
||||
|
||||
glsl_compiler_LDADD = libglsl.la
|
||||
|
||||
glsl_test_SOURCES = \
|
||||
$(top_srcdir)/src/mesa/main/hash_table.c \
|
||||
$(top_srcdir)/src/mesa/main/imports.c \
|
||||
|
|
|
@ -98,11 +98,11 @@ if env['platform'] == 'windows':
|
|||
|
||||
env.Prepend(LIBS = [glsl])
|
||||
|
||||
glsl2 = env.Program(
|
||||
target = 'glsl2',
|
||||
glsl_compiler = env.Program(
|
||||
target = 'glsl_compiler',
|
||||
source = compiler_objs,
|
||||
)
|
||||
env.Alias('glsl2', glsl2)
|
||||
env.Alias('glsl_compiler', glsl_compiler)
|
||||
|
||||
glcpp = env.Program(
|
||||
target = 'glcpp/glcpp',
|
||||
|
|
Loading…
Reference in New Issue