Merge commit 'origin/master' into gallium-0.2

[mesa.git] / src / mesa / shader / prog_instruction.h

diff --git a/src/mesa/shader/prog_instruction.h b/src/mesa/shader/prog_instruction.h
index 268afc528c42b65e1a4fe0deefdcb6eefc290dcb..f978334ab22507cc6232c3fd0db524dd8b677ece 100644 (file)
--- a/src/mesa/shader/prog_instruction.h
+++ b/src/mesa/shader/prog_instruction.h
@@ -418,11 +418,13 @@ struct prog_instruction
     */
    GLint BranchTarget;
 
+#if 0
    /**
     * For TEX instructions in shaders, the sampler to use for the
     * texture lookup.
     */
    GLint Sampler;
+#endif
 
    const char *Comment;
 };