From 44843c753301db0e8f8343745777479465f34ccc Mon Sep 17 00:00:00 2001 From: Ian Romanick Date: Wed, 22 Jul 2009 15:06:49 -0700 Subject: parser: Clean up generation of error strings during assembly --- src/mesa/shader/program_parser.h | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) (limited to 'src/mesa/shader/program_parser.h') diff --git a/src/mesa/shader/program_parser.h b/src/mesa/shader/program_parser.h index 20190470ea9..aeb2efd7ab6 100644 --- a/src/mesa/shader/program_parser.h +++ b/src/mesa/shader/program_parser.h @@ -24,6 +24,11 @@ #include "main/config.h" +#ifndef MTYPES_H +struct __GLcontextRec; +typedef struct __GLcontextRec GLcontext; +#endif + enum asm_type { at_none, at_address, @@ -119,6 +124,7 @@ struct asm_instruction { struct asm_parser_state { + GLcontext *ctx; struct gl_program *prog; /** @@ -213,11 +219,6 @@ typedef struct YYLTYPE { #define YYLTYPE_IS_TRIVIAL 1 -#ifndef MTYPES_H -struct __GLcontextRec; -typedef struct __GLcontextRec GLcontext; -#endif - extern GLboolean _mesa_parse_arb_program(GLcontext *ctx, GLenum target, const GLubyte *str, GLsizei len, struct asm_parser_state *state); -- cgit v1.2.3