projects
/
mesa.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
i915: Refactor the vendor string out of intelGetString
[mesa.git]
/
src
/
mesa
/
program
/
program_parser.h
diff --git
a/src/mesa/program/program_parser.h
b/src/mesa/program/program_parser.h
index be952d4b9c88b7b3e5973e15ee9b6e25081f3e73..ca36bb6dc77b7af1f919b6bf4b06d14208055a7d 100644
(file)
--- a/
src/mesa/program/program_parser.h
+++ b/
src/mesa/program/program_parser.h
@@
-23,11
+23,9
@@
#pragma once
#include "main/config.h"
#pragma once
#include "main/config.h"
+#include "program/prog_parameter.h"
-#ifndef MTYPES_H
-struct __GLcontextRec;
-typedef struct __GLcontextRec GLcontext;
-#endif
+struct gl_context;
enum asm_type {
at_none,
enum asm_type {
at_none,
@@
-99,7
+97,7
@@
struct asm_symbol {
struct asm_vector {
unsigned count;
struct asm_vector {
unsigned count;
-
float
data[4];
+
gl_constant_value
data[4];
};
};
@@
-131,7
+129,7
@@
struct asm_instruction {
struct asm_parser_state {
struct asm_parser_state {
-
GL
context *ctx;
+
struct gl_
context *ctx;
struct gl_program *prog;
/**
struct gl_program *prog;
/**
@@
-176,6
+174,7
@@
struct asm_parser_state {
unsigned MaxClipPlanes;
unsigned MaxLights;
unsigned MaxProgramMatrices;
unsigned MaxClipPlanes;
unsigned MaxLights;
unsigned MaxProgramMatrices;
+ unsigned MaxDrawBuffers;
/*@}*/
/**
/*@}*/
/**
@@
-192,7
+191,7
@@
struct asm_parser_state {
* multiple ATTRIB statements bind illegal combinations of vertex
* attributes.
*/
* multiple ATTRIB statements bind illegal combinations of vertex
* attributes.
*/
-
unsigned
InputsBound;
+
GLbitfield64
InputsBound;
enum {
invalid_mode = 0,
enum {
invalid_mode = 0,
@@
-215,6
+214,7
@@
struct asm_parser_state {
struct {
unsigned UsesKill:1;
struct {
unsigned UsesKill:1;
+ unsigned UsesDFdy:1;
} fragment;
};
} fragment;
};
@@
-237,7
+237,7
@@
typedef struct YYLTYPE {
#define YYLTYPE_IS_TRIVIAL 1
#define YYLTYPE_IS_TRIVIAL 1
-extern GLboolean _mesa_parse_arb_program(
GL
context *ctx, GLenum target,
+extern GLboolean _mesa_parse_arb_program(
struct gl_
context *ctx, GLenum target,
const GLubyte *str, GLsizei len, struct asm_parser_state *state);
const GLubyte *str, GLsizei len, struct asm_parser_state *state);