Merge branch 'mesa_7_6_branch'

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

diff --git a/src/mesa/shader/slang/slang_builtin.h b/src/mesa/shader/slang/slang_builtin.h
index 368a16b234e80dd05233ba8a00da27a113ab282a..f814d11ac73342dc70decb8787201925975fa4a0 100644 (file)
--- a/src/mesa/shader/slang/slang_builtin.h
+++ b/src/mesa/shader/slang/slang_builtin.h
@@ -26,25 +26,29 @@
 #ifndef SLANG_BUILTIN_H
 #define SLANG_BUILTIN_H
 
-#include "prog_parameter.h"
+#include "shader/prog_parameter.h"
 #include "slang_utility.h"
 #include "slang_ir.h"
 
 
 extern GLint
-_slang_lookup_statevar(const char *name, GLint index,
-                       struct gl_program_parameter_list *paramList,
-                       GLuint *swizzleOut);
+_slang_alloc_statevar(slang_ir_node *n,
+                      struct gl_program_parameter_list *paramList,
+                      GLboolean *direct);
 
 
 extern GLint
-_slang_lookup_statevar_field(const char *base, const char *field,
-                             struct gl_program_parameter_list *paramList,
-                             GLuint *swizzleOut);
+_slang_input_index(const char *name, GLenum target, GLuint *swizzleOut);
 
 extern GLint
-_slang_alloc_statevar(slang_ir_node *n,
-                      struct gl_program_parameter_list *paramList);
+_slang_output_index(const char *name, GLenum target);
+
+
+extern const char *
+_slang_vert_attrib_name(GLuint attrib);
+
+extern GLenum
+_slang_vert_attrib_type(GLuint attrib);
 
 
 #endif /* SLANG_BUILTIN_H */