Mesa (master): glsl: make _mesa_shader_stage_to_string() available to non-C++ code.
Paul Berry
stereotype441 at kemper.freedesktop.org
Wed Jan 8 15:44:12 UTC 2014
Module: Mesa
Branch: master
Commit: 72a995d30721246476c94f95c7df10838fe7f69a
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=72a995d30721246476c94f95c7df10838fe7f69a
Author: Paul Berry <stereotype441 at gmail.com>
Date: Tue Jan 7 10:58:56 2014 -0800
glsl: make _mesa_shader_stage_to_string() available to non-C++ code.
Reviewed-by: Brian Paul <brianp at vmware.com>
v2: Split from patch "mesa: Store gl_shader_stage enum in gl_shader objects."
Reviewed-by: Kenneth Graunke <kenneth at whitecape.org>
---
src/glsl/glsl_parser_extras.h | 15 +++++++--------
1 file changed, 7 insertions(+), 8 deletions(-)
diff --git a/src/glsl/glsl_parser_extras.h b/src/glsl/glsl_parser_extras.h
index 8e0ae3b..197f337 100644
--- a/src/glsl/glsl_parser_extras.h
+++ b/src/glsl/glsl_parser_extras.h
@@ -423,14 +423,6 @@ extern bool _mesa_glsl_process_extension(const char *name, YYLTYPE *name_locp,
YYLTYPE *behavior_locp,
_mesa_glsl_parse_state *state);
-/**
- * Get the textual name of the specified shader stage (which is a
- * gl_shader_stage).
- */
-extern const char *
-_mesa_shader_stage_to_string(unsigned stage);
-
-
#endif /* __cplusplus */
@@ -441,6 +433,13 @@ _mesa_shader_stage_to_string(unsigned stage);
extern "C" {
#endif
+/**
+ * Get the textual name of the specified shader stage (which is a
+ * gl_shader_stage).
+ */
+extern const char *
+_mesa_shader_stage_to_string(unsigned stage);
+
extern const char *
_mesa_progshader_enum_to_string(GLenum type);
More information about the mesa-commit
mailing list