summaryrefslogtreecommitdiff
path: root/src/mesa/shader/slang/slang_compile.h
diff options
context:
space:
mode:
authorBrian Paul <brian.paul@tungstengraphics.com>2008-12-16 15:50:14 -0700
committerBrian Paul <brian.paul@tungstengraphics.com>2008-12-16 15:50:14 -0700
commitb0caa10a85b39f0e657dc0c4816884c9356b0b1a (patch)
tree812ec91f0cf375921533c2722de313461004aa20 /src/mesa/shader/slang/slang_compile.h
parent3616fb08da8ef392db1d5ccab55b8eb9f6a6f32b (diff)
parent3be8d6db9e8bfbd1b3ebf9ac382857ad1e6ef753 (diff)
Merge commit 'origin/master' into gallium-0.2
Diffstat (limited to 'src/mesa/shader/slang/slang_compile.h')
-rw-r--r--src/mesa/shader/slang/slang_compile.h14
1 files changed, 7 insertions, 7 deletions
diff --git a/src/mesa/shader/slang/slang_compile.h b/src/mesa/shader/slang/slang_compile.h
index 35e468b44e..7fb549d33d 100644
--- a/src/mesa/shader/slang/slang_compile.h
+++ b/src/mesa/shader/slang/slang_compile.h
@@ -37,6 +37,13 @@
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,
@@ -46,12 +53,6 @@ typedef enum slang_unit_type_
} slang_unit_type;
-typedef struct slang_var_pool_
-{
- GLuint next_addr;
-} slang_var_pool;
-
-
typedef struct slang_code_unit_
{
slang_variable_scope vars;
@@ -79,7 +80,6 @@ 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;