Mesa (master): mesa/tnl_dd: Remove unused header file t_dd_vbtmp.h

Ian Romanick idr at kemper.freedesktop.org
Fri Aug 26 23:32:28 PDT 2011


Module: Mesa
Branch: master
Commit: 5dd6626a7a376e95f43478e0949f049dca2eacbc
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=5dd6626a7a376e95f43478e0949f049dca2eacbc

Author: Ian Romanick <ian.d.romanick at intel.com>
Date:   Thu Aug 25 13:51:57 2011 -0700

mesa/tnl_dd: Remove unused header file t_dd_vbtmp.h

Acked-by: Kristian Høgsberg <krh at bitplanet.net>
Acked-by: Marek Olšák <maraeo at gmail.com>
Acked-by: Alan Coopersmith <alan.coopersmith at oracle.com>
Acked-by: Jakob Bornecrantz <jakob at vmware.com>
Acked-by: Dave Airlie <airlied at redhat.com>
Build-Tested-by: Jakob Bornecrantz <jakob at vmware.com>
Tested-by: Eugeni Dodonov <eugeni.dodonov at intel.com>

---

 src/mesa/tnl_dd/imm/t_dd_imm_vbtmp.h |    2 +-
 src/mesa/tnl_dd/t_dd_vbtmp.h         |  675 ----------------------------------
 2 files changed, 1 insertions(+), 676 deletions(-)

diff --git a/src/mesa/tnl_dd/imm/t_dd_imm_vbtmp.h b/src/mesa/tnl_dd/imm/t_dd_imm_vbtmp.h
index bb39462..9dc7f52 100644
--- a/src/mesa/tnl_dd/imm/t_dd_imm_vbtmp.h
+++ b/src/mesa/tnl_dd/imm/t_dd_imm_vbtmp.h
@@ -46,7 +46,7 @@ static void TAG(emit_vfmt)( struct gl_context *ctx, VERTEX *v )
    LOCALVARS
       ;
 
