Merge branch 'mesa_7_7_branch'

[mesa.git] / src / mesa / shader / slang / slang_compile.h

diff --git a/src/mesa/shader/slang/slang_compile.h b/src/mesa/shader/slang/slang_compile.h
index e7be7ef0697d6ca5aa339a99ffd7133abe871c76..7fb549d33d2b7accf8c035df43f839a0be87614d 100644 (file)
--- a/src/mesa/shader/slang/slang_compile.h
+++ b/src/mesa/shader/slang/slang_compile.h
@@ -25,8 +25,8 @@
 #if !defined SLANG_COMPILE_H
 #define SLANG_COMPILE_H
 
-#include "imports.h"
-#include "mtypes.h"
+#include "main/imports.h"
+#include "main/mtypes.h"
 #include "slang_typeinfo.h"
 #include "slang_compile_variable.h"
 #include "slang_compile_struct.h"
@@ -37,18 +37,21 @@
 extern "C" {
 #endif
 
+typedef struct slang_name_space_
+{
+   struct slang_function_scope_ *funcs;
+   struct slang_struct_scope_ *structs;
+   struct slang_variable_scope_ *vars;
+} slang_name_space;
+
 typedef enum slang_unit_type_
 {
-       slang_unit_fragment_shader,
-       slang_unit_vertex_shader,
-       slang_unit_fragment_builtin,
-       slang_unit_vertex_builtin
+   SLANG_UNIT_FRAGMENT_SHADER,
+   SLANG_UNIT_VERTEX_SHADER,
+   SLANG_UNIT_FRAGMENT_BUILTIN,
+   SLANG_UNIT_VERTEX_BUILTIN
 } slang_unit_type;
 
-typedef struct slang_var_pool_
-{
-       GLuint next_addr;
-} slang_var_pool;
 
 typedef struct slang_code_unit_
 {
@@ -59,6 +62,7 @@ typedef struct slang_code_unit_
    struct slang_code_object_ *object;
 } slang_code_unit;
 
+
 extern GLvoid
 _slang_code_unit_ctr (slang_code_unit *, struct slang_code_object_ *);
 
@@ -66,16 +70,16 @@ extern GLvoid
 _slang_code_unit_dtr (slang_code_unit *);
 
 #define SLANG_BUILTIN_CORE   0
-#define SLANG_BUILTIN_COMMON 1
-#define SLANG_BUILTIN_TARGET 2
+#define SLANG_BUILTIN_120_CORE   1
+#define SLANG_BUILTIN_COMMON 2
+#define SLANG_BUILTIN_TARGET 3
 
-#define SLANG_BUILTIN_TOTAL  3
+#define SLANG_BUILTIN_TOTAL  4
 
 typedef struct slang_code_object_
 {
    slang_code_unit builtin[SLANG_BUILTIN_TOTAL];
    slang_code_unit unit;
-   slang_var_pool varpool;
    slang_atom_pool atompool;
 } slang_code_object;
 
@@ -85,19 +89,6 @@ _slang_code_object_ctr (slang_code_object *);
 extern GLvoid
 _slang_code_object_dtr (slang_code_object *);
 
-typedef struct slang_info_log_
-{
-       char *text;
-       int dont_free_text;
-} slang_info_log;
-
-void slang_info_log_construct (slang_info_log *);
-void slang_info_log_destruct (slang_info_log *);
-int slang_info_log_print (slang_info_log *, const char *, ...);
-int slang_info_log_error (slang_info_log *, const char *, ...);
-int slang_info_log_warning (slang_info_log *, const char *, ...);
-void slang_info_log_memory (slang_info_log *);
-
 extern GLboolean
 _slang_compile (GLcontext *ctx, struct gl_shader *shader);