diff options
author | Brian Paul <brian.paul@tungstengraphics.com> | 2005-12-14 03:04:58 +0000 |
---|---|---|
committer | Brian Paul <brian.paul@tungstengraphics.com> | 2005-12-14 03:04:58 +0000 |
commit | 1add059bd114f90e32c4b574be411d314eca6d90 (patch) | |
tree | 221908fd60a1aad54ba5ec27097e83cadbc3ad95 /src/mesa/swrast/s_copypix.c | |
parent | c9797f6b76a5d34a4bdbab49ef8158ca861e0c01 (diff) |
Removed the GL_SGIX/SGIS_pixel_texture extensions. Same thing can be
done with fragment programs nowadays.
Diffstat (limited to 'src/mesa/swrast/s_copypix.c')
-rw-r--r-- | src/mesa/swrast/s_copypix.c | 12 |
1 files changed, 0 insertions, 12 deletions
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); |