diff options
| author | Brian Paul <[email protected]> | 2000-10-17 00:42:02 +0000 |
|---|---|---|
| committer | Brian Paul <[email protected]> | 2000-10-17 00:42:02 +0000 |
| commit | d3672166787028857ea51ad9570cab7e173898c3 (patch) | |
| tree | 21e8d5af6eb630109fda7043b30d41d939640183 /src/mesa/main/drawpix.c | |
| parent | 1873b567b28a3e3f4d94d0eacb27ffd235ec9529 (diff) | |
ported render begin/end calls from Mesa 3.4
Diffstat (limited to 'src/mesa/main/drawpix.c')
| -rw-r--r-- | src/mesa/main/drawpix.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/mesa/main/drawpix.c b/src/mesa/main/drawpix.c index 5370559b8da..091d0ff1113 100644 --- a/src/mesa/main/drawpix.c +++ b/src/mesa/main/drawpix.c @@ -1,4 +1,4 @@ -/* $Id: drawpix.c,v 1.37 2000/10/05 16:22:23 brianp Exp $ */ +/* $Id: drawpix.c,v 1.38 2000/10/17 00:42:02 brianp Exp $ */ /* * Mesa 3-D graphics library @@ -410,8 +410,7 @@ fast_draw_pixels(GLcontext *ctx, GLint x, GLint y, } else if (format==GL_COLOR_INDEX && type==GL_UNSIGNED_BYTE) { GLubyte *src = (GLubyte *) pixels + skipRows * rowLength + skipPixels; - if (ctx->Visual.RGBAflag - && ctx->ImageTransferState==IMAGE_MAP_COLOR_BIT) { + if (ctx->Visual.RGBAflag) { /* convert CI data to RGBA */ if (ctx->Pixel.ZoomX==1.0F && ctx->Pixel.ZoomY==1.0F) { /* no zooming */ @@ -879,6 +878,7 @@ _mesa_DrawPixels( GLsizei width, GLsizei height, return; } + RENDER_START(ctx); switch (format) { case GL_STENCIL_INDEX: draw_stencil_pixels( ctx, x, y, width, height, type, pixels ); @@ -907,8 +907,8 @@ _mesa_DrawPixels( GLsizei width, GLsizei height, break; default: gl_error( ctx, GL_INVALID_ENUM, "glDrawPixels(format)" ); - return; } + RENDER_FINISH(ctx); } else if (ctx->RenderMode==GL_FEEDBACK) { if (ctx->Current.RasterPosValid) { |