Merge branch 'gallium-tex-surfaces' into gallium-0.1

[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 feda65fe03a14d27dda0a4b3012462858bf12c5b..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
- * Version:  6.5.3
+ * Version:  7.0.3
  *
  * 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],
+                                    GLfloat lodBias,
                                     GLuint unit, GLfloat color[4]);
 
 
@@ -48,6 +49,9 @@ struct gl_program_machine
 
    /** 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 */
@@ -55,9 +59,11 @@ struct gl_program_machine
 
    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 */
+   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[] */
@@ -74,7 +80,7 @@ _mesa_get_program_register(GLcontext *ctx, enum register_file file,
 
 extern GLboolean
 _mesa_execute_program(GLcontext *ctx,
-                      const struct gl_program *program, GLuint maxInst,
+                      const struct gl_program *program,
                       struct gl_program_machine *machine);