Merge remote branch 'origin/mesa_7_6_branch'

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

diff --git a/src/mesa/shader/slang/slang_emit.h b/src/mesa/shader/slang/slang_emit.h
index 50585a4a0311c9f5127bd5c279aa1b4c4d4d5edf..ab4c202d673e7b67d8a682f2c258a0423f8dd36b 100644 (file)
--- a/src/mesa/shader/slang/slang_emit.h
+++ b/src/mesa/shader/slang/slang_emit.h
@@ -1,8 +1,8 @@
 /*
  * Mesa 3-D graphics library
- * Version:  6.5.3
+ * Version:  7.1
  *
- * Copyright (C) 2005-2007  Brian Paul   All Rights Reserved.
+ * Copyright (C) 2005-2008  Brian Paul   All Rights Reserved.
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -26,34 +26,26 @@
 #define SLANG_EMIT_H
 
 
-#include "imports.h"
+#include "main/imports.h"
 #include "slang_compile.h"
 #include "slang_ir.h"
-#include "mtypes.h"
+#include "main/mtypes.h"
 
 
-extern slang_gen_context *
-_slang_new_codegen_context(void);
+extern GLuint
+_slang_swizzle_swizzle(GLuint swz1, GLuint swz2);
 
 
-extern void
-slang_print_ir(const slang_ir_node *n, int indent);
+extern GLuint
+_slang_var_swizzle(GLint size, GLint comp);
 
 
-extern slang_ir_storage *
-_slang_new_ir_storage(enum register_file file, GLint index, GLint size);
-
-
-extern slang_ir_storage *
-_slang_clone_ir_storage(slang_ir_storage *store);
-
-
-extern GLint
-_slang_alloc_temporary(slang_gen_context *gc, GLint size);
-
 extern GLboolean
-_slang_emit_code(slang_ir_node *n, slang_gen_context *gc,
-                 struct gl_program *prog);
+_slang_emit_code(slang_ir_node *n, slang_var_table *vartable,
+                 struct gl_program *prog,
+                 const struct gl_sl_pragmas *pragmas,
+                 GLboolean withEnd,
+                 slang_info_log *log);
 
 
 #endif /* SLANG_EMIT_H */