summaryrefslogtreecommitdiff
path: root/src/compiler
diff options
context:
space:
mode:
authorCarl Worth <cworth@cworth.org>2015-03-11 17:31:11 -0700
committerTimothy Arceri <timothy.arceri@collabora.com>2016-09-27 11:11:15 +1000
commitf61669f9976750c4ecc751d54a4937a3ff179270 (patch)
tree8a405ea123956bbcb16e8e236dc40826c610cb79 /src/compiler
parentf24b517858b475a903a13002b0bd8d52b22609b4 (diff)
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/compiler')
-rw-r--r--src/compiler/glsl/standalone_scaffolding.cpp12
-rw-r--r--src/compiler/glsl/standalone_scaffolding.h8
2 files changed, 20 insertions, 0 deletions
diff --git a/src/compiler/glsl/standalone_scaffolding.cpp b/src/compiler/glsl/standalone_scaffolding.cpp
index b0fb4b726a..aa79b8659e 100644
--- a/src/compiler/glsl/standalone_scaffolding.cpp
+++ b/src/compiler/glsl/standalone_scaffolding.cpp
@@ -95,6 +95,18 @@ _mesa_new_linked_shader(gl_shader_stage stage)
return shader;
}
+GLbitfield
+_mesa_program_state_flags(const gl_state_index state[STATE_LENGTH])
+{
+ return 0;
+}
+
+char *
+_mesa_program_state_string(const gl_state_index state[STATE_LENGTH])
+{
+ return NULL;
+}
+
void
_mesa_delete_shader(struct gl_context *ctx, struct gl_shader *sh)
{
diff --git a/src/compiler/glsl/standalone_scaffolding.h b/src/compiler/glsl/standalone_scaffolding.h
index a19eae28de..b56dd3e870 100644
--- a/src/compiler/glsl/standalone_scaffolding.h
+++ b/src/compiler/glsl/standalone_scaffolding.h
@@ -33,6 +33,7 @@
#include <assert.h>
#include "main/mtypes.h"
+#include "program/prog_statevars.h"
extern "C" void
_mesa_warning(struct gl_context *ctx, const char *fmtString, ... );
@@ -61,6 +62,13 @@ extern "C" void
_mesa_shader_debug(struct gl_context *ctx, GLenum type, GLuint *id,
const char *msg);
+extern "C" GLbitfield
+_mesa_program_state_flags(const gl_state_index state[STATE_LENGTH]);
+
+
+extern "C" char *
+_mesa_program_state_string(const gl_state_index state[STATE_LENGTH]);
+
static inline gl_shader_stage
_mesa_shader_enum_to_shader_stage(GLenum v)
{