diff options
| author | Keith Whitwell <[email protected]> | 2001-01-29 20:47:39 +0000 |
|---|---|---|
| committer | Keith Whitwell <[email protected]> | 2001-01-29 20:47:39 +0000 |
| commit | 5c1e7fa6ee72f4403d9ec9d12830dd689b966e71 (patch) | |
| tree | 8cb11c26af178632b05de9c5b2f53c32331475c5 /src/mesa/main/drawpix.c | |
| parent | 4b90e68ac6d0fe4ffca5e2cd51794bb4350cac28 (diff) | |
Removed knowledge of swrast Clear/Bitmap/Accum/Draw/Read/CopyPixels
functions from core mesa -- if drivers need these fallbacks they
must now call them themselves.
Introduced hooks for clip-vertex-interpolation and the rendering
of clipped lines and polygons. Allows drivers to interpolate
their hardware-format vertices directly. Used in dri drivers to
replace fastpath code.
Slight optimizations to pipeline build/run routines.
Diffstat (limited to 'src/mesa/main/drawpix.c')
| -rw-r--r-- | src/mesa/main/drawpix.c | 14 |
1 files changed, 3 insertions, 11 deletions
diff --git a/src/mesa/main/drawpix.c b/src/mesa/main/drawpix.c index 661a41bc2cf..618c41a5b47 100644 --- a/src/mesa/main/drawpix.c +++ b/src/mesa/main/drawpix.c @@ -1,4 +1,4 @@ -/* $Id: drawpix.c,v 1.47 2000/12/26 05:09:28 keithw Exp $ */ +/* $Id: drawpix.c,v 1.48 2001/01/29 20:47:39 keithw Exp $ */ /* * Mesa 3-D graphics library @@ -38,7 +38,6 @@ #include "mmath.h" #include "state.h" #include "mtypes.h" -#include "swrast/swrast.h" #endif @@ -72,15 +71,8 @@ _mesa_DrawPixels( GLsizei width, GLsizei height, /* see if device driver can do the drawpix */ RENDER_START(ctx); - - if (ctx->Driver.DrawPixels - && (*ctx->Driver.DrawPixels)(ctx, x, y, width, height, format, type, - &ctx->Unpack, pixels)) { - /* finished */ - } else - _swrast_DrawPixels( ctx, x, y, width, height, format, type, - &ctx->Unpack, pixels ); - + ctx->Driver.DrawPixels(ctx, x, y, width, height, format, type, + &ctx->Unpack, pixels); RENDER_FINISH(ctx); } else if (ctx->RenderMode==GL_FEEDBACK) { |