Sorry I broke the build. Until git is back, here's a trivial patch that
should allow the i965 driver to work again. Though, the way
instruction->Sampler is used in the i965 driver isn't totally clear to
me and I'll have to revisit it later.
-Brian
diff --git a/src/mesa/shader/prog_instruction.h b/src/mesa/shader/prog_instruction.h
index f8ff33e..aca7683 100644
--- a/src/mesa/shader/prog_instruction.h
+++ b/src/mesa/shader/prog_instruction.h
@@ -413,13 +413,12 @@ 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;
};
-------------------------------------------------------------------------
This SF.net email is sponsored by: Microsoft
Defy all challenges. Microsoft(R) Visual Studio 2008.
http://clk.atdmt.com/MRT/go/vse0120000070mrt/direct/01/
_______________________________________________
Mesa3d-dev mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/mesa3d-dev
