Merge remote-tracking branch 'mesa-public/master' into vulkan

[mesa.git] / src / glsl / glsl_symbol_table.h

diff --git a/src/glsl/glsl_symbol_table.h b/src/glsl/glsl_symbol_table.h
index 4cb7559e9a031e2a37960ad8521900a95e79a2c6..e32b88b8699592408e9743d5fffa56a14dcfa3ca 100644 (file)
--- a/src/glsl/glsl_symbol_table.h
+++ b/src/glsl/glsl_symbol_table.h
@@ -32,7 +32,9 @@ extern "C" {
 #include "program/symbol_table.h"
 }
 #include "ir.h"
-#include "glsl_types.h"
+
+class symbol_table_entry;
+struct glsl_type;
 
 /**
  * Facade class for _mesa_symbol_table
@@ -41,72 +43,21 @@ extern "C" {
  * type safe and some symbol table invariants.
  */
 struct glsl_symbol_table {
-private:
-   enum glsl_symbol_name_space {
-      glsl_variable_name_space = 0,
-      glsl_type_name_space = 1,
-      glsl_function_name_space = 2
-   };
-
-   static int
-   _glsl_symbol_table_destructor (glsl_symbol_table *table)
-   {
-      table->~glsl_symbol_table();
-
-      return 0;
-   }
-
-public:
-   /* Callers of this talloc-based new need not call delete. It's
-    * easier to just talloc_free 'ctx' (or any of its ancestors). */
-   static void* operator new(size_t size, void *ctx)
-   {
-      void *table;
-
-      table = talloc_size(ctx, size);
-      assert(table != NULL);
-
-      talloc_set_destructor(table, (int (*)(void*)) _glsl_symbol_table_destructor);
-
-      return table;
-   }
-
-   /* If the user *does* call delete, that's OK, we will just
-    * talloc_free in that case. Here, C++ will have already called the
-    * destructor so tell talloc not to do that again. */
-   static void operator delete(void *table)
-   {
-      talloc_set_destructor(table, NULL);
-      talloc_free(table);
-   }
-   
-   glsl_symbol_table()
-   {
-      table = _mesa_symbol_table_ctor();
-   }
-
-   ~glsl_symbol_table()
-   {
-      _mesa_symbol_table_dtor(table);
-   }
-
-   void push_scope()
-   {
-      _mesa_symbol_table_push_scope(table);
-   }
-
-   void pop_scope()
-   {
-      _mesa_symbol_table_pop_scope(table);
-   }
+   DECLARE_RALLOC_CXX_OPERATORS(glsl_symbol_table)
+
+   glsl_symbol_table();
+   ~glsl_symbol_table();
+
+   /* In 1.10, functions and variables have separate namespaces. */
+   bool separate_function_namespace;
+
+   void push_scope();
+   void pop_scope();
 
    /**
     * Determine whether a name was declared at the current scope
     */
-   bool name_declared_this_scope(const char *name)
-   {
-      return _mesa_symbol_table_symbol_scope(table, -1, name) == 0;
-   }
+   bool name_declared_this_scope(const char *name);
 
    /**
     * \name Methods to add symbols to the table
@@ -116,56 +67,42 @@ public:
     * reduces the clarity of the intention of code that uses these methods.
     */
    /*@{*/
-   bool add_variable(const char *name, ir_variable *v)
-   {
-      return _mesa_symbol_table_add_symbol(table, glsl_variable_name_space,
-                                          name, v) == 0;
-   }
-
-   bool add_type(const char *name, const glsl_type *t)
-   {
-      return _mesa_symbol_table_add_symbol(table, glsl_type_name_space,
-                                          name, (void *) t) == 0;
-   }
-
-   bool add_function(const char *name, ir_function *f)
-   {
-      return _mesa_symbol_table_add_symbol(table, glsl_function_name_space,
-                                          name, f) == 0;
-   }
-
-   bool remove_function(const char *name, ir_function *f)
-   {
-      return _mesa_symbol_table_add_symbol(table, glsl_function_name_space,
-                                          name, f) == 0;
-   }
+   bool add_variable(ir_variable *v);
+   bool add_type(const char *name, const glsl_type *t);
+   bool add_function(ir_function *f);
+   bool add_interface(const char *name, const glsl_type *i,
+                      enum ir_variable_mode mode);
    /*@}*/
 
+   /**
+    * Add an function at global scope without checking for scoping conflicts.
+    */
+   void add_global_function(ir_function *f);
+
    /**
     * \name Methods to get symbols from the table
     */
    /*@{*/
-   ir_variable *get_variable(const char *name)
-   {
-      return (ir_variable *)
-        _mesa_symbol_table_find_symbol(table, glsl_variable_name_space, name);
-   }
-
-   glsl_type *get_type(const char *name)
-   {
-      return (glsl_type *)
-        _mesa_symbol_table_find_symbol(table, glsl_type_name_space, name);
-   }
-
-   ir_function *get_function(const char *name)
-   {
-      return (ir_function *)
-        _mesa_symbol_table_find_symbol(table, glsl_function_name_space, name);
-   }
+   ir_variable *get_variable(const char *name);
+   const glsl_type *get_type(const char *name);
+   ir_function *get_function(const char *name);
+   const glsl_type *get_interface(const char *name,
+                                  enum ir_variable_mode mode);
    /*@}*/
 
+   /**
+    * Disable a previously-added variable so that it no longer appears to be
+    * in the symbol table.  This is necessary when gl_PerVertex is redeclared,
+    * to ensure that previously-available built-in variables are no longer
+    * available.
+    */
+   void disable_variable(const char *name);
+
 private:
+   symbol_table_entry *get_entry(const char *name);
+
    struct _mesa_symbol_table *table;
+   void *mem_ctx;
 };
 
 #endif /* GLSL_SYMBOL_TABLE */