Mesa (master): glsl: Create an accessor for the built-in function shader.

Kenneth Graunke kwg at kemper.freedesktop.org
Sun Dec 1 23:35:23 UTC 2013


Module: Mesa
Branch: master
Commit: 1b557b1606ffcf05d2612d66226306e876b6b937
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=1b557b1606ffcf05d2612d66226306e876b6b937

Author: Kenneth Graunke <kenneth at whitecape.org>
Date:   Sat Nov 23 10:58:51 2013 -0800

glsl: Create an accessor for the built-in function shader.

Signed-off-by: Kenneth Graunke <kenneth at whitecape.org>
Reviewed-by: Ian Romanick <ian.d.romanick at intel.com>

---

 src/glsl/builtin_functions.cpp |   12 ++++++++++--
 src/glsl/ir.h                  |    3 +++
 2 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/src/glsl/builtin_functions.cpp b/src/glsl/builtin_functions.cpp
index 8cb75e5..e768685 100644
--- a/src/glsl/builtin_functions.cpp
+++ b/src/glsl/builtin_functions.cpp
@@ -357,8 +357,6 @@ public:
    ir_function_signature *find(_mesa_glsl_parse_state *state,
                                const char *name, exec_list *actual_parameters);
 
-private:
-   void *mem_ctx;
    /**
     * A shader to hold all the built-in signatures; created by this module.
     *
@@ -368,6 +366,9 @@ private:
     */
    gl_shader *shader;
 
+private:
+   void *mem_ctx;
+
    /** Global variables used by built-in functions. */
    ir_variable *gl_ModelViewProjectionMatrix;
    ir_variable *gl_Vertex;
@@ -4020,4 +4021,11 @@ _mesa_glsl_find_builtin_function(_mesa_glsl_parse_state *state,
 {
    return builtins.find(state, name, actual_parameters);
 }
+
+gl_shader *
+_mesa_glsl_get_builtin_function_shader()
+{
+   return builtins.shader;
+}
+
 /** @} */
diff --git a/src/glsl/ir.h b/src/glsl/ir.h
index b898d61..57f3bca 100644
--- a/src/glsl/ir.h
+++ b/src/glsl/ir.h
@@ -2366,6 +2366,9 @@ extern ir_function_signature *
 _mesa_glsl_find_builtin_function(_mesa_glsl_parse_state *state,
                                  const char *name, exec_list *actual_parameters);
 
+extern gl_shader *
+_mesa_glsl_get_builtin_function_shader(void);
+
 extern void
 _mesa_glsl_release_functions(void);
 




More information about the mesa-commit mailing list