Mesa (master): mesa: Make get_shader_flags publicly available
Ian Romanick
idr at kemper.freedesktop.org
Fri Feb 21 23:41:20 UTC 2014
Module: Mesa
Branch: master
Commit: 47476fa673eb2eaf3046674c35bce533b38ad800
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=47476fa673eb2eaf3046674c35bce533b38ad800
Author: Gregory Hainaut <gregory.hainaut at gmail.com>
Date: Fri Jun 28 13:35:15 2013 -0700
mesa: Make get_shader_flags publicly available
Future patches will use this function outside shaderapi.c.
This was originally included in another patch, but it was split out by
Ian Romanick.
Reviewed-by: Ian Romanick <ian.d.romanick at intel.com>
Reviewed-by: Jordan Justen <jordan.l.justen at intel.com>
---
src/mesa/main/shaderapi.c | 6 +++---
src/mesa/main/shaderapi.h | 3 +++
2 files changed, 6 insertions(+), 3 deletions(-)
diff --git a/src/mesa/main/shaderapi.c b/src/mesa/main/shaderapi.c
index 3c946fe..939e9801 100644
--- a/src/mesa/main/shaderapi.c
+++ b/src/mesa/main/shaderapi.c
@@ -65,8 +65,8 @@
/**
* Return mask of GLSL_x flags by examining the MESA_GLSL env var.
*/
-static GLbitfield
-get_shader_flags(void)
+GLbitfield
+_mesa_get_shader_flags(void)
{
GLbitfield flags = 0x0;
const char *env = _mesa_getenv("MESA_GLSL");
@@ -120,7 +120,7 @@ _mesa_init_shader_state(struct gl_context *ctx)
for (sh = 0; sh < MESA_SHADER_STAGES; ++sh)
memcpy(&ctx->ShaderCompilerOptions[sh], &options, sizeof(options));
- ctx->Shader.Flags = get_shader_flags();
+ ctx->Shader.Flags = _mesa_get_shader_flags();
}
diff --git a/src/mesa/main/shaderapi.h b/src/mesa/main/shaderapi.h
index 109a802..44426cc 100644
--- a/src/mesa/main/shaderapi.h
+++ b/src/mesa/main/shaderapi.h
@@ -40,6 +40,9 @@ struct _glapi_table;
struct gl_context;
struct gl_shader_program;
+extern GLbitfield
+_mesa_get_shader_flags(void);
+
extern void
_mesa_copy_string(GLchar *dst, GLsizei maxLength,
GLsizei *length, const GLchar *src);
More information about the mesa-commit
mailing list