diff options
| author | Carl Worth <cworth@cworth.org> | 2015-03-11 17:31:11 -0700 |
|---|---|---|
| committer | Timothy Arceri <timothy.arceri@collabora.com> | 2016-09-27 11:11:15 +1000 |
| commit | f61669f9976750c4ecc751d54a4937a3ff179270 (patch) | |
| tree | 8a405ea123956bbcb16e8e236dc40826c610cb79 /src/Makefile.am | |
| parent | f24b517858b475a903a13002b0bd8d52b22609b4 (diff) | |
| download | external_mesa3d-f61669f9976750c4ecc751d54a4937a3ff179270.zip external_mesa3d-f61669f9976750c4ecc751d54a4937a3ff179270.tar.gz external_mesa3d-f61669f9976750c4ecc751d54a4937a3ff179270.tar.bz2 | |
glsl: Prepare standalone compiler to be able to use parameter lists
As part of the shader-cache work an upcoming change will add new
references to _mesa_add_parameter and _mesa_new_parameter_list from
the glsl code. To prepare for that, and to allow the standalone
glsl_compiler to still link, here we add mesa/program/prog_parameter.c
to the libglsl_util sources.
Then, in order to get *that* to work, we also add to stubs to
standalone_scaffolding:
_mesa_program_state_flags
_mesa_program_state_string
These functions aren't actually used by the two functions in
prog_parameter.c that we are actually calling. They are used in other
functions in the same file. So we don't care what the implementation
of these stubs is, (they won't be called by glsl_compiler). We just
need the stubs present so that it can link.
Signed-off-by: Timothy Arceri <timothy.arceri@collabora.com>
Reviewed-by: Eric Anholt <eric@anholt.net>
Diffstat (limited to 'src/Makefile.am')
| -rw-r--r-- | src/Makefile.am | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/src/Makefile.am b/src/Makefile.am index b0b64d7..551f431 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -110,6 +110,8 @@ AM_CPPFLAGS = \ -I$(top_srcdir)/include/ \ -I$(top_srcdir)/src/mapi/ \ -I$(top_srcdir)/src/mesa/ \ + -I$(top_srcdir)/src/gallium/include \ + -I$(top_srcdir)/src/gallium/auxiliary \ $(DEFINES) noinst_LTLIBRARIES = libglsl_util.la @@ -117,5 +119,6 @@ noinst_LTLIBRARIES = libglsl_util.la libglsl_util_la_SOURCES = \ mesa/main/extensions_table.c \ mesa/main/imports.c \ + mesa/program/prog_parameter.c \ mesa/program/symbol_table.c \ mesa/program/dummy_errors.c |