From 81032030ff42dd78133d85f7cabab5fb4c9aaf1e Mon Sep 17 00:00:00 2001 From: Keith Whitwell Date: Thu, 9 Jun 2005 14:55:34 +0000 Subject: Store compiled vertex program representations in a pointer in the vertex_program struct. Allow switching between regular and vertex_program implementations of fixed function TNL with the MESA_TNL_PROG environment var (previously this required recompilation). Ensure program compilation only references program data, not the wider context. This means that compiled programs only need to be invalidated when the program string changes, not on other state changes. --- src/mesa/main/imports.c | 2 +- src/mesa/main/mtypes.h | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) (limited to 'src/mesa/main') diff --git a/src/mesa/main/imports.c b/src/mesa/main/imports.c index 767cef59e2..1972826a75 100644 --- a/src/mesa/main/imports.c +++ b/src/mesa/main/imports.c @@ -842,7 +842,7 @@ _mesa_printf( const char *fmtString, ... ) #if defined(XFree86LOADER) && defined(IN_MODULE) xf86printf("%s", s); #else - printf("%s", s); + fprintf(stderr,"%s", s); #endif } diff --git a/src/mesa/main/mtypes.h b/src/mesa/main/mtypes.h index 62a8c76aa1..1733c43bce 100644 --- a/src/mesa/main/mtypes.h +++ b/src/mesa/main/mtypes.h @@ -1770,6 +1770,7 @@ struct vertex_program GLuint InputsRead; /* Bitmask of which input regs are read */ GLuint OutputsWritten; /* Bitmask of which output regs are written to */ struct program_parameter_list *Parameters; /**< array [NumParameters] */ + void *TnlData; /* should probably use Base.DriverData */ }; -- cgit v1.2.3