-   /* This template assumes (like t_dd_vbtmp.h) that color is ubyte.
+   /* This template assumes that color is ubyte.
     */
    if (DO_TEX0 || DO_TEX1 || !HAVE_TINY_VERTICES)
    {
diff --git a/src/mesa/tnl_dd/t_dd_vbtmp.h b/src/mesa/tnl_dd/t_dd_vbtmp.h
deleted file mode 100644
index d19137b..0000000
--- a/src/mesa/tnl_dd/t_dd_vbtmp.h
+++ /dev/null
@@ -1,675 +0,0 @@
-
-/*
- * Mesa 3-D graphics library
- * Version:  5.0.1
- *
- * Copyright (C) 1999-2003  Brian Paul   All Rights Reserved.
- *
- * Permission is hereby granted, free of charge, to any person obtaining a
- * copy of this software and associated documentation files (the "Software"),
- * to deal in the Software without restriction, including without limitation
- * the rights to use, copy, modify, merge, publish, distribute, sublicense,
- * and/or sell copies of the Software, and to permit persons to whom the
- * Software is furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included
- * in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
- * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
- * BRIAN PAUL BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
- * AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
- * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- *
- * Authors:
- *    Keith Whitwell <keith at tungstengraphics.com>
- */
-
-
-/* Unlike the other templates here, this assumes quite a bit about the
- * underlying hardware.  Specifically it assumes a d3d-like vertex
- * format, with a layout more or less constrained to look like the
- * following:
- *
- * union {
- *    struct {
- *        float x, y, z, w;
- *        struct { char r, g, b, a; } color;
- *        struct { char r, g, b, fog; } spec;
- *        float u0, v0;
- *        float u1, v1;
- *        float u2, v2;
- *        float u3, v3;
- *    } v;
- *    struct {
- *        float x, y, z, w;
- *        struct { char r, g, b, a; } color;
- *        struct { char r, g, b, fog; } spec;
- *        float u0, v0, q0;
- *        float u1, v1, q1;
- *        float u2, v2, q2;
- *        float u3, v3, q3;
- *    } pv;
- *    struct {
- *        float x, y, z;
- *        struct { char r, g, b, a; } color;
- *    } tv;
- *    float f[16];
- *    unsigned int ui[16];
- *    unsigned char ub4[4][16];
- * }
- *
- 
- * VERTEX:   hw vertex type as above
- * VERTEX_COLOR: hw color struct type in VERTEX
- *
- * DO_XYZW:  Emit xyz and maybe w coordinates.
- * DO_RGBA:  Emit color.
- * DO_SPEC:  Emit specular color.
- * DO_FOG:   Emit fog coordinate in specular alpha.
- * DO_TEX0:  Emit tex0 u,v coordinates.
- * DO_TEX1:  Emit tex1 u,v coordinates.
- * DO_TEX2:  Emit tex2 u,v coordinates.
- * DO_TEX3:  Emit tex3 u,v coordinates.
- * DO_PTEX:  Emit tex0,1,2,3 q coordinates where possible.
- *
- * HAVE_RGBA_COLOR: Hardware takes color in rgba order (else bgra).
- *
- * HAVE_HW_VIEWPORT:  Hardware performs viewport transform.
- * HAVE_HW_DIVIDE:  Hardware performs perspective divide.
- *
- * HAVE_TINY_VERTICES:  Hardware understands v.tv format.
- * HAVE_PTEX_VERTICES:  Hardware understands v.pv format.
- * HAVE_NOTEX_VERTICES:  Hardware understands v.v format with texcount 0.
- *
- * Additionally, this template assumes it is emitting *transformed*
- * vertices; the modifications to emit untransformed vertices (ie. to
- * t&l hardware) are probably too great to cooexist with the code
- * already in this file.
- *
- * NOTE: The PTEX vertex format always includes TEX0 and TEX1, even if
- * only TEX0 is enabled, in order to maintain a vertex size which is
- * an exact number of quadwords.
- */
-
-#if (HAVE_HW_VIEWPORT)
-#define VIEWPORT_X(dst,x) dst = x
-#define VIEWPORT_Y(dst,y) dst = y
-#define VIEWPORT_Z(dst,z) dst = z
-#else
-#define VIEWPORT_X(dst,x) dst = s[0]  * x + s[12]
-#define VIEWPORT_Y(dst,y) dst = s[5]  * y + s[13]
-#define VIEWPORT_Z(dst,z) dst = s[10] * z + s[14]
-#endif
-
-#if (HAVE_HW_DIVIDE && !HAVE_PTEX_VERTICES)
-#error "can't cope with this combination" 
-#endif 
-
-#ifndef LOCALVARS
-#define LOCALVARS
-#endif
-
-#ifndef CHECK_HW_DIVIDE
-#define CHECK_HW_DIVIDE 1
-#endif
-
-#if (HAVE_HW_DIVIDE || DO_SPEC || DO_TEX0 || DO_FOG || !HAVE_TINY_VERTICES)
-
-static void TAG(emit)( struct gl_context *ctx,
-		       GLuint start, GLuint end,
-		       void *dest,
-		       GLuint stride )
-{
-   LOCALVARS
-      struct vertex_buffer *VB = &TNL_CONTEXT(ctx)->vb;
-   GLfloat (*tc0)[4], (*tc1)[4], (*fog)[4];
-   GLfloat (*tc2)[4], (*tc3)[4];
-   GLfloat (*col)[4], (*spec)[4];
-   GLuint tc0_stride, tc1_stride, col_stride, spec_stride, fog_stride;
-   GLuint tc2_stride, tc3_stride;
-   GLuint tc0_size, tc1_size, col_size;
-   GLuint tc2_size, tc3_size;
-   GLfloat (*coord)[4];
-   GLuint coord_stride;
-   VERTEX *v = (VERTEX *)dest;
-   const GLfloat *s = GET_VIEWPORT_MAT();
-   const GLubyte *mask = VB->ClipMask;
-   int i;
-
-/*     fprintf(stderr, "%s(big) importable %d %d..%d\n",  */
-/*  	   __FUNCTION__, VB->importable_data, start, end); */
-
-   if (HAVE_HW_VIEWPORT && HAVE_HW_DIVIDE && CHECK_HW_DIVIDE) {
-      (void) s;
-      coord = VB->ClipPtr->data;
-      coord_stride = VB->ClipPtr->stride;
-   }
-   else {
-      coord = VB->NdcPtr->data;
-      coord_stride = VB->NdcPtr->stride;
-   }
-
-   if (DO_TEX3) {
-      const GLuint t3 = GET_TEXSOURCE(3);
-      tc3 = VB->AttribPtr[_TNL_ATTRIB_TEX0 + t3]->data;
-      tc3_stride = VB->AttribPtr[_TNL_ATTRIB_TEX0 + t3]->stride;
-      if (DO_PTEX)
-	 tc3_size = VB->AttribPtr[_TNL_ATTRIB_TEX0 + t3]->size;
-   }
-
-   if (DO_TEX2) {
-      const GLuint t2 = GET_TEXSOURCE(2);
-      tc2 = VB->AttribPtr[_TNL_ATTRIB_TEX0 + t2]->data;
-      tc2_stride = VB->AttribPtr[_TNL_ATTRIB_TEX0 + t2]->stride;
-      if (DO_PTEX)
-	 tc2_size = VB->AttribPtr[_TNL_ATTRIB_TEX0 + t2]->size;
-   }
-
-   if (DO_TEX1) {
-      const GLuint t1 = GET_TEXSOURCE(1);
-      tc1 = VB->AttribPtr[_TNL_ATTRIB_TEX0 + t1]->data;
-      tc1_stride = VB->AttribPtr[_TNL_ATTRIB_TEX0 + t1]->stride;
-      if (DO_PTEX)
-	 tc1_size = VB->AttribPtr[_TNL_ATTRIB_TEX0 + t1]->size;
-   }
-
-   if (DO_TEX0) {
-      const GLuint t0 = GET_TEXSOURCE(0);
-      tc0_stride = VB->AttribPtr[_TNL_ATTRIB_TEX0 + t0]->stride;
-      tc0 = VB->AttribPtr[_TNL_ATTRIB_TEX0 + t0]->data;
-      if (DO_PTEX) 
-	 tc0_size = VB->AttribPtr[_TNL_ATTRIB_TEX0 + t0]->size;
-   }
-
-   if (DO_RGBA) {
-      col_stride = VB->AttribPtr[_TNL_ATTRIB_COLOR0]->stride;
-      col = VB->AttribPtr[_TNL_ATTRIB_COLOR0]->data;
-      col_size = VB->AttribPtr[_TNL_ATTRIB_COLOR0]->size;
-   }
-
-   if (DO_SPEC) {
-      if (VB->AttribPtr[_TNL_ATTRIB_COLOR1]) {
-	 spec_stride = VB->AttribPtr[_TNL_ATTRIB_COLOR1]->stride;
-	 spec = VB->AttribPtr[_TNL_ATTRIB_COLOR1]->data;
-      } else {
-	 spec = (GLfloat (*)[4])ctx->Current.Attrib[VERT_ATTRIB_COLOR1];
-	 spec_stride = 0;
-      }
-   }
-
-   if (DO_FOG) {
-      if (VB->AttribPtr[_TNL_ATTRIB_FOG]) {
-	 fog = VB->AttribPtr[_TNL_ATTRIB_FOG]->data;
-	 fog_stride = VB->AttribPtr[_TNL_ATTRIB_FOG]->stride;
-      }
-      else {
-	 static GLfloat tmp[4] = {0, 0, 0, 0};
-	 fog = &tmp;
-	 fog_stride = 0;
-      }
-   }
-
-   /* May have nonstandard strides:
-    */
-   if (start) {
-      STRIDE_4F(coord, start * coord_stride);
-      if (DO_TEX0)
-	 STRIDE_4F(tc0, start * tc0_stride);
-      if (DO_TEX1) 
-	 STRIDE_4F(tc1, start * tc1_stride);
-      if (DO_TEX2) 
-	 STRIDE_4F(tc2, start * tc2_stride);
-      if (DO_TEX3) 
-	 STRIDE_4F(tc3, start * tc3_stride);
-      if (DO_RGBA) 
-	 STRIDE_4F(col, start * col_stride);
-      if (DO_SPEC)
-	 STRIDE_4F(spec, start * spec_stride);
-      if (DO_FOG)
-	 STRIDE_4F(fog, start * fog_stride);
-   }
-
-   for (i=start; i < end; i++, v = (VERTEX *)((GLubyte *)v + stride)) {
-      if (DO_XYZW) {
-	 if (HAVE_HW_VIEWPORT || mask[i] == 0) {
-	    VIEWPORT_X(v->v.x, coord[0][0]);
-	    VIEWPORT_Y(v->v.y, coord[0][1]);
-	    VIEWPORT_Z(v->v.z, coord[0][2]);
-	    v->v.w = coord[0][3];
-	 }
-	 STRIDE_4F(coord, coord_stride);
-      }
-      if (DO_RGBA) {
-	 UNCLAMPED_FLOAT_TO_UBYTE(v->v.color.red, col[0][0]);
-	 UNCLAMPED_FLOAT_TO_UBYTE(v->v.color.green, col[0][1]);
-	 UNCLAMPED_FLOAT_TO_UBYTE(v->v.color.blue, col[0][2]);
-	 if (col_size == 4) {
-	    UNCLAMPED_FLOAT_TO_UBYTE(v->v.color.alpha, col[0][3]);
-	 } else {
-	    v->v.color.alpha = CHAN_MAX;
-	 }
-	 STRIDE_4F(col, col_stride);
-      }
-      if (DO_SPEC) {
-	 UNCLAMPED_FLOAT_TO_UBYTE(v->v.specular.red, spec[0][0]);
-	 UNCLAMPED_FLOAT_TO_UBYTE(v->v.specular.green, spec[0][1]);
-	 UNCLAMPED_FLOAT_TO_UBYTE(v->v.specular.blue, spec[0][2]);
-	 STRIDE_4F(spec, spec_stride);
-      }
-      if (DO_FOG) {
-	 UNCLAMPED_FLOAT_TO_UBYTE(v->v.specular.alpha, fog[0][0]);
-	 STRIDE_4F(fog, fog_stride);
-      }
-      if (DO_TEX0) {
-	 v->v.u0 = tc0[0][0];
-	 v->v.v0 = tc0[0][1];
-	 if (DO_PTEX) {
-	    if (HAVE_PTEX_VERTICES) {
-	       if (tc0_size == 4) 
-		  v->pv.q0 = tc0[0][3];
-	       else
-		  v->pv.q0 = 1.0;
-	    } 
-	    else if (tc0_size == 4) {
-	       float rhw = 1.0 / tc0[0][3];
-	       v->v.w *= tc0[0][3];
-	       v->v.u0 *= rhw;
-	       v->v.v0 *= rhw;
-	    } 
-	 } 
-	 STRIDE_4F(tc0, tc0_stride);
-      }
-      if (DO_TEX1) {
-	 if (DO_PTEX) {
-	    v->pv.u1 = tc1[0][0];
-	    v->pv.v1 = tc1[0][1];
-	    if (tc1_size == 4) 
-	       v->pv.q1 = tc1[0][3];
-	    else
-	       v->pv.q1 = 1.0;
-	 } 
-	 else {
-	    v->v.u1 = tc1[0][0];
-	    v->v.v1 = tc1[0][1];
-	 }
-	 STRIDE_4F(tc1, tc1_stride);
-      } 
-      else if (DO_PTEX) {
-	 *(GLuint *)&v->pv.q1 = 0;	/* avoid culling on radeon */
-      }
-      if (DO_TEX2) {
-	 if (DO_PTEX) {
-	    v->pv.u2 = tc2[0][0];
-	    v->pv.v2 = tc2[0][1];
-	    if (tc2_size == 4) 
-	       v->pv.q2 = tc2[0][3];
-	    else
-	       v->pv.q2 = 1.0;
-	 } 
-	 else {
-	    v->v.u2 = tc2[0][0];
-	    v->v.v2 = tc2[0][1];
-	 }
-	 STRIDE_4F(tc2, tc2_stride);
-      } 
-      if (DO_TEX3) {
-	 if (DO_PTEX) {
-	    v->pv.u3 = tc3[0][0];
-	    v->pv.v3 = tc3[0][1];
-	    if (tc3_size == 4) 
-	       v->pv.q3 = tc3[0][3];
-	    else
-	       v->pv.q3 = 1.0;
-	 } 
-	 else {
-	    v->v.u3 = tc3[0][0];
-	    v->v.v3 = tc3[0][1];
-	 }
-	 STRIDE_4F(tc3, tc3_stride);
-      } 
-   }
-
-}
-#else
-
-#if HAVE_HW_DIVIDE
-#error "cannot use tiny vertices with hw perspective divide"
-#endif
-
-static void TAG(emit)( struct gl_context *ctx, GLuint start, GLuint end,
-		       void *dest, GLuint stride )
-{
-   LOCALVARS
-      struct vertex_buffer *VB = &TNL_CONTEXT(ctx)->vb;
-   GLfloat (*col)[4];
-   GLuint col_stride, col_size;
-   GLfloat (*coord)[4] = VB->NdcPtr->data;
-   GLuint coord_stride = VB->NdcPtr->stride;
-   GLfloat *v = (GLfloat *)dest;
-   const GLubyte *mask = VB->ClipMask;
-   const GLfloat *s = GET_VIEWPORT_MAT();
-   int i;
-
-   (void) s;
-
-   ASSERT(stride == 4);
-
-   col = VB->AttribPtr[_TNL_ATTRIB_COLOR0]->data;
-   col_stride = VB->AttribPtr[_TNL_ATTRIB_COLOR0]->stride;
-   col_size = VB->AttribPtr[_TNL_ATTRIB_COLOR0]->size;
-
-/*     fprintf(stderr, "%s(small) importable %x\n",  */
-/*  	   __FUNCTION__, VB->importable_data); */
-
-   /* Pack what's left into a 4-dword vertex.  Color is in a different
-    * place, and there is no 'w' coordinate.
-    */
-   if (start) {
-      STRIDE_4F(coord, start * coord_stride);
-      STRIDE_4F(col, start * col_stride);
-   }
-
-   for (i=start; i < end; i++, v+=4) {
-      if (DO_XYZW) {
-	 if (HAVE_HW_VIEWPORT || mask[i] == 0) {
-	    VIEWPORT_X(v[0], coord[0][0]);
-	    VIEWPORT_Y(v[1], coord[0][1]);
-	    VIEWPORT_Z(v[2], coord[0][2]);
-	 }
-	 STRIDE_4F( coord, coord_stride );
-      }
-      if (DO_RGBA) {
-	 VERTEX_COLOR *c = (VERTEX_COLOR *)&v[3];
-	 UNCLAMPED_FLOAT_TO_UBYTE(c->red, col[0][0]);
-	 UNCLAMPED_FLOAT_TO_UBYTE(c->green, col[0][1]);
-	 UNCLAMPED_FLOAT_TO_UBYTE(c->blue, col[0][2]);
-	 if (col_size == 4) {
-	    UNCLAMPED_FLOAT_TO_UBYTE(c->alpha, col[0][3]);
-	 } else {
-	    c->alpha = CHAN_MAX;
-	 }
-	 STRIDE_4F( col, col_stride );
-      }
-/*  	 fprintf(stderr, "vert %d: %.2f %.2f %.2f %x\n",  */
-/*  		 i, v[0], v[1], v[2], *(int *)&v[3]); */
-   }
-}
-
-#endif /* emit */
-
-#if (DO_XYZW) && (DO_RGBA)
-
-
-#if (HAVE_PTEX_VERTICES)
-static GLboolean TAG(check_tex_sizes)( struct gl_context *ctx )
-{
-   LOCALVARS
-   struct vertex_buffer *VB = &TNL_CONTEXT(ctx)->vb;
-
-   /* Force 'missing' texcoords to something valid.
-    */
-   if (DO_TEX3 && VB->AttribPtr[_TNL_ATTRIB_TEX0 + 2] == 0)
-      VB->AttribPtr[_TNL_ATTRIB_TEX0 + 2] = VB->AttribPtr[_TNL_ATTRIB_TEX0 + 3];
-
-   if (DO_TEX2 && VB->AttribPtr[_TNL_ATTRIB_TEX0 + 1] == 0)
-      VB->AttribPtr[_TNL_ATTRIB_TEX0 + 1] = VB->AttribPtr[_TNL_ATTRIB_TEX0 + 2];
-
-   if (DO_TEX1 && VB->AttribPtr[_TNL_ATTRIB_TEX0 + 0] == 0)
-      VB->AttribPtr[_TNL_ATTRIB_TEX0 + 0] = VB->AttribPtr[_TNL_ATTRIB_TEX0 + 1];
-
-   if (DO_PTEX)
-      return GL_TRUE;
-   
-   if ((DO_TEX3 && VB->AttribPtr[_TNL_ATTRIB_TEX0 + GET_TEXSOURCE(3)]->size == 4) ||
-       (DO_TEX2 && VB->AttribPtr[_TNL_ATTRIB_TEX0 + GET_TEXSOURCE(2)]->size == 4) ||
-       (DO_TEX1 && VB->AttribPtr[_TNL_ATTRIB_TEX0 + GET_TEXSOURCE(1)]->size == 4) ||
-       (DO_TEX0 && VB->AttribPtr[_TNL_ATTRIB_TEX0 + GET_TEXSOURCE(0)]->size == 4))
-      return GL_FALSE;
-
-   return GL_TRUE;
-}
-#else
-static GLboolean TAG(check_tex_sizes)( struct gl_context *ctx )
-{
-   LOCALVARS
-   struct vertex_buffer *VB = &TNL_CONTEXT(ctx)->vb;
-
-   /* Force 'missing' texcoords to something valid.
-    */
-   if (DO_TEX3 && VB->AttribPtr[_TNL_ATTRIB_TEX0 + 2] == 0)
-      VB->AttribPtr[_TNL_ATTRIB_TEX0 + 2] = VB->AttribPtr[_TNL_ATTRIB_TEX0 + 3];
-
-   if (DO_TEX2 && VB->AttribPtr[_TNL_ATTRIB_TEX0 + 1] == 0)
-      VB->AttribPtr[_TNL_ATTRIB_TEX0 + 1] = VB->AttribPtr[_TNL_ATTRIB_TEX0 + 2];
-
-   if (DO_TEX1 && VB->AttribPtr[_TNL_ATTRIB_TEX0 + 0] == 0)
-      VB->AttribPtr[_TNL_ATTRIB_TEX0 + 0] = VB->AttribPtr[_TNL_ATTRIB_TEX0 + 1];
-
-   if (DO_PTEX)
-      return GL_TRUE;
-
-   /* No hardware support for projective texture.  Can fake it for
-    * TEX0 only.
-    */
-   if ((DO_TEX3 && VB->AttribPtr[_TNL_ATTRIB_TEX0 + GET_TEXSOURCE(3)]->size == 4) ||
-       (DO_TEX2 && VB->AttribPtr[_TNL_ATTRIB_TEX0 + GET_TEXSOURCE(2)]->size == 4) ||
-       (DO_TEX1 && VB->AttribPtr[_TNL_ATTRIB_TEX0 + GET_TEXSOURCE(1)]->size == 4)) {
-      PTEX_FALLBACK();
-      return GL_FALSE;
-   }
-
-   if (DO_TEX0 && VB->AttribPtr[_TNL_ATTRIB_TEX0 + GET_TEXSOURCE(0)]->size == 4) {
-      if (DO_TEX1 || DO_TEX2 || DO_TEX3) {
-	 PTEX_FALLBACK();
-      }
-      return GL_FALSE;
-   }
-
-   return GL_TRUE;
-}
-#endif /* ptex */
-
-
-static void TAG(interp)( struct gl_context *ctx,
-			 GLfloat t,
-			 GLuint edst, GLuint eout, GLuint ein,
-			 GLboolean force_boundary )
-{
-   LOCALVARS
-   struct vertex_buffer *VB = &TNL_CONTEXT(ctx)->vb;
-   GLubyte *ddverts = GET_VERTEX_STORE();
-   GLuint size = GET_VERTEX_SIZE();
-   const GLfloat *dstclip = VB->ClipPtr->data[edst];
-   GLfloat w;
-   const GLfloat *s = GET_VIEWPORT_MAT();
-
-   VERTEX *dst = (VERTEX *)(ddverts + (edst * size));
-   VERTEX *in  = (VERTEX *)(ddverts + (ein * size));
-   VERTEX *out = (VERTEX *)(ddverts + (eout * size));
-
-   (void)s;
-
-   if (HAVE_HW_DIVIDE && CHECK_HW_DIVIDE) {
-      VIEWPORT_X( dst->v.x, dstclip[0] );
-      VIEWPORT_Y( dst->v.y, dstclip[1] );
-      VIEWPORT_Z( dst->v.z, dstclip[2] );
-      w = dstclip[3];
-   }
-   else {
-      w = 1.0 / dstclip[3];
-      VIEWPORT_X( dst->v.x, dstclip[0] * w );
-      VIEWPORT_Y( dst->v.y, dstclip[1] * w );
-      VIEWPORT_Z( dst->v.z, dstclip[2] * w );
-   }
-
-   if ((HAVE_HW_DIVIDE && CHECK_HW_DIVIDE) || 
-       DO_FOG || DO_SPEC || DO_TEX0 || DO_TEX1 ||
-       DO_TEX2 || DO_TEX3 || !HAVE_TINY_VERTICES) {
-
-      dst->v.w = w;
-
-      INTERP_UB( t, dst->ub4[4][0], out->ub4[4][0], in->ub4[4][0] );
-      INTERP_UB( t, dst->ub4[4][1], out->ub4[4][1], in->ub4[4][1] );
-      INTERP_UB( t, dst->ub4[4][2], out->ub4[4][2], in->ub4[4][2] );
-      INTERP_UB( t, dst->ub4[4][3], out->ub4[4][3], in->ub4[4][3] );
-
-      if (DO_SPEC) {
-	 INTERP_UB( t, dst->v.specular.red,   out->v.specular.red,   in->v.specular.red );
-	 INTERP_UB( t, dst->v.specular.green, out->v.specular.green, in->v.specular.green );
-	 INTERP_UB( t, dst->v.specular.blue,  out->v.specular.blue,  in->v.specular.blue );
-      }
-      if (DO_FOG) {
-	 INTERP_UB( t, dst->v.specular.alpha, out->v.specular.alpha, in->v.specular.alpha );
-      }
-      if (DO_TEX0) {
-	 if (DO_PTEX) {
-	    if (HAVE_PTEX_VERTICES) {
-	       INTERP_F( t, dst->pv.u0, out->pv.u0, in->pv.u0 );
-	       INTERP_F( t, dst->pv.v0, out->pv.v0, in->pv.v0 );
-	       INTERP_F( t, dst->pv.q0, out->pv.q0, in->pv.q0 );
-	    } else {
-	       GLfloat wout = VB->NdcPtr->data[eout][3];
-	       GLfloat win = VB->NdcPtr->data[ein][3];
-	       GLfloat qout = out->pv.w / wout;
-	       GLfloat qin = in->pv.w / win;
-	       GLfloat qdst, rqdst;
-
-	       ASSERT( !HAVE_HW_DIVIDE );
-
-	       INTERP_F( t, dst->v.u0, out->v.u0 * qout, in->v.u0 * qin );
-	       INTERP_F( t, dst->v.v0, out->v.v0 * qout, in->v.v0 * qin );
-	       INTERP_F( t, qdst, qout, qin );
-
-	       rqdst = 1.0 / qdst;
-	       dst->v.u0 *= rqdst;
-	       dst->v.v0 *= rqdst;
-	       dst->v.w *= rqdst;
-	    }
-	 }
-	 else {
-	    INTERP_F( t, dst->v.u0, out->v.u0, in->v.u0 );
-	    INTERP_F( t, dst->v.v0, out->v.v0, in->v.v0 );
-	 }
-      }
-      if (DO_TEX1) {
-	 if (DO_PTEX) {
-	    INTERP_F( t, dst->pv.u1, out->pv.u1, in->pv.u1 );
-	    INTERP_F( t, dst->pv.v1, out->pv.v1, in->pv.v1 );
-	    INTERP_F( t, dst->pv.q1, out->pv.q1, in->pv.q1 );
-	 } else {
-	    INTERP_F( t, dst->v.u1, out->v.u1, in->v.u1 );
-	    INTERP_F( t, dst->v.v1, out->v.v1, in->v.v1 );
-	 }
-      }
-      else if (DO_PTEX) {
-	 dst->pv.q1 = 0.0;	/* must be a valid float on radeon */
-      }
-      if (DO_TEX2) {
-	 if (DO_PTEX) {
-	    INTERP_F( t, dst->pv.u2, out->pv.u2, in->pv.u2 );
-	    INTERP_F( t, dst->pv.v2, out->pv.v2, in->pv.v2 );
-	    INTERP_F( t, dst->pv.q2, out->pv.q2, in->pv.q2 );
-	 } else {
-	    INTERP_F( t, dst->v.u2, out->v.u2, in->v.u2 );
-	    INTERP_F( t, dst->v.v2, out->v.v2, in->v.v2 );
-	 }
-      }
-      if (DO_TEX3) {
-	 if (DO_PTEX) {
-	    INTERP_F( t, dst->pv.u3, out->pv.u3, in->pv.u3 );
-	    INTERP_F( t, dst->pv.v3, out->pv.v3, in->pv.v3 );
-	    INTERP_F( t, dst->pv.q3, out->pv.q3, in->pv.q3 );
-	 } else {
-	    INTERP_F( t, dst->v.u3, out->v.u3, in->v.u3 );
-	    INTERP_F( t, dst->v.v3, out->v.v3, in->v.v3 );
-	 }
-      }
-   } else {
-      /* 4-dword vertex.  Color is in v[3] and there is no oow coordinate.
-       */
-      INTERP_UB( t, dst->ub4[3][0], out->ub4[3][0], in->ub4[3][0] );
-      INTERP_UB( t, dst->ub4[3][1], out->ub4[3][1], in->ub4[3][1] );
-      INTERP_UB( t, dst->ub4[3][2], out->ub4[3][2], in->ub4[3][2] );
-      INTERP_UB( t, dst->ub4[3][3], out->ub4[3][3], in->ub4[3][3] );
-   }
-}
-
-#endif /* rgba && xyzw */
-
-
-static void TAG(init)( void )
-{
-   setup_tab[IND].emit = TAG(emit);
-
-#if (DO_XYZW && DO_RGBA)
-   setup_tab[IND].check_tex_sizes = TAG(check_tex_sizes);
-   setup_tab[IND].interp = TAG(interp);
-#endif
-
-   if (DO_SPEC)
-      setup_tab[IND].copy_pv = copy_pv_rgba4_spec5;
-   else if (HAVE_HW_DIVIDE || DO_SPEC || DO_FOG || DO_TEX0 || DO_TEX1 ||
-	    DO_TEX2 || DO_TEX3 || !HAVE_TINY_VERTICES)
-      setup_tab[IND].copy_pv = copy_pv_rgba4;
-   else
-      setup_tab[IND].copy_pv = copy_pv_rgba3;
-
-   if (DO_TEX3) {
-      if (DO_PTEX) {
-	 ASSERT(HAVE_PTEX_VERTICES);
-	 setup_tab[IND].vertex_format = PROJ_TEX3_VERTEX_FORMAT;
-	 setup_tab[IND].vertex_size = 18;
-      }
-      else {
-	 setup_tab[IND].vertex_format = TEX3_VERTEX_FORMAT;
-	 setup_tab[IND].vertex_size = 14;
-      }
-   }
-   else if (DO_TEX2) {
-      if (DO_PTEX) {
-	 ASSERT(HAVE_PTEX_VERTICES);
-	 setup_tab[IND].vertex_format = PROJ_TEX3_VERTEX_FORMAT;
-	 setup_tab[IND].vertex_size = 18;
-      }
-      else {
-	 setup_tab[IND].vertex_format = TEX2_VERTEX_FORMAT;
-	 setup_tab[IND].vertex_size = 12;
-      }
-   }
-   else if (DO_TEX1) {
-      if (DO_PTEX) {
-	 ASSERT(HAVE_PTEX_VERTICES);
-	 setup_tab[IND].vertex_format = PROJ_TEX1_VERTEX_FORMAT;
-	 setup_tab[IND].vertex_size = 12;
-      }
-      else {
-	 setup_tab[IND].vertex_format = TEX1_VERTEX_FORMAT;
-	 setup_tab[IND].vertex_size = 10;
-      }
-   }
-   else if (DO_TEX0) {
-      if (DO_PTEX && HAVE_PTEX_VERTICES) {
-	 setup_tab[IND].vertex_format = PROJ_TEX1_VERTEX_FORMAT;
-	 setup_tab[IND].vertex_size = 12;
-      } else {
-	 setup_tab[IND].vertex_format = TEX0_VERTEX_FORMAT;
-	 setup_tab[IND].vertex_size = 8;
-      }
-   }
-   else if (!HAVE_HW_DIVIDE && !DO_SPEC && !DO_FOG && HAVE_TINY_VERTICES) {
-      setup_tab[IND].vertex_format = TINY_VERTEX_FORMAT;
-      setup_tab[IND].vertex_size = 4;
-   } else if (HAVE_NOTEX_VERTICES) {
-      setup_tab[IND].vertex_format = NOTEX_VERTEX_FORMAT;
-      setup_tab[IND].vertex_size = 6;
-   } else {
-      setup_tab[IND].vertex_format = TEX0_VERTEX_FORMAT;
-      setup_tab[IND].vertex_size = 8;
-   }
-}
-
-
-#undef IND
-#undef TAG



More information about the mesa-commit mailing list