[PATCH] Remove unused code in d_polyse.c Remove some #if 0'd code and an unused function from d_polyse.c diff -urN a/NQ/d_polyse.c head/NQ/d_polyse.c --- a/NQ/d_polyse.c 2006-05-27 23:05:00.000000000 +0930 +++ head/NQ/d_polyse.c 2006-05-27 22:51:17.000000000 +0930 @@ -564,28 +564,6 @@ a_ststepxwhole = skinwidth * (r_tstepx >> 16) + (r_sstepx >> 16); } -#endif /* USE_X86_ASM */ - - -#if 0 -byte gelmap[256]; -void -InitGel(byte *palette) -{ - int i; - int r; - - for (i = 0; i < 256; i++) { -// r = (palette[i*3]>>4); - r = (palette[i * 3] + palette[i * 3 + 1] + - palette[i * 3 + 2]) / (16 * 3); - gelmap[i] = /* 64 */ 0 + r; - } -} -#endif - - -#ifndef USE_X86_ASM /* ================ @@ -626,7 +604,6 @@ do { if ((lzi >> 16) >= *lpz) { *lpdest = ((byte *)acolormap)[*lptex + (llight & 0xFF00)]; -// gel mapping *lpdest = gelmap[*lpdest]; *lpz = lzi >> 16; } lpdest++; @@ -653,41 +630,6 @@ /* ================ -D_PolysetFillSpans8 -================ -*/ -void -D_PolysetFillSpans8(spanpackage_t *pspanpackage) -{ - int color; - -// FIXME: do z buffering - - color = d_aflatcolor++; - - while (1) { - int lcount; - byte *lpdest; - - lcount = pspanpackage->count; - - if (lcount == -1) - return; - - if (lcount) { - lpdest = pspanpackage->pdest; - - do { - *lpdest++ = color; - } while (--lcount); - } - - pspanpackage++; - } -} - -/* -================ D_RasterizeAliasPolySmooth ================ */ @@ -996,78 +938,3 @@ pedgetable = &edgetables[edgetableindex]; } - - -#if 0 - -void -D_PolysetRecursiveDrawLine(int *lp1, int *lp2) -{ - int d; - int new[6]; - int ofs; - - d = lp2[0] - lp1[0]; - if (d < -1 || d > 1) - goto split; - d = lp2[1] - lp1[1]; - if (d < -1 || d > 1) - goto split; - - return; // line is completed - - split: -// split this edge - new[0] = (lp1[0] + lp2[0]) >> 1; - new[1] = (lp1[1] + lp2[1]) >> 1; - new[5] = (lp1[5] + lp2[5]) >> 1; - new[2] = (lp1[2] + lp2[2]) >> 1; - new[3] = (lp1[3] + lp2[3]) >> 1; - new[4] = (lp1[4] + lp2[4]) >> 1; - -// draw the point - ofs = d_scantable[new[1]] + new[0]; - if (new[5] > d_pzbuffer[ofs]) { - int pix; - - d_pzbuffer[ofs] = new[5]; - pix = skintable[new[3] >> 16][new[2] >> 16]; -// pix = ((byte *)acolormap)[pix + (new[4] & 0xFF00)]; - d_viewbuffer[ofs] = pix; - } -// recursively continue - D_PolysetRecursiveDrawLine(lp1, new); - D_PolysetRecursiveDrawLine(new, lp2); -} - -void -D_PolysetRecursiveTriangle2(int *lp1, int *lp2, int *lp3) -{ - int d; - int new[4]; - - d = lp2[0] - lp1[0]; - if (d < -1 || d > 1) - goto split; - d = lp2[1] - lp1[1]; - if (d < -1 || d > 1) - goto split; - return; - - split: -// split this edge - new[0] = (lp1[0] + lp2[0]) >> 1; - new[1] = (lp1[1] + lp2[1]) >> 1; - new[5] = (lp1[5] + lp2[5]) >> 1; - new[2] = (lp1[2] + lp2[2]) >> 1; - new[3] = (lp1[3] + lp2[3]) >> 1; - new[4] = (lp1[4] + lp2[4]) >> 1; - - D_PolysetRecursiveDrawLine(new, lp3); - -// recursively continue - D_PolysetRecursiveTriangle(lp1, new, lp3); - D_PolysetRecursiveTriangle(new, lp2, lp3); -} - -#endif diff -urN a/QW/client/d_polyse.c head/QW/client/d_polyse.c --- a/QW/client/d_polyse.c 2006-05-27 23:05:00.000000000 +0930 +++ head/QW/client/d_polyse.c 2006-05-27 22:51:26.000000000 +0930 @@ -564,26 +564,6 @@ a_ststepxwhole = skinwidth * (r_tstepx >> 16) + (r_sstepx >> 16); } -#endif /* USE_X86_ASM */ - - -byte gelmap[256]; -void -InitGel(byte *palette) -{ - int i; - int r; - - for (i = 0; i < 256; i++) { -// r = (palette[i*3]>>4); - r = (palette[i * 3] + palette[i * 3 + 1] + - palette[i * 3 + 2]) / (16 * 3); - gelmap[i] = /* 64 */ 0 + r; - } -} - - -#ifndef USE_X86_ASM /* ================ @@ -624,7 +604,6 @@ do { if ((lzi >> 16) >= *lpz) { *lpdest = ((byte *)acolormap)[*lptex + (llight & 0xFF00)]; -// gel mapping *lpdest = gelmap[*lpdest]; *lpz = lzi >> 16; } lpdest++; @@ -651,41 +630,6 @@ /* ================ -D_PolysetFillSpans8 -================ -*/ -void -D_PolysetFillSpans8(spanpackage_t *pspanpackage) -{ - int color; - -// FIXME: do z buffering - - color = d_aflatcolor++; - - while (1) { - int lcount; - byte *lpdest; - - lcount = pspanpackage->count; - - if (lcount == -1) - return; - - if (lcount) { - lpdest = pspanpackage->pdest; - - do { - *lpdest++ = color; - } while (--lcount); - } - - pspanpackage++; - } -} - -/* -================ D_RasterizeAliasPolySmooth ================ */ @@ -950,78 +894,3 @@ pedgetable = &edgetables[edgetableindex]; } - - -#if 0 - -void -D_PolysetRecursiveDrawLine(int *lp1, int *lp2) -{ - int d; - int new[6]; - int ofs; - - d = lp2[0] - lp1[0]; - if (d < -1 || d > 1) - goto split; - d = lp2[1] - lp1[1]; - if (d < -1 || d > 1) - goto split; - - return; // line is completed - - split: -// split this edge - new[0] = (lp1[0] + lp2[0]) >> 1; - new[1] = (lp1[1] + lp2[1]) >> 1; - new[5] = (lp1[5] + lp2[5]) >> 1; - new[2] = (lp1[2] + lp2[2]) >> 1; - new[3] = (lp1[3] + lp2[3]) >> 1; - new[4] = (lp1[4] + lp2[4]) >> 1; - -// draw the point - ofs = d_scantable[new[1]] + new[0]; - if (new[5] > d_pzbuffer[ofs]) { - int pix; - - d_pzbuffer[ofs] = new[5]; - pix = skintable[new[3] >> 16][new[2] >> 16]; -// pix = ((byte *)acolormap)[pix + (new[4] & 0xFF00)]; - d_viewbuffer[ofs] = pix; - } -// recursively continue - D_PolysetRecursiveDrawLine(lp1, new); - D_PolysetRecursiveDrawLine(new, lp2); -} - -void -D_PolysetRecursiveTriangle2(int *lp1, int *lp2, int *lp3) -{ - int d; - int new[4]; - - d = lp2[0] - lp1[0]; - if (d < -1 || d > 1) - goto split; - d = lp2[1] - lp1[1]; - if (d < -1 || d > 1) - goto split; - return; - - split: -// split this edge - new[0] = (lp1[0] + lp2[0]) >> 1; - new[1] = (lp1[1] + lp2[1]) >> 1; - new[5] = (lp1[5] + lp2[5]) >> 1; - new[2] = (lp1[2] + lp2[2]) >> 1; - new[3] = (lp1[3] + lp2[3]) >> 1; - new[4] = (lp1[4] + lp2[4]) >> 1; - - D_PolysetRecursiveDrawLine(new, lp3); - -// recursively continue - D_PolysetRecursiveTriangle(lp1, new, lp3); - D_PolysetRecursiveTriangle(new, lp2, lp3); -} - -#endif