fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-01-08 10:40:11 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

mesa: remove MAX_WIDTH from prog_execute.h

Browse source 
define a PROG_MAX_WIDTH var instead.  It has to match MAX_WIDTH in
swrast.  More elaborate refactoring could fix that (someday).
This commit is contained in:
Brian Paul 2012-02-20 11:07:01 -07:00
parent 0a543eb5c4
commit 70d3363757
2 changed files with 7 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/mesa/program/prog_execute.h
View file

@ -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 */

2
src/mesa/swrast/s_context.c
View file

@ -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");
}