projects
/
mesa.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
mesa: glsl: more assignment type checking
[mesa.git]
/
src
/
mesa
/
shader
/
prog_execute.h
diff --git
a/src/mesa/shader/prog_execute.h
b/src/mesa/shader/prog_execute.h
index 1eb9e73d01abd211186810266508bc506ee57b9f..18b13e11a41d02eb3e33b6347e929f8c770d9a3c 100644
(file)
--- a/
src/mesa/shader/prog_execute.h
+++ b/
src/mesa/shader/prog_execute.h
@@
-1,6
+1,6
@@
/*
* Mesa 3-D graphics library
/*
* Mesa 3-D graphics library
- * Version:
6.5
.3
+ * Version:
7.0
.3
*
* Copyright (C) 1999-2007 Brian Paul All Rights Reserved.
*
*
* Copyright (C) 1999-2007 Brian Paul All Rights Reserved.
*
@@
-32,6
+32,7
@@
typedef void (*FetchTexelLodFunc)(GLcontext *ctx, const GLfloat texcoord[4],
typedef void (*FetchTexelDerivFunc)(GLcontext *ctx, const GLfloat texcoord[4],
const GLfloat texdx[4],
const GLfloat texdy[4],
typedef void (*FetchTexelDerivFunc)(GLcontext *ctx, const GLfloat texcoord[4],
const GLfloat texdx[4],
const GLfloat texdy[4],
+ GLfloat lodBias,
GLuint unit, GLfloat color[4]);
GLuint unit, GLfloat color[4]);
@@
-48,6
+49,9
@@
struct gl_program_machine
/** Fragment Input attributes */
GLfloat (*Attribs)[MAX_WIDTH][4];
/** Fragment Input attributes */
GLfloat (*Attribs)[MAX_WIDTH][4];
+ GLfloat (*DerivX)[4];
+ GLfloat (*DerivY)[4];
+ GLuint NumDeriv; /**< Max index into DerivX/Y arrays */
GLuint CurElement; /**< Index into Attribs arrays */
/** Vertex Input attribs */
GLuint CurElement; /**< Index into Attribs arrays */
/** Vertex Input attribs */
@@
-55,9
+59,11
@@
struct gl_program_machine
GLfloat Temporaries[MAX_PROGRAM_TEMPS][4];
GLfloat Outputs[MAX_PROGRAM_OUTPUTS][4];
GLfloat Temporaries[MAX_PROGRAM_TEMPS][4];
GLfloat Outputs[MAX_PROGRAM_OUTPUTS][4];
+ GLfloat (*EnvParams)[4]; /**< Vertex or Fragment env parameters */
GLuint CondCodes[4]; /**< COND_* value for x/y/z/w */
GLuint CondCodes[4]; /**< COND_* value for x/y/z/w */
+ GLint AddressReg[MAX_PROGRAM_ADDRESS_REGS][4];
- GLint AddressReg[MAX_VERTEX_PROGRAM_ADDRESS_REGS][4];
+ const GLubyte *Samplers; /** Array mapping sampler var to tex unit */
GLuint CallStack[MAX_PROGRAM_CALL_DEPTH]; /**< For CAL/RET instructions */
GLuint StackDepth; /**< Index/ptr to top of CallStack[] */
GLuint CallStack[MAX_PROGRAM_CALL_DEPTH]; /**< For CAL/RET instructions */
GLuint StackDepth; /**< Index/ptr to top of CallStack[] */
@@
-74,8
+80,8
@@
_mesa_get_program_register(GLcontext *ctx, enum register_file file,
extern GLboolean
_mesa_execute_program(GLcontext *ctx,
extern GLboolean
_mesa_execute_program(GLcontext *ctx,
- const struct gl_program *program,
GLuint maxInst,
- struct gl_program_machine *machine
, GLuint element
);
+ const struct gl_program *program,
+ struct gl_program_machine *machine);
#endif /* PROG_EXECUTE_H */
#endif /* PROG_EXECUTE_H */