Changeset 3597 for trunk/src/opengl/mesa/lnaatemp.h

Timestamp:

May 23, 2000, 10:35:01 PM (25 years ago)

Author:

jeroen

Message:

* empty log message *

File:

• trunk/src/opengl/mesa/lnaatemp.h (modified) (10 diffs)

trunk/src/opengl/mesa/lnaatemp.h

@@ -1 @@
-/* $Id: lnaatemp.h,v 1.1 2000-02-29 00:48:32 sandervl Exp $ */
+/* $Id: lnaatemp.h,v 1.2 2000-05-23 20:34:52 jeroen Exp $ */
 
 /*
@@ -53 +53 @@
    const struct vertex_buffer *VB = ctx->VB;
    struct pixel_buffer *pb = ctx->PB;
-   GLfloat halfWidth = 0.5F * ctx->Line.Width;  /* 0.5 is a bit of a hack */
+   GLfloat halfWidth = 0.5F * ctx->Line.Width; /* 0.5 is a bit of a hack   */
    GLboolean solid = !ctx->Line.StippleFlag;
    GLint x0 = (GLint) VB->Win.data[vert0][0];
@@ -63 +63 @@
    GLint xStep, yStep;
    GLint z0, z1;
+   const GLint depthBits = ctx->Visual->DepthBits;
+   const GLint fixedToDepthShift = depthBits <= 16 ? FIXED_SHIFT : 0;
+#define FixedToDepth(F)  ((F) >> fixedToDepthShift)
 #if INTERP_RGBA
    GLfixed fr, fg, fb, fa;      /* fixed-pt RGBA */
@@ -99 +102 @@
       return;
 
-#if DEPTH_BITS==16
-   z0 = FloatToFixed(VB->Win.data[vert0][2]);
-   z1 = FloatToFixed(VB->Win.data[vert1][2]);
-#else
-   z0 = (int) VB->Win.data[vert0][2];
-   z1 = (int) VB->Win.data[vert1][2];
-#endif
+   if (depthBits <= 16) {
+      z0 = FloatToFixed(VB->Win.data[vert0][2]);
+      z1 = FloatToFixed(VB->Win.data[vert1][2]);
+   }
+   else {
+      z0 = (int) VB->Win.data[vert0][2];
+      z1 = (int) VB->Win.data[vert1][2];
+   }
 
 #if INTERP_STUV0
@@ -195 +199 @@
       GLint x = x0;
       GLfloat y = VB->Win.data[vert0][1];
-      GLfloat yStep = (VB->Win.data[vert1][1] - y) / (GLfloat) dx;
-      GLint dz = (z1 - z0) / dx;
-      GLfloat invDx = 1.0F / dx;
-      (void) invDx;
+      const GLfloat invDx = 1.0F / dx;
+      GLfloat yStep = (VB->Win.data[vert1][1] - y) * invDx;
+      GLint dz = (GLint) ((z1 - z0) * invDx);
 #if INTERP_RGBA
       if (ctx->Light.ShadeModel == GL_SMOOTH) {
@@ -226 +229 @@
       dhv1 *= invDx;
 #endif
+#if INTERP_INDEX
+      if (ctx->Light.ShadeModel == GL_SMOOTH) {
+         dfi = (IntToFixed(VB->IndexPtr->data[vert1]) - fi) * invDx;
+      }
+#endif
+
       for (i = 0; i < dx; i++) {
          if (solid || (ctx->Line.StipplePattern & (1 << ((ctx->StippleCounter/ctx->Line.StippleFactor) & 0xf)))) {
@@ -250 +259 @@
             GLuint coverage;
 #endif
-#if DEPTH_BITS==16
-            GLdepth z = FixedToInt(z0);
-#else
-            GLdepth z = z0;
-#endif
+            GLdepth z = FixedToDepth(z0);
             ASSERT(yBoti <= yTopi);
 
@@ -345 +350 @@
       GLint y = y0;
       GLfloat x = VB->Win.data[vert0][0];
-      GLfloat xStep = (VB->Win.data[vert1][0] - x) / (GLfloat) dy;
-      GLint dz = (z1 - z0) / dy;
-      GLfloat invDy = 1.0F / dy;
-      (void) invDy;
+      const GLfloat invDy = 1.0F / dy;
+      GLfloat xStep = (VB->Win.data[vert1][0] - x) * invDy;
+      GLint dz = (GLint) ((z1 - z0) * invDy);
 #if INTERP_RGBA
       if (ctx->Light.ShadeModel == GL_SMOOTH) {
@@ -378 +382 @@
 #if INTERP_INDEX
       if (ctx->Light.ShadeModel == GL_SMOOTH) {
-         dfi = (IntToFixed(VB->IndexPtr->data[vert1]) - fi) / dy;
+         dfi = (IntToFixed(VB->IndexPtr->data[vert1]) - fi) * invDy;
       }
 #endif
@@ -404 +408 @@
             GLuint coverage;
 #endif
-#if DEPTH_BITS==16
-            GLdepth z = FixedToInt(z0);
-#else
-            GLdepth z = z0;
-#endif
+            GLdepth z = FixedToDepth(z0);
 
             ASSERT(xLefti < xRight);