diff options
| author | Brian Paul <[email protected]> | 2012-02-20 11:07:01 -0700 |
|---|---|---|
| committer | Brian Paul <[email protected]> | 2012-02-24 08:03:12 -0700 |
| commit | 70d3363757d286f2fa97c9b60268a96156fdb224 (patch) | |
| tree | 75bf65f59430709f26d2fc50d94fa353d18c8368 /src | |
| parent | 0a543eb5c4b299a4e819895455913a77a44f52b9 (diff) | |
mesa: remove MAX_WIDTH from prog_execute.h
define a PROG_MAX_WIDTH var instead. It has to match MAX_WIDTH in
swrast. More elaborate refactoring could fix that (someday).
Diffstat (limited to 'src')
| -rw-r--r-- | src/mesa/program/prog_execute.h | 6 | ||||
| -rw-r--r-- | src/mesa/swrast/s_context.c | 2 |
2 files changed, 7 insertions, 1 deletions
diff --git a/src/mesa/program/prog_execute.h b/src/mesa/program/prog_execute.h index cdf37082a00..1ae302c3226 100644 --- a/src/mesa/program/prog_execute.h +++ b/src/mesa/program/prog_execute.h @@ -39,6 +39,10 @@ typedef void (*FetchTexelDerivFunc)(struct gl_context *ctx, const GLfloat texcoo GLuint unit, GLfloat color[4]); +/** NOTE: This must match SWRAST_MAX_WIDTH */ +#define PROG_MAX_WIDTH 16384 + + /** * Virtual machine state used during execution of vertex/fragment programs. */ @@ -47,7 +51,7 @@ struct gl_program_machine const struct gl_program *CurProgram; /** Fragment Input attributes */ - GLfloat (*Attribs)[MAX_WIDTH][4]; + GLfloat (*Attribs)[PROG_MAX_WIDTH][4]; GLfloat (*DerivX)[4]; GLfloat (*DerivY)[4]; GLuint NumDeriv; /**< Max index into DerivX/Y arrays */ diff --git a/src/mesa/swrast/s_context.c b/src/mesa/swrast/s_context.c index 32f95de639c..63350b2e798 100644 --- a/src/mesa/swrast/s_context.c +++ b/src/mesa/swrast/s_context.c @@ -736,6 +736,8 @@ _swrast_CreateContext( struct gl_context *ctx ) assert((1 << (ctx->Const.MaxCubeTextureLevels - 1)) <= SWRAST_MAX_WIDTH); assert((1 << (ctx->Const.Max3DTextureLevels - 1)) <= SWRAST_MAX_WIDTH); + assert(PROG_MAX_WIDTH == SWRAST_MAX_WIDTH); + if (SWRAST_DEBUG) { _mesa_debug(ctx, "_swrast_CreateContext\n"); } |