AlexIndustrial/mesa
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

minor comments, clean-up

Browse Source
This commit is contained in:
Brian Paul
2000-12-08 00:09:24 +00:00
parent 83886a5a7f
commit c1b97d91c7
2 changed files with 9 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/mesa/swrast/s_texture.c
+2 -2
View File
@@ -1,4 +1,4 @@
/* $Id: s_texture.c,v 1.2 2000/11/05 18:24:40 keithw Exp $ */
/* $Id: s_texture.c,v 1.3 2000/12/08 00:09:24 brianp Exp $ */
/*
* Mesa 3-D graphics library
@@ -2529,7 +2529,7 @@ void gl_texture_pixels( GLcontext *ctx, GLuint texUnit, GLuint n,
if (ctx->Texture._ReallyEnabled & mask) {
const struct gl_texture_unit *textureUnit = &ctx->Texture.Unit[texUnit];
if (textureUnit->_Current) {
if (textureUnit->_Current) { /* XXX need this? */
GLchan texel[PB_SIZE][4];
if (textureUnit->LodBias != 0.0F) {
src/mesa/swrast/s_tritemp.h
+7 -8
View File
@@ -1,4 +1,4 @@
/* $Id: s_tritemp.h,v 1.5 2000/11/21 23:17:36 brianp Exp $ */
/* $Id: s_tritemp.h,v 1.6 2000/12/08 00:09:24 brianp Exp $ */
/*
* Mesa 3-D graphics library
@@ -439,7 +439,6 @@
dsdx = oneOverArea * (eMaj_ds * eBot.dy - eMaj.dy * eBot_ds);
dsdy = oneOverArea * (eMaj.dx * eBot_ds - eMaj_ds * eBot.dx);
eMaj_dt = vMax->texcoord[0][1] * wMax - vMin->texcoord[0][1] * wMin;
eBot_dt = vMid->texcoord[0][1] * wMid - vMin->texcoord[0][1] * wMin;
dtdx = oneOverArea * (eMaj_dt * eBot.dy - eMaj.dy * eBot_dt);
@@ -477,23 +476,23 @@
dsdy[u] = oneOverArea * (eMaj.dx * eBot_ds - eMaj_ds * eBot.dx);
eMaj_dt = vMax->texcoord[u][1] * wMax
- vMin->texcoord[u][1] * wMin;
- vMin->texcoord[u][1] * wMin;
eBot_dt = vMid->texcoord[u][1] * wMid
- vMin->texcoord[u][1] * wMin;
- vMin->texcoord[u][1] * wMin;
dtdx[u] = oneOverArea * (eMaj_dt * eBot.dy - eMaj.dy * eBot_dt);
dtdy[u] = oneOverArea * (eMaj.dx * eBot_dt - eMaj_dt * eBot.dx);
eMaj_du = vMax->texcoord[u][2] * wMax
- vMin->texcoord[u][2] * wMin;
- vMin->texcoord[u][2] * wMin;
eBot_du = vMid->texcoord[u][2] * wMid
- vMin->texcoord[u][2] * wMin;
- vMin->texcoord[u][2] * wMin;
dudx[u] = oneOverArea * (eMaj_du * eBot.dy - eMaj.dy * eBot_du);
dudy[u] = oneOverArea * (eMaj.dx * eBot_du - eMaj_du * eBot.dx);
eMaj_dv = vMax->texcoord[u][3] * wMax
- vMin->texcoord[u][3] * wMin;
- vMin->texcoord[u][3] * wMin;
eBot_dv = vMid->texcoord[u][3] * wMid
- vMin->texcoord[u][3] * wMin;
- vMin->texcoord[u][3] * wMin;
dvdx[u] = oneOverArea * (eMaj_dv * eBot.dy - eMaj.dy * eBot_dv);
dvdy[u] = oneOverArea * (eMaj.dx * eBot_dv - eMaj_dv * eBot.dx);
}