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

varying var changes

Browse source
This commit is contained in:
Brian 2006-12-15 10:09:49 -07:00
parent 9abf73b8cc
commit 464b9f4f6c
3 changed files with 17 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/mesa/swrast/s_context.h
View file

@ -122,7 +122,7 @@ typedef struct sw_span_arrays {
GLfloat texcoords[MAX_TEXTURE_COORD_UNITS][MAX_WIDTH][4];
GLfloat lambda[MAX_TEXTURE_COORD_UNITS][MAX_WIDTH];
GLfloat coverage[MAX_WIDTH];
GLfloat varying[MAX_WIDTH][MAX_VARYING_VECTORS][VARYINGS_PER_VECTOR];
GLfloat varying[MAX_WIDTH][MAX_VARYING][4];
/** This mask indicates which fragments are alive or culled */
GLubyte mask[MAX_WIDTH];
@ -200,9 +200,9 @@ typedef struct sw_span {
GLfloat texStepX[MAX_TEXTURE_COORD_UNITS][4];
GLfloat texStepY[MAX_TEXTURE_COORD_UNITS][4];
GLfixed intTex[2], intTexStep[2]; /* s, t only */
GLfloat var[MAX_VARYING_VECTORS][VARYINGS_PER_VECTOR];
GLfloat varStepX[MAX_VARYING_VECTORS][VARYINGS_PER_VECTOR];
GLfloat varStepY[MAX_VARYING_VECTORS][VARYINGS_PER_VECTOR];
GLfloat var[MAX_VARYING][4];
GLfloat varStepX[MAX_VARYING][4];
GLfloat varStepY[MAX_VARYING][4];
/* partial derivatives wrt X and Y. */
GLfloat dzdx, dzdy;

4
src/mesa/swrast/s_span.c
View file

@ -829,8 +829,8 @@ interpolate_varying(GLcontext *ctx, SWspan *span)
span->arrayMask |= SPAN_VARYING;
for (i = 0; i < MAX_VARYING_VECTORS; i++) {
for (j = 0; j < VARYINGS_PER_VECTOR; j++) {
for (i = 0; i < MAX_VARYING; i++) {
for (j = 0; j < 4; j++) {
const GLfloat dvdx = span->varStepX[i][j];
GLfloat v = span->var[i][j];
const GLfloat dwdx = span->dwdx;

22
src/mesa/swrast/s_tritemp.h
View file

@ -144,14 +144,14 @@
#ifdef INTERP_VARYING
#define VARYING_LOOP(CODE)\
{\
GLuint iv, ic;\
for (iv = 0; iv < MAX_VARYING_VECTORS; iv++) {\
for (ic = 0; ic < VARYINGS_PER_VECTOR; ic++) {\
CODE\
}\
}\
#define VARYING_LOOP(CODE) \
{ \
GLuint iv, ic; \
for (iv = 0; iv < MAX_VARYING; iv++) { \
for (ic = 0; ic < 4; ic++) { \
CODE \
} \
} \
}
#endif
@ -780,9 +780,9 @@ static void NAME(GLcontext *ctx, const SWvertex *v0,
GLfloat dvOuter[MAX_TEXTURE_COORD_UNITS], dvInner[MAX_TEXTURE_COORD_UNITS];
#endif
#ifdef INTERP_VARYING
GLfloat varLeft[MAX_VARYING_VECTORS][VARYINGS_PER_VECTOR];
GLfloat dvarOuter[MAX_VARYING_VECTORS][VARYINGS_PER_VECTOR];
GLfloat dvarInner[MAX_VARYING_VECTORS][VARYINGS_PER_VECTOR];
GLfloat varLeft[MAX_VARYING][4];
GLfloat dvarOuter[MAX_VARYING][4];
GLfloat dvarInner[MAX_VARYING][4];
#endif
for (subTriangle=0; subTriangle<=1; subTriangle++) {