Merge branch 'mesa_7_6_branch' into mesa_7_7_branch

[mesa.git] / src / mesa / state_tracker / st_mesa_to_tgsi.h

diff --git a/src/mesa/state_tracker/st_mesa_to_tgsi.h b/src/mesa/state_tracker/st_mesa_to_tgsi.h
index 3ababf13397a190384dea90a437a833dd6af2065..c0d1ff59e1f9f76c7c193ebb6e1c24d08c3f0afa 100644 (file)
--- a/src/mesa/state_tracker/st_mesa_to_tgsi.h
+++ b/src/mesa/state_tracker/st_mesa_to_tgsi.h
@@ -29,7 +29,7 @@
 #ifndef ST_MESA_TO_TGSI_H
 #define ST_MESA_TO_TGSI_H
 
-#include "mtypes.h"
+#include "main/mtypes.h"
 
 
 #if defined __cplusplus
@@ -39,8 +39,9 @@ extern "C" {
 struct tgsi_token;
 struct gl_program;
 
-GLboolean
-tgsi_translate_mesa_program(
+const struct tgsi_token *
+st_translate_mesa_program(
+   GLcontext *ctx,
    uint procType,
    const struct gl_program *program,
    GLuint numInputs,
@@ -48,12 +49,15 @@ tgsi_translate_mesa_program(
    const ubyte inputSemanticName[],
    const ubyte inputSemanticIndex[],
    const GLuint interpMode[],
+   const GLbitfield inputFlags[],
    GLuint numOutputs,
    const GLuint outputMapping[],
    const ubyte outputSemanticName[],
    const ubyte outputSemanticIndex[],
-   struct tgsi_token *tokens,
-   GLuint maxTokens );
+   const GLbitfield outputFlags[] );
+
+void
+st_free_tokens(const struct tgsi_token *tokens);
 
 
 #if defined __cplusplus