X-Git-Url: https://git.libre-soc.org/?a=blobdiff_plain;f=src%2Fmesa%2Fswrast%2Fs_zoom.c;h=b67a2970109ea0656ec4ffa9322c5334b936164e;hb=a60c89e8c8348a348dcdd770a033f4976ea93206;hp=7a696256a6fcc790d52395e05b6ef45535dbae87;hpb=ceb39f4f8dc4863fde17d668c752533a2184476e;p=mesa.git diff --git a/src/mesa/swrast/s_zoom.c b/src/mesa/swrast/s_zoom.c index 7a696256a6f..b67a2970109 100644 --- a/src/mesa/swrast/s_zoom.c +++ b/src/mesa/swrast/s_zoom.c @@ -1,10 +1,9 @@ -/* $Id: s_zoom.c,v 1.12 2002/01/31 00:27:43 brianp Exp $ */ /* * Mesa 3-D graphics library - * Version: 4.1 + * Version: 5.1 * - * Copyright (C) 1999-2002 Brian Paul All Rights Reserved. + * 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"), @@ -26,7 +25,7 @@ #include "glheader.h" #include "macros.h" -#include "mem.h" +#include "imports.h" #include "colormac.h" #include "s_context.h" @@ -36,46 +35,68 @@ /* - * Helper function called from _mesa_write_zoomed_rgba/rgb/index_span(). + * Helper function called from _swrast_write_zoomed_rgba/rgb/index_span(). */ static void zoom_span( GLcontext *ctx, const struct sw_span *span, - const GLvoid *src, GLint y0, GLenum format ) + const GLvoid *src, GLint y0, GLenum format, GLint skipPixels ) { GLint r0, r1, row; GLint c0, c1, skipCol; GLint i, j; - const GLint maxWidth = MIN2( ctx->DrawBuffer->Width, MAX_WIDTH ); - GLchan rgbaSave[MAX_WIDTH][4]; - GLuint indexSave[MAX_WIDTH]; + const GLuint maxWidth = MIN2( ctx->DrawBuffer->Width, MAX_WIDTH ); struct sw_span zoomed; - const GLchan (*rgba)[4] = (const GLchan (*)[4]) src; - const GLchan (*rgb)[3] = (const GLchan (*)[3]) src; - const GLuint *indexes = (const GLuint *) src; + struct span_arrays zoomed_arrays; /* this is big! */ + + /* no pixel arrays! must be horizontal spans. */ + ASSERT((span->arrayMask & SPAN_XY) == 0); + ASSERT(span->primitive == GL_BITMAP); + + INIT_SPAN(zoomed, GL_BITMAP, 0, 0, 0); + zoomed.array = &zoomed_arrays; + + /* copy fog interp info */ + zoomed.fog = span->fog; + zoomed.fogStep = span->fogStep; + /* XXX copy texcoord info? */ - INIT_SPAN(zoomed); if (format == GL_RGBA || format == GL_RGB) { + /* copy Z info */ zoomed.z = span->z; - zoomed.zStep = span->z; - zoomed.fog = span->fog; - zoomed.fogStep = span->fogStep; + zoomed.zStep = span->zStep; + /* we'll generate an array of colorss */ zoomed.interpMask = span->interpMask & ~SPAN_RGBA; zoomed.arrayMask |= SPAN_RGBA; } else if (format == GL_COLOR_INDEX) { + /* copy Z info */ zoomed.z = span->z; - zoomed.zStep = span->z; - zoomed.fog = span->fog; - zoomed.fogStep = span->fogStep; + zoomed.zStep = span->zStep; + /* we'll generate an array of color indexes */ zoomed.interpMask = span->interpMask & ~SPAN_INDEX; zoomed.arrayMask |= SPAN_INDEX; } + else { + assert(format == GL_DEPTH_COMPONENT); + /* Copy color info */ + zoomed.red = span->red; + zoomed.green = span->green; + zoomed.blue = span->blue; + zoomed.alpha = span->alpha; + zoomed.redStep = span->redStep; + zoomed.greenStep = span->greenStep; + zoomed.blueStep = span->blueStep; + zoomed.alphaStep = span->alphaStep; + /* we'll generate an array of depth values */ + zoomed.interpMask = span->interpMask & ~SPAN_Z; + zoomed.arrayMask |= SPAN_Z; + } /* * Compute which columns to draw: [c0, c1) */ - c0 = (GLint) span->x; - c1 = (GLint) (span->x + span->end * ctx->Pixel.ZoomX); + c0 = (GLint) (span->x + skipPixels * ctx->Pixel.ZoomX); + c1 = (GLint) (span->x + (skipPixels + span->end) * ctx->Pixel.ZoomX); if (c0 == c1) { return; } @@ -124,103 +145,156 @@ zoom_span( GLcontext *ctx, const struct sw_span *span, */ if (r1 < 0) /* below window */ return; - if (r0 >= ctx->DrawBuffer->Height) /* above window */ + if (r0 >= (GLint) ctx->DrawBuffer->Height) /* above window */ return; if (c1 < 0) /* left of window */ return; - if (c0 >= ctx->DrawBuffer->Width) /* right of window */ + if (c0 >= (GLint) ctx->DrawBuffer->Width) /* right of window */ return; /* zoom the span horizontally */ if (format == GL_RGBA) { + const GLchan (*rgba)[4] = (const GLchan (*)[4]) src; if (ctx->Pixel.ZoomX == -1.0F) { /* common case */ - for (j = zoomed.start; j < zoomed.end; j++) { + for (j = (GLint) zoomed.start; j < (GLint) zoomed.end; j++) { i = span->end - (j + skipCol) - 1; - COPY_CHAN4(zoomed.color.rgba[j], rgba[i]); + COPY_CHAN4(zoomed.array->rgba[j], rgba[i]); } } else { /* general solution */ const GLfloat xscale = 1.0F / ctx->Pixel.ZoomX; - for (j = zoomed.start; j < zoomed.end; j++) { + for (j = (GLint) zoomed.start; j < (GLint) zoomed.end; j++) { i = (GLint) ((j + skipCol) * xscale); - if (i < 0) + if (ctx->Pixel.ZoomX < 0.0) { + ASSERT(i <= 0); i = span->end + i - 1; - COPY_CHAN4(zoomed.color.rgba[j], rgba[i]); + } + ASSERT(i >= 0); + ASSERT(i < (GLint) span->end); + COPY_CHAN4(zoomed.array->rgba[j], rgba[i]); } } } else if (format == GL_RGB) { + const GLchan (*rgb)[3] = (const GLchan (*)[3]) src; if (ctx->Pixel.ZoomX == -1.0F) { /* common case */ - for (j = zoomed.start; j < zoomed.end; j++) { + for (j = (GLint) zoomed.start; j < (GLint) zoomed.end; j++) { i = span->end - (j + skipCol) - 1; - zoomed.color.rgba[j][0] = rgb[i][0]; - zoomed.color.rgba[j][1] = rgb[i][1]; - zoomed.color.rgba[j][2] = rgb[i][2]; - zoomed.color.rgba[j][3] = CHAN_MAX; + zoomed.array->rgba[j][0] = rgb[i][0]; + zoomed.array->rgba[j][1] = rgb[i][1]; + zoomed.array->rgba[j][2] = rgb[i][2]; + zoomed.array->rgba[j][3] = CHAN_MAX; } } else { /* general solution */ const GLfloat xscale = 1.0F / ctx->Pixel.ZoomX; - for (j = zoomed.start; j < zoomed.end; j++) { + for (j = (GLint) zoomed.start; j < (GLint) zoomed.end; j++) { i = (GLint) ((j + skipCol) * xscale); - if (i < 0) + if (ctx->Pixel.ZoomX < 0.0) { + ASSERT(i <= 0); i = span->end + i - 1; - zoomed.color.rgba[j][0] = rgb[i][0]; - zoomed.color.rgba[j][1] = rgb[i][1]; - zoomed.color.rgba[j][2] = rgb[i][2]; - zoomed.color.rgba[j][3] = CHAN_MAX; + } + ASSERT(i >= 0); + ASSERT(i < (GLint) span->end); + zoomed.array->rgba[j][0] = rgb[i][0]; + zoomed.array->rgba[j][1] = rgb[i][1]; + zoomed.array->rgba[j][2] = rgb[i][2]; + zoomed.array->rgba[j][3] = CHAN_MAX; } } } else if (format == GL_COLOR_INDEX) { + const GLuint *indexes = (const GLuint *) src; + if (ctx->Pixel.ZoomX == -1.0F) { + /* common case */ + for (j = (GLint) zoomed.start; j < (GLint) zoomed.end; j++) { + i = span->end - (j + skipCol) - 1; + zoomed.array->index[j] = indexes[i]; + } + } + else { + /* general solution */ + const GLfloat xscale = 1.0F / ctx->Pixel.ZoomX; + for (j = (GLint) zoomed.start; j < (GLint) zoomed.end; j++) { + i = (GLint) ((j + skipCol) * xscale); + if (ctx->Pixel.ZoomX < 0.0) { + ASSERT(i <= 0); + i = span->end + i - 1; + } + ASSERT(i >= 0); + ASSERT(i < (GLint) span->end); + zoomed.array->index[j] = indexes[i]; + } + } + } + else { + const GLdepth *zValues = (const GLuint *) src; + assert(format == GL_DEPTH_COMPONENT); if (ctx->Pixel.ZoomX == -1.0F) { /* common case */ - for (j = zoomed.start; j < zoomed.end; j++) { + for (j = (GLint) zoomed.start; j < (GLint) zoomed.end; j++) { i = span->end - (j + skipCol) - 1; - zoomed.color.index[j] = indexes[i]; + zoomed.array->z[j] = zValues[i]; } } else { /* general solution */ const GLfloat xscale = 1.0F / ctx->Pixel.ZoomX; - for (j = zoomed.start; j < zoomed.end; j++) { + for (j = (GLint) zoomed.start; j < (GLint) zoomed.end; j++) { i = (GLint) ((j + skipCol) * xscale); - if (i < 0) + if (ctx->Pixel.ZoomX < 0.0) { + ASSERT(i <= 0); i = span->end + i - 1; - zoomed.color.index[j] = indexes[i]; + } + ASSERT(i >= 0); + ASSERT(i < (GLint) span->end); + zoomed.array->z[j] = zValues[i]; } } + /* Now, fall into either the RGB or COLOR_INDEX path below */ + if (ctx->Visual.rgbMode) + format = GL_RGBA; + else + format = GL_COLOR_INDEX; } + /* write the span in rows [r0, r1) */ if (format == GL_RGBA || format == GL_RGB) { /* Writing the span may modify the colors, so make a backup now if we're - * going to call _mesa_write_zoomed_span() more than once. + * going to call _swrast_write_zoomed_span() more than once. + * Also, clipping may change the span end value, so store it as well. */ + GLchan rgbaSave[MAX_WIDTH][4]; + const GLint end = zoomed.end; /* save */ if (r1 - r0 > 1) { - MEMCPY(rgbaSave, zoomed.color.rgba, zoomed.end * 4 * sizeof(GLchan)); + MEMCPY(rgbaSave, zoomed.array->rgba, zoomed.end * 4 * sizeof(GLchan)); } for (zoomed.y = r0; zoomed.y < r1; zoomed.y++) { - _mesa_write_rgba_span(ctx, &zoomed, GL_BITMAP); + _swrast_write_rgba_span(ctx, &zoomed); + zoomed.end = end; /* restore */ if (r1 - r0 > 1) { /* restore the colors */ - MEMCPY(zoomed.color.rgba, rgbaSave, zoomed.end*4 * sizeof(GLchan)); + MEMCPY(zoomed.array->rgba, rgbaSave, zoomed.end*4 * sizeof(GLchan)); } } } else if (format == GL_COLOR_INDEX) { + GLuint indexSave[MAX_WIDTH]; + const GLint end = zoomed.end; /* save */ if (r1 - r0 > 1) { - MEMCPY(indexSave, zoomed.color.index, zoomed.end * sizeof(GLuint)); + MEMCPY(indexSave, zoomed.array->index, zoomed.end * sizeof(GLuint)); } for (zoomed.y = r0; zoomed.y < r1; zoomed.y++) { - _mesa_write_index_span(ctx, &zoomed, GL_BITMAP); + _swrast_write_index_span(ctx, &zoomed); + zoomed.end = end; /* restore */ if (r1 - r0 > 1) { /* restore the colors */ - MEMCPY(zoomed.color.index, indexSave, zoomed.end * sizeof(GLuint)); + MEMCPY(zoomed.array->index, indexSave, zoomed.end * sizeof(GLuint)); } } } @@ -228,26 +302,38 @@ zoom_span( GLcontext *ctx, const struct sw_span *span, void -_mesa_write_zoomed_rgba_span( GLcontext *ctx, const struct sw_span *span, - CONST GLchan rgba[][4], GLint y0 ) +_swrast_write_zoomed_rgba_span( GLcontext *ctx, const struct sw_span *span, + CONST GLchan rgba[][4], GLint y0, + GLint skipPixels ) { - zoom_span(ctx, span, (const GLvoid *) rgba, y0, GL_RGBA); + zoom_span(ctx, span, (const GLvoid *) rgba, y0, GL_RGBA, skipPixels); } void -_mesa_write_zoomed_rgb_span( GLcontext *ctx, const struct sw_span *span, - CONST GLchan rgb[][3], GLint y0 ) +_swrast_write_zoomed_rgb_span( GLcontext *ctx, const struct sw_span *span, + CONST GLchan rgb[][3], GLint y0, + GLint skipPixels ) { - zoom_span(ctx, span, (const GLvoid *) rgb, y0, GL_RGB); + zoom_span(ctx, span, (const GLvoid *) rgb, y0, GL_RGB, skipPixels); } void -_mesa_write_zoomed_index_span( GLcontext *ctx, const struct sw_span *span, - GLint y0 ) +_swrast_write_zoomed_index_span( GLcontext *ctx, const struct sw_span *span, + GLint y0, GLint skipPixels ) { - zoom_span(ctx, span, (const GLvoid *) span->color.index, y0, GL_COLOR_INDEX); + zoom_span(ctx, span, (const GLvoid *) span->array->index, y0, + GL_COLOR_INDEX, skipPixels); +} + + +void +_swrast_write_zoomed_depth_span( GLcontext *ctx, const struct sw_span *span, + GLint y0, GLint skipPixels ) +{ + zoom_span(ctx, span, (const GLvoid *) span->array->z, y0, + GL_DEPTH_COMPONENT, skipPixels); } @@ -255,9 +341,10 @@ _mesa_write_zoomed_index_span( GLcontext *ctx, const struct sw_span *span, * As above, but write stencil values. */ void -_mesa_write_zoomed_stencil_span( GLcontext *ctx, +_swrast_write_zoomed_stencil_span( GLcontext *ctx, GLuint n, GLint x, GLint y, - const GLstencil stencil[], GLint y0 ) + const GLstencil stencil[], GLint y0, + GLint skipPixels ) { GLint m; GLint r0, r1, row, r; @@ -265,8 +352,10 @@ _mesa_write_zoomed_stencil_span( GLcontext *ctx, GLstencil zstencil[MAX_WIDTH]; /* zoomed stencil values */ GLint maxwidth = MIN2( ctx->DrawBuffer->Width, MAX_WIDTH ); + (void) skipPixels; /* XXX this shouldn't be ignored */ + /* compute width of output row */ - m = (GLint) ABSF( n * ctx->Pixel.ZoomX ); + m = (GLint) FABSF( n * ctx->Pixel.ZoomX ); if (m==0) { return; } @@ -276,7 +365,7 @@ _mesa_write_zoomed_stencil_span( GLcontext *ctx, } /* compute which rows to draw */ - row = y-y0; + row = y - y0; r0 = y0 + (GLint) (row * ctx->Pixel.ZoomY); r1 = y0 + (GLint) ((row+1) * ctx->Pixel.ZoomY); if (r0==r1) { @@ -293,7 +382,8 @@ _mesa_write_zoomed_stencil_span( GLcontext *ctx, /* below window */ return; } - if (r0>=ctx->DrawBuffer->Height && r1>=ctx->DrawBuffer->Height) { + if (r0 >= (GLint) ctx->DrawBuffer->Height && + r1 >= (GLint) ctx->DrawBuffer->Height) { /* above window */ return; } @@ -333,6 +423,6 @@ _mesa_write_zoomed_stencil_span( GLcontext *ctx, /* write the span */ for (r=r0; r