X-Git-Url: https://git.libre-soc.org/?a=blobdiff_plain;f=src%2Fmesa%2Fswrast%2Fs_linetemp.h;h=1accfc67e2ce66ff1f32e0c10845913a1bf2e23e;hb=d378f7b3dfda3b549e4b02380e492671cc34bb59;hp=fec413c6a20003b69ea8a7ffcfa1b07118c6f579;hpb=d0570646bd67eae8152b63ccaf5c73970b1f56ea;p=mesa.git diff --git a/src/mesa/swrast/s_linetemp.h b/src/mesa/swrast/s_linetemp.h index fec413c6a20..1accfc67e2c 100644 --- a/src/mesa/swrast/s_linetemp.h +++ b/src/mesa/swrast/s_linetemp.h @@ -1,10 +1,8 @@ -/* $Id: s_linetemp.h,v 1.13 2002/03/19 15:22:50 brianp Exp $ */ - /* * Mesa 3-D graphics library - * Version: 4.1 + * Version: 7.0 * - * Copyright (C) 1999-2002 Brian Paul All Rights Reserved. + * Copyright (C) 1999-2007 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"), @@ -33,13 +31,9 @@ * The following macros may be defined to indicate what auxillary information * must be interplated along the line: * INTERP_Z - if defined, interpolate Z values - * INTERP_FOG - if defined, interpolate FOG values - * INTERP_RGB - if defined, interpolate RGB values - * INTERP_SPEC - if defined, interpolate specular RGB values - * INTERP_ALPHA - if defined, interpolate Alpha values + * INTERP_RGBA - if defined, interpolate RGBA values * INTERP_INDEX - if defined, interpolate color index values - * INTERP_TEX - if defined, interpolate unit 0 texcoords - * INTERP_MULTITEX - if defined, interpolate multi-texcoords + * INTERP_ATTRIBS - if defined, interpolate attribs (texcoords, varying, etc) * * When one can directly address pixels in the color buffer the following * macros can be defined and used to directly compute pixel addresses during @@ -70,114 +64,59 @@ */ -/*void line( GLcontext *ctx, const SWvertex *vert0, const SWvertex *vert1 )*/ +static void +NAME( GLcontext *ctx, const SWvertex *vert0, const SWvertex *vert1 ) { - GLint x0 = (GLint) vert0->win[0]; - GLint x1 = (GLint) vert1->win[0]; - GLint y0 = (GLint) vert0->win[1]; - GLint y1 = (GLint) vert1->win[1]; + const SWcontext *swrast = SWRAST_CONTEXT(ctx); + SWspan span; + GLuint interpFlags = 0; + GLint x0 = (GLint) vert0->attrib[FRAG_ATTRIB_WPOS][0]; + GLint x1 = (GLint) vert1->attrib[FRAG_ATTRIB_WPOS][0]; + GLint y0 = (GLint) vert0->attrib[FRAG_ATTRIB_WPOS][1]; + GLint y1 = (GLint) vert1->attrib[FRAG_ATTRIB_WPOS][1]; GLint dx, dy; -#ifdef INTERP_XY + GLint numPixels; GLint xstep, ystep; -#endif -#ifdef INTERP_Z - GLint z0, z1, dz; - const GLint depthBits = ctx->Visual.depthBits; +#if defined(DEPTH_TYPE) + const GLint depthBits = ctx->DrawBuffer->Visual.depthBits; const GLint fixedToDepthShift = depthBits <= 16 ? FIXED_SHIFT : 0; -# define FixedToDepth(F) ((F) >> fixedToDepthShift) -# ifdef DEPTH_TYPE + struct gl_renderbuffer *zrb = ctx->DrawBuffer->Attachment[BUFFER_DEPTH].Renderbuffer; +#define FixedToDepth(F) ((F) >> fixedToDepthShift) GLint zPtrXstep, zPtrYstep; DEPTH_TYPE *zPtr; -# endif -#endif -#ifdef INTERP_FOG - GLfloat fog0 = vert0->fog; - GLfloat dfog = vert1->fog - fog0; -#endif -#ifdef INTERP_RGB - GLfixed r0 = ChanToFixed(vert0->color[0]); - GLfixed dr = ChanToFixed(vert1->color[0]) - r0; - GLfixed g0 = ChanToFixed(vert0->color[1]); - GLfixed dg = ChanToFixed(vert1->color[1]) - g0; - GLfixed b0 = ChanToFixed(vert0->color[2]); - GLfixed db = ChanToFixed(vert1->color[2]) - b0; -#endif -#ifdef INTERP_SPEC - GLfixed sr0 = ChanToFixed(vert0->specular[0]); - GLfixed dsr = ChanToFixed(vert1->specular[0]) - sr0; - GLfixed sg0 = ChanToFixed(vert0->specular[1]); - GLfixed dsg = ChanToFixed(vert1->specular[1]) - sg0; - GLfixed sb0 = ChanToFixed(vert0->specular[2]); - GLfixed dsb = ChanToFixed(vert1->specular[2]) - sb0; -#endif -#ifdef INTERP_ALPHA - GLfixed a0 = ChanToFixed(vert0->color[3]); - GLfixed da = ChanToFixed(vert1->color[3]) - a0; -#endif -#ifdef INTERP_INDEX - GLint i0 = vert0->index << 8; - GLint di = (GLint) (vert1->index << 8) - i0; -#endif -#ifdef INTERP_TEX - const GLfloat invw0 = vert0->win[3]; - const GLfloat invw1 = vert1->win[3]; - GLfloat tex[4]; - GLfloat dtex[4]; - GLfloat fragTexcoord[4]; -#endif -#ifdef INTERP_MULTITEX - const GLfloat invw0 = vert0->win[3]; - const GLfloat invw1 = vert1->win[3]; - GLfloat tex[MAX_TEXTURE_UNITS][4]; - GLfloat dtex[MAX_TEXTURE_UNITS][4]; - GLfloat fragTexcoord[MAX_TEXTURE_UNITS][4]; +#elif defined(INTERP_Z) + const GLint depthBits = ctx->DrawBuffer->Visual.depthBits; +/*ctx->Visual.depthBits;*/ #endif #ifdef PIXEL_ADDRESS PIXEL_TYPE *pixelPtr; GLint pixelXstep, pixelYstep; #endif -#ifdef INTERP_TEX - { - tex[0] = invw0 * vert0->texcoord[0][0]; - dtex[0] = invw1 * vert1->texcoord[0][0] - tex[0]; - tex[1] = invw0 * vert0->texcoord[0][1]; - dtex[1] = invw1 * vert1->texcoord[0][1] - tex[1]; - tex[2] = invw0 * vert0->texcoord[0][2]; - dtex[2] = invw1 * vert1->texcoord[0][2] - tex[2]; - tex[3] = invw0 * vert0->texcoord[0][3]; - dtex[3] = invw1 * vert1->texcoord[0][3] - tex[3]; - } -#endif -#ifdef INTERP_MULTITEX - { - GLuint u; - for (u = 0; u < ctx->Const.MaxTextureUnits; u++) { - if (ctx->Texture.Unit[u]._ReallyEnabled) { - tex[u][0] = invw0 * vert0->texcoord[u][0]; - dtex[u][0] = invw1 * vert1->texcoord[u][0] - tex[u][0]; - tex[u][1] = invw0 * vert0->texcoord[u][1]; - dtex[u][1] = invw1 * vert1->texcoord[u][1] - tex[u][1]; - tex[u][2] = invw0 * vert0->texcoord[u][2]; - dtex[u][2] = invw1 * vert1->texcoord[u][2] - tex[u][2]; - tex[u][3] = invw0 * vert0->texcoord[u][3]; - dtex[u][3] = invw1 * vert1->texcoord[u][3] - tex[u][3]; - } - } - } + +#ifdef SETUP_CODE + SETUP_CODE #endif + (void) swrast; + /* Cull primitives with malformed coordinates. */ { - float tmp = vert0->win[0] + vert0->win[1] + vert1->win[0] + vert1->win[1]; + GLfloat tmp = vert0->attrib[FRAG_ATTRIB_WPOS][0] + vert0->attrib[FRAG_ATTRIB_WPOS][1] + + vert1->attrib[FRAG_ATTRIB_WPOS][0] + vert1->attrib[FRAG_ATTRIB_WPOS][1]; if (IS_INF_OR_NAN(tmp)) return; } /* printf("%s():\n", __FUNCTION__); - printf(" (%f, %f) -> (%f, %f)\n", - vert0->win[0], vert0->win[1], vert1->win[0], vert1->win[1]); + printf(" (%f, %f, %f) -> (%f, %f, %f)\n", + vert0->attrib[FRAG_ATTRIB_WPOS][0], + vert0->attrib[FRAG_ATTRIB_WPOS][1], + vert0->attrib[FRAG_ATTRIB_WPOS][2], + vert1->attrib[FRAG_ATTRIB_WPOS][0], + vert1->attrib[FRAG_ATTRIB_WPOS][1], + vert1->attrib[FRAG_ATTRIB_WPOS][2]); printf(" (%d, %d, %d) -> (%d, %d, %d)\n", vert0->color[0], vert0->color[1], vert0->color[2], vert1->color[0], vert1->color[1], vert1->color[2]); @@ -211,31 +150,26 @@ } } #endif + dx = x1 - x0; dy = y1 - y0; - if (dx==0 && dy==0) { + if (dx == 0 && dy == 0) return; - } /* - * Setup - */ -#ifdef SETUP_CODE - SETUP_CODE -#endif + printf("%s %d,%d %g %g %g %g %g %g %g %g\n", __FUNCTION__, dx, dy, + vert0->attrib[FRAG_ATTRIB_COL1][0], + vert0->attrib[FRAG_ATTRIB_COL1][1], + vert0->attrib[FRAG_ATTRIB_COL1][2], + vert0->attrib[FRAG_ATTRIB_COL1][3], + vert1->attrib[FRAG_ATTRIB_COL1][0], + vert1->attrib[FRAG_ATTRIB_COL1][1], + vert1->attrib[FRAG_ATTRIB_COL1][2], + vert1->attrib[FRAG_ATTRIB_COL1][3]); + */ -#ifdef INTERP_Z -# ifdef DEPTH_TYPE - zPtr = (DEPTH_TYPE *) _mesa_zbuffer_address(ctx, x0, y0); -# endif - if (depthBits <= 16) { - z0 = FloatToFixed(vert0->win[2]); - z1 = FloatToFixed(vert1->win[2]); - } - else { - z0 = (int) vert0->win[2]; - z1 = (int) vert1->win[2]; - } +#ifdef DEPTH_TYPE + zPtr = (DEPTH_TYPE *) zrb->GetPointer(ctx, zrb, x0, y0); #endif #ifdef PIXEL_ADDRESS pixelPtr = (PIXEL_TYPE *) PIXEL_ADDRESS(x0,y0); @@ -243,10 +177,8 @@ if (dx<0) { dx = -dx; /* make positive */ -#ifdef INTERP_XY xstep = -1; -#endif -#if defined(INTERP_Z) && defined(DEPTH_TYPE) +#ifdef DEPTH_TYPE zPtrXstep = -((GLint)sizeof(DEPTH_TYPE)); #endif #ifdef PIXEL_ADDRESS @@ -254,10 +186,8 @@ #endif } else { -#ifdef INTERP_XY xstep = 1; -#endif -#if defined(INTERP_Z) && defined(DEPTH_TYPE) +#ifdef DEPTH_TYPE zPtrXstep = ((GLint)sizeof(DEPTH_TYPE)); #endif #ifdef PIXEL_ADDRESS @@ -267,10 +197,8 @@ if (dy<0) { dy = -dy; /* make positive */ -#ifdef INTERP_XY ystep = -1; -#endif -#if defined(INTERP_Z) && defined(DEPTH_TYPE) +#ifdef DEPTH_TYPE zPtrYstep = -((GLint) (ctx->DrawBuffer->Width * sizeof(DEPTH_TYPE))); #endif #ifdef PIXEL_ADDRESS @@ -278,10 +206,8 @@ #endif } else { -#ifdef INTERP_XY ystep = 1; -#endif -#if defined(INTERP_Z) && defined(DEPTH_TYPE) +#ifdef DEPTH_TYPE zPtrYstep = (GLint) (ctx->DrawBuffer->Width * sizeof(DEPTH_TYPE)); #endif #ifdef PIXEL_ADDRESS @@ -289,158 +215,135 @@ #endif } + ASSERT(dx >= 0); + ASSERT(dy >= 0); + + numPixels = MAX2(dx, dy); + /* - * Draw + * Span setup: compute start and step values for all interpolated values. */ - - if (dx>dy) { - /*** X-major line ***/ - GLint i; - GLint errorInc = dy+dy; - GLint error = errorInc-dx; - GLint errorDec = error-dx; -#ifdef SET_XMAJOR - xMajor = GL_TRUE; -#endif -#ifdef INTERP_Z - dz = (z1-z0) / dx; -#endif -#ifdef INTERP_FOG - dfog /= dx; -#endif -#ifdef INTERP_RGB - dr /= dx; /* convert from whole line delta to per-pixel delta */ - dg /= dx; - db /= dx; -#endif -#ifdef INTERP_SPEC - dsr /= dx; /* convert from whole line delta to per-pixel delta */ - dsg /= dx; - dsb /= dx; -#endif -#ifdef INTERP_ALPHA - da /= dx; +#ifdef INTERP_RGBA + interpFlags |= SPAN_RGBA; + if (ctx->Light.ShadeModel == GL_SMOOTH) { + span.red = ChanToFixed(vert0->color[0]); + span.green = ChanToFixed(vert0->color[1]); + span.blue = ChanToFixed(vert0->color[2]); + span.alpha = ChanToFixed(vert0->color[3]); + span.redStep = (ChanToFixed(vert1->color[0]) - span.red ) / numPixels; + span.greenStep = (ChanToFixed(vert1->color[1]) - span.green) / numPixels; + span.blueStep = (ChanToFixed(vert1->color[2]) - span.blue ) / numPixels; + span.alphaStep = (ChanToFixed(vert1->color[3]) - span.alpha) / numPixels; + } + else { + span.red = ChanToFixed(vert1->color[0]); + span.green = ChanToFixed(vert1->color[1]); + span.blue = ChanToFixed(vert1->color[2]); + span.alpha = ChanToFixed(vert1->color[3]); + span.redStep = 0; + span.greenStep = 0; + span.blueStep = 0; + span.alphaStep = 0; + } #endif #ifdef INTERP_INDEX - di /= dx; + interpFlags |= SPAN_INDEX; + if (ctx->Light.ShadeModel == GL_SMOOTH) { + span.index = FloatToFixed(vert0->attrib[FRAG_ATTRIB_CI][0]); + span.indexStep = FloatToFixed( vert1->attrib[FRAG_ATTRIB_CI][0] + - vert0->attrib[FRAG_ATTRIB_CI][0]) / numPixels; + } + else { + span.index = FloatToFixed(vert1->attrib[FRAG_ATTRIB_CI][0]); + span.indexStep = 0; + } #endif -#ifdef INTERP_TEX - { - const GLfloat invDx = 1.0F / (GLfloat) dx; - dtex[0] *= invDx; - dtex[1] *= invDx; - dtex[2] *= invDx; - dtex[3] *= invDx; +#if defined(INTERP_Z) || defined(DEPTH_TYPE) + interpFlags |= SPAN_Z; + { + if (depthBits <= 16) { + span.z = FloatToFixed(vert0->attrib[FRAG_ATTRIB_WPOS][2]) + FIXED_HALF; + span.zStep = FloatToFixed( vert1->attrib[FRAG_ATTRIB_WPOS][2] + - vert0->attrib[FRAG_ATTRIB_WPOS][2]) / numPixels; } -#endif -#ifdef INTERP_MULTITEX - { - const GLfloat invDx = 1.0F / (GLfloat) dx; - GLuint u; - for (u = 0; u < ctx->Const.MaxTextureUnits; u++) { - if (ctx->Texture.Unit[u]._ReallyEnabled) { - dtex[u][0] *= invDx; - dtex[u][1] *= invDx; - dtex[u][2] *= invDx; - dtex[u][3] *= invDx; - } - } + else { + /* don't use fixed point */ + span.z = (GLuint) vert0->attrib[FRAG_ATTRIB_WPOS][2]; + span.zStep = (GLint) (( vert1->attrib[FRAG_ATTRIB_WPOS][2] + - vert0->attrib[FRAG_ATTRIB_WPOS][2]) / numPixels); } + } #endif +#if defined(INTERP_ATTRIBS) + { + const GLfloat invLen = 1.0F / numPixels; + const GLfloat invw0 = vert0->attrib[FRAG_ATTRIB_WPOS][3]; + const GLfloat invw1 = vert1->attrib[FRAG_ATTRIB_WPOS][3]; - for (i=0;i> 8; -#endif -#ifdef INTERP_TEX - { - const GLfloat invQ = tex[3] ? (1.0F / tex[3]) : 1.0F; - fragTexcoord[0] = tex[0] * invQ; - fragTexcoord[1] = tex[1] * invQ; - fragTexcoord[2] = tex[2] * invQ; - fragTexcoord[3] = tex[3]; - } -#endif -#ifdef INTERP_MULTITEX - { - GLuint u; - for (u = 0; u < ctx->Const.MaxTextureUnits; u++) { - if (ctx->Texture.Unit[u]._ReallyEnabled) { - const GLfloat invQ = 1.0F / tex[u][3]; - fragTexcoord[u][0] = tex[u][0] * invQ; - fragTexcoord[u][1] = tex[u][1] * invQ; - fragTexcoord[u][2] = tex[u][2] * invQ; - fragTexcoord[u][3] = tex[u][3]; - } - } + span.attrStart[FRAG_ATTRIB_WPOS][3] = invw0; + span.attrStepX[FRAG_ATTRIB_WPOS][3] = (invw1 - invw0) * invLen; + span.attrStepY[FRAG_ATTRIB_WPOS][3] = 0.0; + + ATTRIB_LOOP_BEGIN + if (swrast->_InterpMode[attr] == GL_FLAT) { + COPY_4V(span.attrStart[attr], vert1->attrib[attr]); + ASSIGN_4V(span.attrStepX[attr], 0.0, 0.0, 0.0, 0.0); + } + else { + GLuint c; + for (c = 0; c < 4; c++) { + float da; + span.attrStart[attr][c] = invw0 * vert0->attrib[attr][c]; + da = (invw1 * vert1->attrib[attr][c]) - span.attrStart[attr][c]; + span.attrStepX[attr][c] = da * invLen; } + } + ASSIGN_4V(span.attrStepY[attr], 0.0, 0.0, 0.0, 0.0); + ATTRIB_LOOP_END + } #endif - PLOT( x0, y0 ); + INIT_SPAN(span, GL_LINE); + span.end = numPixels; + span.interpMask = interpFlags; + span.arrayMask = SPAN_XY; -#ifdef INTERP_XY - x0 += xstep; -#endif -#ifdef INTERP_Z -# ifdef DEPTH_TYPE - zPtr = (DEPTH_TYPE *) ((GLubyte*) zPtr + zPtrXstep); -# endif - z0 += dz; -#endif -#ifdef INTERP_FOG - fog0 += dfog; -#endif -#ifdef INTERP_RGB - r0 += dr; - g0 += dg; - b0 += db; -#endif -#ifdef INTERP_SPEC - sr0 += dsr; - sg0 += dsg; - sb0 += dsb; -#endif -#ifdef INTERP_ALPHA - a0 += da; -#endif -#ifdef INTERP_INDEX - i0 += di; + /* + * Draw + */ + + if (dx > dy) { + /*** X-major line ***/ + GLint i; + GLint errorInc = dy+dy; + GLint error = errorInc-dx; + GLint errorDec = error-dx; + + for (i = 0; i < dx; i++) { +#ifdef DEPTH_TYPE + GLuint Z = FixedToDepth(span.z); #endif -#ifdef INTERP_TEX - tex[0] += dtex[0]; - tex[1] += dtex[1]; - tex[2] += dtex[2]; - tex[3] += dtex[3]; +#ifdef PLOT + PLOT( x0, y0 ); +#else + span.array->x[i] = x0; + span.array->y[i] = y0; #endif -#ifdef INTERP_MULTITEX - { - GLuint u; - for (u = 0; u < ctx->Const.MaxTextureUnits; u++) { - if (ctx->Texture.Unit[u]._ReallyEnabled) { - tex[u][0] += dtex[u][0]; - tex[u][1] += dtex[u][1]; - tex[u][2] += dtex[u][2]; - tex[u][3] += dtex[u][3]; - } - } - } + x0 += xstep; +#ifdef DEPTH_TYPE + zPtr = (DEPTH_TYPE *) ((GLubyte*) zPtr + zPtrXstep); + span.z += span.zStep; #endif - #ifdef PIXEL_ADDRESS pixelPtr = (PIXEL_TYPE*) ((GLubyte*) pixelPtr + pixelXstep); #endif - if (error<0) { + if (error < 0) { error += errorInc; } else { error += errorDec; -#ifdef INTERP_XY y0 += ystep; -#endif -#if defined(INTERP_Z) && defined(DEPTH_TYPE) +#ifdef DEPTH_TYPE zPtr = (DEPTH_TYPE *) ((GLubyte*) zPtr + zPtrYstep); #endif #ifdef PIXEL_ADDRESS @@ -455,131 +358,21 @@ GLint errorInc = dx+dx; GLint error = errorInc-dy; GLint errorDec = error-dy; -#ifdef INTERP_Z - dz = (z1-z0) / dy; -#endif -#ifdef INTERP_FOG - dfog /= dy; -#endif -#ifdef INTERP_RGB - dr /= dy; /* convert from whole line delta to per-pixel delta */ - dg /= dy; - db /= dy; -#endif -#ifdef INTERP_SPEC - dsr /= dy; /* convert from whole line delta to per-pixel delta */ - dsg /= dy; - dsb /= dy; -#endif -#ifdef INTERP_ALPHA - da /= dy; -#endif -#ifdef INTERP_INDEX - di /= dy; -#endif -#ifdef INTERP_TEX - { - const GLfloat invDy = 1.0F / (GLfloat) dy; - dtex[0] *= invDy; - dtex[1] *= invDy; - dtex[2] *= invDy; - dtex[3] *= invDy; - } -#endif -#ifdef INTERP_MULTITEX - { - const GLfloat invDy = 1.0F / (GLfloat) dy; - GLuint u; - for (u = 0; u < ctx->Const.MaxTextureUnits; u++) { - if (ctx->Texture.Unit[u]._ReallyEnabled) { - dtex[u][0] *= invDy; - dtex[u][1] *= invDy; - dtex[u][2] *= invDy; - dtex[u][3] *= invDy; - } - } - } -#endif for (i=0;i> 8; +#ifdef DEPTH_TYPE + GLuint Z = FixedToDepth(span.z); #endif -#ifdef INTERP_TEX - { - const GLfloat invQ = tex[3] ? (1.0F / tex[3]) : 1.0F; - fragTexcoord[0] = tex[0] * invQ; - fragTexcoord[1] = tex[1] * invQ; - fragTexcoord[2] = tex[2] * invQ; - fragTexcoord[3] = tex[3]; - } -#endif -#ifdef INTERP_MULTITEX - { - GLuint u; - for (u = 0; u < ctx->Const.MaxTextureUnits; u++) { - if (ctx->Texture.Unit[u]._ReallyEnabled) { - const GLfloat invQ = 1.0F / tex[u][3]; - fragTexcoord[u][0] = tex[u][0] * invQ; - fragTexcoord[u][1] = tex[u][1] * invQ; - fragTexcoord[u][2] = tex[u][2] * invQ; - fragTexcoord[u][3] = tex[u][3]; - } - } - } +#ifdef PLOT + PLOT( x0, y0 ); +#else + span.array->x[i] = x0; + span.array->y[i] = y0; #endif - - PLOT( x0, y0 ); - -#ifdef INTERP_XY y0 += ystep; -#endif -#ifdef INTERP_Z -# ifdef DEPTH_TYPE +#ifdef DEPTH_TYPE zPtr = (DEPTH_TYPE *) ((GLubyte*) zPtr + zPtrYstep); -# endif - z0 += dz; -#endif -#ifdef INTERP_FOG - fog0 += dfog; -#endif -#ifdef INTERP_RGB - r0 += dr; - g0 += dg; - b0 += db; -#endif -#ifdef INTERP_SPEC - sr0 += dsr; - sg0 += dsg; - sb0 += dsb; -#endif -#ifdef INTERP_ALPHA - a0 += da; -#endif -#ifdef INTERP_INDEX - i0 += di; -#endif -#ifdef INTERP_TEX - tex[0] += dtex[0]; - tex[1] += dtex[1]; - tex[2] += dtex[2]; - tex[3] += dtex[3]; -#endif -#ifdef INTERP_MULTITEX - { - GLuint u; - for (u = 0; u < ctx->Const.MaxTextureUnits; u++) { - if (ctx->Texture.Unit[u]._ReallyEnabled) { - tex[u][0] += dtex[u][0]; - tex[u][1] += dtex[u][1]; - tex[u][2] += dtex[u][2]; - tex[u][3] += dtex[u][3]; - } - } - } + span.z += span.zStep; #endif #ifdef PIXEL_ADDRESS pixelPtr = (PIXEL_TYPE*) ((GLubyte*) pixelPtr + pixelYstep); @@ -589,10 +382,8 @@ } else { error += errorDec; -#ifdef INTERP_XY x0 += xstep; -#endif -#if defined(INTERP_Z) && defined(DEPTH_TYPE) +#ifdef DEPTH_TYPE zPtr = (DEPTH_TYPE *) ((GLubyte*) zPtr + zPtrXstep); #endif #ifdef PIXEL_ADDRESS @@ -602,17 +393,19 @@ } } +#ifdef RENDER_SPAN + RENDER_SPAN( span ); +#endif + + (void)span; + } -#undef INTERP_XY +#undef NAME #undef INTERP_Z -#undef INTERP_FOG -#undef INTERP_RGB -#undef INTERP_SPEC -#undef INTERP_ALPHA -#undef INTERP_TEX -#undef INTERP_MULTITEX +#undef INTERP_RGBA +#undef INTERP_ATTRIBS #undef INTERP_INDEX #undef PIXEL_ADDRESS #undef PIXEL_TYPE @@ -622,4 +415,4 @@ #undef PLOT #undef CLIP_HACK #undef FixedToDepth -#undef SET_XMAJOR +#undef RENDER_SPAN