From 8ae7e7749b708fc5a46180d3de2503ba7e2ab1f3 Mon Sep 17 00:00:00 2001 From: Brian Paul Date: Mon, 23 Feb 2009 17:50:55 -0700 Subject: mesa: replace old prog_instruction::Sampler field with Aux field The i965 driver needs an extra instruction field for color output information. It was using the Sampler field for this. Use the Aux field instead. This will probaby be revisited at some point... --- src/mesa/shader/prog_instruction.h | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) (limited to 'src/mesa/shader') diff --git a/src/mesa/shader/prog_instruction.h b/src/mesa/shader/prog_instruction.h index e3bb7ac01d..3808644550 100644 --- a/src/mesa/shader/prog_instruction.h +++ b/src/mesa/shader/prog_instruction.h @@ -410,20 +410,15 @@ struct prog_instruction */ GLint BranchTarget; -#if 01 /* XXX just use this for i965 driver for now! */ - /** - * For TEX instructions in shaders, the sampler to use for the - * texture lookup. - */ - GLint Sampler; -#endif - /** for debugging purposes */ const char *Comment; /** Arbitrary data. Used for OPCODE_PRINT and some drivers */ void *Data; + /** for driver use (try to remove someday) */ + GLint Aux; + /* XXX obsolete - remove someday */ #if FEATURE_MESA_program_debug GLshort StringPos; -- cgit v1.2.3