diff options
| author | Brian Paul <brian.paul@tungstengraphics.com> | 2001-12-18 04:06:44 +0000 |
|---|---|---|
| committer | Brian Paul <brian.paul@tungstengraphics.com> | 2001-12-18 04:06:44 +0000 |
| commit | 30f51ae067379c2b3573c06b707d25a9704df7be (patch) | |
| tree | 401d75d291724d0d3a47be29d4d3512dcdb66a5a /src/mesa/main/pixel.c | |
| parent | 645ced29552da1af5c759d0497d98c8f55b72935 (diff) | |
Replace old matrix stacks with new code based on struct matrix_stack.
Moved vertex program hash table into shared context state.
Implemented reference counting for vertex programs.
Replaced tnl "ProjectedClip" with "Ndc" (normalized device coordinates).
Diffstat (limited to 'src/mesa/main/pixel.c')
| -rw-r--r-- | src/mesa/main/pixel.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/mesa/main/pixel.c b/src/mesa/main/pixel.c index b6fe7b2123..c7667a28a1 100644 --- a/src/mesa/main/pixel.c +++ b/src/mesa/main/pixel.c @@ -1,4 +1,4 @@ -/* $Id: pixel.c,v 1.32 2001/12/04 23:45:31 brianp Exp $ */ +/* $Id: pixel.c,v 1.33 2001/12/18 04:06:45 brianp Exp $ */ /* * Mesa 3-D graphics library @@ -852,7 +852,7 @@ _mesa_transform_rgba(const GLcontext *ctx, GLuint n, GLfloat rgba[][4]) const GLfloat bb = ctx->Pixel.PostColorMatrixBias[2]; const GLfloat as = ctx->Pixel.PostColorMatrixScale[3]; const GLfloat ab = ctx->Pixel.PostColorMatrixBias[3]; - const GLfloat *m = ctx->ColorMatrix.m; + const GLfloat *m = ctx->ColorMatrixStack.Top->m; GLuint i; for (i = 0; i < n; i++) { const GLfloat r = rgba[i][RCOMP]; |