Merge commit 'origin/gallium-0.1' into gallium-0.1

[mesa.git] / src / gallium / auxiliary / tgsi / exec / tgsi_exec.h

diff --git a/src/gallium/auxiliary/tgsi/exec/tgsi_exec.h b/src/gallium/auxiliary/tgsi/exec/tgsi_exec.h
index 1fb66ee960fa2cbcef925b3532bd6a0d5777640d..45c49dd007c012791d435ad820f586a37ead64dd 100644 (file)
--- a/src/gallium/auxiliary/tgsi/exec/tgsi_exec.h
+++ b/src/gallium/auxiliary/tgsi/exec/tgsi_exec.h
@@ -215,12 +215,16 @@ struct tgsi_exec_machine
    struct tgsi_exec_labels Labels;
 };
 
-
 void
 tgsi_exec_machine_init(
+   struct tgsi_exec_machine *mach );
+
+
+void 
+tgsi_exec_machine_bind_shader(
    struct tgsi_exec_machine *mach,
    const struct tgsi_token *tokens,
-   unsigned numSamplers,
+   uint numSamplers,
    struct tgsi_sampler *samplers);
 
 uint