aboutsummaryrefslogtreecommitdiffstats
path: root/src/mesa/swrast/s_copypix.c
diff options
context:
space:
mode:
authorBrian Paul <[email protected]>2001-01-05 21:28:31 +0000
committerBrian Paul <[email protected]>2001-01-05 21:28:31 +0000
commit8cbc573eae500aff6d121b2eef93fb00822622f1 (patch)
treeb37f54734b0e44221cbdd70fa3aa3d0c9c8a39d3 /src/mesa/swrast/s_copypix.c
parent2d7e25c9ffea6f8fb64d54c57bcd0ade5559bb35 (diff)
Fixed bug in MinMagThresh computation.
Renamed gl_texture_pixels() to _swrast_texture_fragments()
Diffstat (limited to 'src/mesa/swrast/s_copypix.c')
-rw-r--r--src/mesa/swrast/s_copypix.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/src/mesa/swrast/s_copypix.c b/src/mesa/swrast/s_copypix.c
index cf87b96bc08..401b448a630 100644
--- a/src/mesa/swrast/s_copypix.c
+++ b/src/mesa/swrast/s_copypix.c
@@ -1,4 +1,4 @@
-/* $Id: s_copypix.c,v 1.8 2000/12/26 05:09:32 keithw Exp $ */
+/* $Id: s_copypix.c,v 1.9 2001/01/05 21:28:31 brianp Exp $ */
/*
* Mesa 3-D graphics library
@@ -247,8 +247,8 @@ copy_conv_rgba_pixels(GLcontext *ctx, GLint srcx, GLint srcy,
for (unit = 0; unit < ctx->Const.MaxTextureUnits; unit++) {
_mesa_pixeltexgen(ctx, width, (const GLchan (*)[4]) rgba,
s, t, r, q);
- gl_texture_pixels(ctx, unit, width, s, t, r, NULL,
- primary_rgba, rgba);
+ _swrast_texture_fragments(ctx, unit, width, s, t, r, NULL,
+ primary_rgba, rgba);
}
}
@@ -493,8 +493,8 @@ copy_rgba_pixels(GLcontext *ctx, GLint srcx, GLint srcy,
for (unit = 0; unit < ctx->Const.MaxTextureUnits; unit++) {
_mesa_pixeltexgen(ctx, width, (const GLchan (*)[4]) rgba,
s, t, r, q);
- gl_texture_pixels(ctx, unit, width, s, t, r, NULL,
- primary_rgba, rgba);
+ _swrast_texture_fragments(ctx, unit, width, s, t, r, NULL,
+ primary_rgba, rgba);
}
}