summaryrefslogtreecommitdiff
path: root/src/mesa/shader/program_parser.h
diff options
context:
space:
mode:
authorIan Romanick <ian.d.romanick@intel.com>2009-07-22 15:06:49 -0700
committerIan Romanick <ian.d.romanick@intel.com>2009-07-22 15:06:49 -0700
commit44843c753301db0e8f8343745777479465f34ccc (patch)
treebd8d00bb47910b4e03cabcfeb18757120169c0c7 /src/mesa/shader/program_parser.h
parentaec429170681567414de70814f69244758323e75 (diff)
parser: Clean up generation of error strings during assembly
Diffstat (limited to 'src/mesa/shader/program_parser.h')
-rw-r--r--src/mesa/shader/program_parser.h11
1 files changed, 6 insertions, 5 deletions
diff --git a/src/mesa/shader/program_parser.h b/src/mesa/shader/program_parser.h
index 20190470ea..aeb2efd7ab 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);