diff options
author | Brian Paul <brian.paul@tungstengraphics.com> | 2008-11-24 14:08:58 -0700 |
---|---|---|
committer | Brian Paul <brian.paul@tungstengraphics.com> | 2008-11-24 14:08:58 -0700 |
commit | df6155fcff66034457b3165f5df0a61ccfc41314 (patch) | |
tree | 533a3edc14a84d654ce5dd1f2eb305a42a138991 /src/mesa/shader/prog_execute.h | |
parent | 868c607c1751fc3e6df1a8dc45e8b70e6bc315f6 (diff) | |
parent | b730d0d3e9b202b17a0815cb820fc9905f35cb98 (diff) |
Merge commit 'origin/master' into gallium-0.2
Conflicts:
progs/glsl/Makefile
Diffstat (limited to 'src/mesa/shader/prog_execute.h')
-rw-r--r-- | src/mesa/shader/prog_execute.h | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/src/mesa/shader/prog_execute.h b/src/mesa/shader/prog_execute.h index 18b13e11a4..8ceb7b092e 100644 --- a/src/mesa/shader/prog_execute.h +++ b/src/mesa/shader/prog_execute.h @@ -25,6 +25,8 @@ #ifndef PROG_EXECUTE_H #define PROG_EXECUTE_H +#include "main/config.h" + typedef void (*FetchTexelLodFunc)(GLcontext *ctx, const GLfloat texcoord[4], GLfloat lambda, GLuint unit, GLfloat color[4]); @@ -36,10 +38,6 @@ typedef void (*FetchTexelDerivFunc)(GLcontext *ctx, const GLfloat texcoord[4], GLuint unit, GLfloat color[4]); -/** The larger of VERT_RESULT_MAX, FRAG_RESULT_MAX */ -#define MAX_PROGRAM_OUTPUTS VERT_RESULT_MAX - - /** * Virtual machine state used during execution of vertex/fragment programs. */ |