From 1add059bd114f90e32c4b574be411d314eca6d90 Mon Sep 17 00:00:00 2001 From: Brian Paul Date: Wed, 14 Dec 2005 03:04:58 +0000 Subject: Removed the GL_SGIX/SGIS_pixel_texture extensions. Same thing can be done with fragment programs nowadays. --- src/mesa/swrast/descrip.mms | 5 +- src/mesa/swrast/s_copypix.c | 12 ----- src/mesa/swrast/s_drawpix.c | 5 -- src/mesa/swrast/s_pixeltex.c | 110 ------------------------------------------- src/mesa/swrast/s_pixeltex.h | 38 --------------- 5 files changed, 2 insertions(+), 168 deletions(-) delete mode 100644 src/mesa/swrast/s_pixeltex.c delete mode 100644 src/mesa/swrast/s_pixeltex.h (limited to 'src/mesa/swrast') diff --git a/src/mesa/swrast/descrip.mms b/src/mesa/swrast/descrip.mms index 9c45bff8f6..25b6c90ccb 100644 --- a/src/mesa/swrast/descrip.mms +++ b/src/mesa/swrast/descrip.mms @@ -21,7 +21,7 @@ CFLAGS = /include=($(INCDIR),[])/define=(PTHREADS=1)/name=(as_is,short)/float=ie SOURCES = s_aaline.c s_aatriangle.c s_accum.c s_alpha.c \ s_bitmap.c s_blend.c s_buffers.c s_context.c s_copypix.c s_depth.c \ s_drawpix.c s_feedback.c s_fog.c s_imaging.c s_lines.c s_logic.c \ - s_masking.c s_nvfragprog.c s_pixeltex.c s_points.c s_readpix.c \ + s_masking.c s_nvfragprog.c s_points.c s_readpix.c \ s_span.c s_stencil.c s_texstore.c s_texcombine.c s_texfilter.c \ s_triangle.c s_zoom.c s_atifragshader.c @@ -30,7 +30,7 @@ OBJECTS = s_aaline.obj,s_aatriangle.obj,s_accum.obj,s_alpha.obj,\ s_buffers.obj,s_context.obj,s_atifragshader.obj,\ s_copypix.obj,s_depth.obj,s_drawpix.obj,s_feedback.obj,s_fog.obj,\ s_imaging.obj,s_lines.obj,s_logic.obj,s_masking.obj,s_nvfragprog.obj,\ - s_pixeltex.obj,s_points.obj,s_readpix.obj,s_span.obj,s_stencil.obj,\ + s_points.obj,s_readpix.obj,s_span.obj,s_stencil.obj,\ s_texstore.obj,s_texcombine.obj,s_texfilter.obj,s_triangle.obj,s_zoom.obj ##### RULES ##### @@ -65,7 +65,6 @@ s_lines.obj : s_lines.c s_logic.obj : s_logic.c s_masking.obj : s_masking.c s_nvfragprog.obj : s_nvfragprog.c -s_pixeltex.obj : s_pixeltex.c s_points.obj : s_points.c s_readpix.obj : s_readpix.c s_span.obj : s_span.c diff --git a/src/mesa/swrast/s_copypix.c b/src/mesa/swrast/s_copypix.c index 1718145e9a..842b8d20c3 100644 --- a/src/mesa/swrast/s_copypix.c +++ b/src/mesa/swrast/s_copypix.c @@ -35,7 +35,6 @@ #include "s_context.h" #include "s_depth.h" -#include "s_pixeltex.h" #include "s_span.h" #include "s_stencil.h" #include "s_zoom.h" @@ -216,13 +215,7 @@ copy_conv_rgba_pixels(GLcontext *ctx, GLint srcx, GLint srcy, /* convert floats back to chan */ float_span_to_chan(width, (const GLfloat (*)[4]) src, span.array->rgba); - if (ctx->Pixel.PixelTextureEnabled && ctx->Texture._EnabledUnits) { - span.end = width; - _swrast_pixel_texture(ctx, &span); - } - /* write row to framebuffer */ - dy = desty + row; if (quick_draw && dy >= 0 && dy < (GLint) ctx->DrawBuffer->Height) { drawRb->PutRow(ctx, drawRb, width, destx, dy, span.array->rgba, NULL); @@ -359,11 +352,6 @@ copy_rgba_pixels(GLcontext *ctx, GLint srcx, GLint srcy, span.array->rgba); } - if (ctx->Pixel.PixelTextureEnabled && ctx->Texture._EnabledUnits) { - span.end = width; - _swrast_pixel_texture(ctx, &span); - } - /* Write color span */ if (quick_draw && dy >= 0 && dy < (GLint) ctx->DrawBuffer->Height) { drawRb->PutRow(ctx, drawRb, width, destx, dy, span.array->rgba, NULL); diff --git a/src/mesa/swrast/s_drawpix.c b/src/mesa/swrast/s_drawpix.c index 6af8023348..c550b88e7d 100644 --- a/src/mesa/swrast/s_drawpix.c +++ b/src/mesa/swrast/s_drawpix.c @@ -34,7 +34,6 @@ #include "s_context.h" #include "s_drawpix.h" -#include "s_pixeltex.h" #include "s_span.h" #include "s_stencil.h" #include "s_zoom.h" @@ -795,10 +794,6 @@ draw_rgba_pixels( GLcontext *ctx, GLint x, GLint y, (ctx->Pixel.HistogramEnabled && ctx->Histogram.Sink)) continue; - if (ctx->Pixel.PixelTextureEnabled && ctx->Texture._EnabledUnits) { - _swrast_pixel_texture(ctx, &span); - } - /* draw the span */ if (quickDraw) { rb->PutRow(ctx, rb, span.end, span.x, span.y, diff --git a/src/mesa/swrast/s_pixeltex.c b/src/mesa/swrast/s_pixeltex.c deleted file mode 100644 index b4c919bf56..0000000000 --- a/src/mesa/swrast/s_pixeltex.c +++ /dev/null @@ -1,110 +0,0 @@ -/* - * Mesa 3-D graphics library - * Version: 6.3 - * - * Copyright (C) 1999-2004 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. - */ - - -/* - * This file implements both the GL_SGIX_pixel_texture and - * GL_SIGS_pixel_texture extensions. Luckily, they pretty much - * overlap in functionality so we use the same state variables - * and execution code for both. - */ - - -#include "glheader.h" -#include "colormac.h" -#include "imports.h" - -#include "s_context.h" -#include "s_pixeltex.h" - - -/* - * Convert RGBA values into strq texture coordinates. - */ -static void -pixeltexgen(GLcontext *ctx, GLuint n, const GLchan rgba[][4], - GLfloat texcoord[][4]) -{ - if (ctx->Pixel.FragmentRgbSource == GL_CURRENT_RASTER_COLOR) { - GLuint i; - for (i = 0; i < n; i++) { - texcoord[i][0] = ctx->Current.RasterColor[RCOMP]; - texcoord[i][1] = ctx->Current.RasterColor[GCOMP]; - texcoord[i][2] = ctx->Current.RasterColor[BCOMP]; - } - } - else { - GLuint i; - ASSERT(ctx->Pixel.FragmentRgbSource == GL_PIXEL_GROUP_COLOR_SGIS); - for (i = 0; i < n; i++) { - texcoord[i][0] = CHAN_TO_FLOAT(rgba[i][RCOMP]); - texcoord[i][1] = CHAN_TO_FLOAT(rgba[i][GCOMP]); - texcoord[i][2] = CHAN_TO_FLOAT(rgba[i][BCOMP]); - } - } - - if (ctx->Pixel.FragmentAlphaSource == GL_CURRENT_RASTER_COLOR) { - GLuint i; - for (i = 0; i < n; i++) { - texcoord[i][3] = ctx->Current.RasterColor[ACOMP]; - } - } - else { - GLuint i; - ASSERT(ctx->Pixel.FragmentAlphaSource == GL_PIXEL_GROUP_COLOR_SGIS); - for (i = 0; i < n; i++) { - texcoord[i][3] = CHAN_TO_FLOAT(rgba[i][ACOMP]); - } - } -} - - - -/* - * Used by glDraw/CopyPixels: the incoming image colors are treated - * as texture coordinates. Use those coords to texture the image. - * This is for GL_SGIS_pixel_texture / GL_SGIX_pixel_texture. - */ -void -_swrast_pixel_texture(GLcontext *ctx, struct sw_span *span) -{ - GLuint unit; - - ASSERT(!(span->arrayMask & SPAN_TEXTURE)); - span->arrayMask |= SPAN_TEXTURE; - span->interpMask &= ~SPAN_TEXTURE; - - /* convert colors into texture coordinates */ - pixeltexgen( ctx, span->end, - (const GLchan (*)[4]) span->array->rgba, - span->array->texcoords[0] ); - - /* copy the new texture units for all enabled units */ - for (unit = 1; unit < ctx->Const.MaxTextureUnits; unit++) { - if (ctx->Texture.Unit[unit]._ReallyEnabled) { - MEMCPY( span->array->texcoords[unit], span->array->texcoords[0], - span->end * 4 * sizeof(GLfloat) ); - } - } -} diff --git a/src/mesa/swrast/s_pixeltex.h b/src/mesa/swrast/s_pixeltex.h deleted file mode 100644 index 6ef7a44df1..0000000000 --- a/src/mesa/swrast/s_pixeltex.h +++ /dev/null @@ -1,38 +0,0 @@ - -/* - * Mesa 3-D graphics library - * Version: 4.1 - * - * Copyright (C) 1999-2002 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. - */ - - -#ifndef S_PIXELTEX_H -#define S_PIXELTEX_H - -#include "mtypes.h" -#include "swrast.h" - - -extern void -_swrast_pixel_texture(GLcontext *ctx, struct sw_span *span); - - -#endif -- cgit v1.2.3