-/* $Id: s_bitmap.c,v 1.18 2002/04/19 14:05:50 brianp Exp $ */
-
/*
* Mesa 3-D graphics library
- * Version: 4.1
+ * Version: 6.5.2
*
- * Copyright (C) 1999-2002 Brian Paul All Rights Reserved.
+ * Copyright (C) 1999-2006 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"),
*/
#include "glheader.h"
+#include "bufferobj.h"
#include "image.h"
#include "macros.h"
-#include "mmath.h"
#include "pixel.h"
#include "s_context.h"
-/*
+/**
* Render a bitmap.
+ * Called via ctx->Driver.Bitmap()
+ * All parameter error checking will have been done before this is called.
*/
void
_swrast_Bitmap( GLcontext *ctx, GLint px, GLint py,
SWcontext *swrast = SWRAST_CONTEXT(ctx);
GLint row, col;
GLuint count = 0;
- struct sw_span *span = swrast->span;
+ SWspan span;
ASSERT(ctx->RenderMode == GL_RENDER);
- ASSERT(bitmap);
+
+ if (unpack->BufferObj->Name) {
+ /* unpack from PBO */
+ GLubyte *buf;
+ if (!_mesa_validate_pbo_access(2, unpack, width, height, 1,
+ GL_COLOR_INDEX, GL_BITMAP,
+ (GLvoid *) bitmap)) {
+ _mesa_error(ctx, GL_INVALID_OPERATION,"glBitmap(invalid PBO access)");
+ return;
+ }
+ buf = (GLubyte *) ctx->Driver.MapBuffer(ctx, GL_PIXEL_UNPACK_BUFFER_EXT,
+ GL_READ_ONLY_ARB,
+ unpack->BufferObj);
+ if (!buf) {
+ /* buffer is already mapped - that's an error */
+ _mesa_error(ctx, GL_INVALID_OPERATION, "glBitmap(PBO is mapped)");
+ return;
+ }
+ bitmap = ADD_POINTERS(buf, bitmap);
+ }
RENDER_START(swrast,ctx);
INIT_SPAN(span, GL_BITMAP, width, 0, SPAN_XY);
- if (ctx->Visual.rgbMode) {
- span->interpMask |= SPAN_RGBA;
- span->red = FloatToFixed(ctx->Current.RasterColor[0] * CHAN_MAXF);
- span->green = FloatToFixed(ctx->Current.RasterColor[1] * CHAN_MAXF);
- span->blue = FloatToFixed(ctx->Current.RasterColor[2] * CHAN_MAXF);
- span->alpha = FloatToFixed(ctx->Current.RasterColor[3] * CHAN_MAXF);
- span->redStep = span->greenStep = span->blueStep = span->alphaStep = 0;
- }
- else {
- span->interpMask |= SPAN_INDEX;
- span->index = ChanToFixed(ctx->Current.RasterIndex);
- span->indexStep = 0;
- }
-
+ _swrast_span_default_color(ctx, &span);
+ _swrast_span_default_secondary_color(ctx, &span);
if (ctx->Depth.Test)
- _mesa_span_default_z(ctx, span);
- if (ctx->Fog.Enabled)
- _mesa_span_default_fog(ctx, span);
+ _swrast_span_default_z(ctx, &span);
+ if (swrast->_FogEnabled)
+ _swrast_span_default_fog(ctx, &span);
+ if (ctx->Texture._EnabledCoordUnits)
+ _swrast_span_default_texcoords(ctx, &span);
- for (row = 0; row < height; row++, span->y++) {
- const GLubyte *src = (const GLubyte *) _mesa_image_address( unpack,
- bitmap, width, height, GL_COLOR_INDEX, GL_BITMAP, 0, row, 0 );
+ for (row = 0; row < height; row++) {
+ const GLubyte *src = (const GLubyte *) _mesa_image_address2d(unpack,
+ bitmap, width, height, GL_COLOR_INDEX, GL_BITMAP, row, 0);
if (unpack->LsbFirst) {
/* Lsb first */
GLubyte mask = 1U << (unpack->SkipPixels & 0x7);
for (col = 0; col < width; col++) {
if (*src & mask) {
- span->xArray[count] = px + col;
- span->yArray[count] = py + row;
+ span.array->x[count] = px + col;
+ span.array->y[count] = py + row;
count++;
}
if (mask == 128U) {
GLubyte mask = 128U >> (unpack->SkipPixels & 0x7);
for (col = 0; col < width; col++) {
if (*src & mask) {
- span->xArray[count] = px + col;
- span->yArray[count] = py + row;
+ span.array->x[count] = px + col;
+ span.array->y[count] = py + row;
count++;
}
if (mask == 1U) {
if (count + width >= MAX_WIDTH || row + 1 == height) {
/* flush the span */
- span->end = count;
+ span.end = count;
if (ctx->Visual.rgbMode)
- _mesa_write_rgba_span(ctx, span);
+ _swrast_write_rgba_span(ctx, &span);
else
- _mesa_write_index_span(ctx, span);
- span->end = 0;
+ _swrast_write_index_span(ctx, &span);
+ span.end = 0;
count = 0;
}
}
RENDER_FINISH(swrast,ctx);
+
+ if (unpack->BufferObj->Name) {
+ /* done with PBO so unmap it now */
+ ctx->Driver.UnmapBuffer(ctx, GL_PIXEL_UNPACK_BUFFER_EXT,
+ unpack->BufferObj);
+ }
}
#if 0
/*
* XXX this is another way to implement Bitmap. Use horizontal runs of
- * fragments, initializing the mask array to indicate which fragmens to
+ * fragments, initializing the mask array to indicate which fragments to
* draw or skip.
*/
-
void
_swrast_Bitmap( GLcontext *ctx, GLint px, GLint py,
GLsizei width, GLsizei height,
{
SWcontext *swrast = SWRAST_CONTEXT(ctx);
GLint row, col;
- struct sw_span *span = swrast->span;
+ SWspan span;
ASSERT(ctx->RenderMode == GL_RENDER);
ASSERT(bitmap);
_swrast_validate_derived( ctx );
INIT_SPAN(span, GL_BITMAP, width, 0, SPAN_MASK);
- /*span->arrayMask |= SPAN_MASK;*/ /* we'll init span->mask[] */
- span->x = px;
- span->y = py;
- /*span->end = width;*/
- if (ctx->Visual.rgbMode) {
- span->interpMask |= SPAN_RGBA;
- span->red = FloatToFixed(ctx->Current.RasterColor[0] * CHAN_MAXF);
- span->green = FloatToFixed(ctx->Current.RasterColor[1] * CHAN_MAXF);
- span->blue = FloatToFixed(ctx->Current.RasterColor[2] * CHAN_MAXF);
- span->alpha = FloatToFixed(ctx->Current.RasterColor[3] * CHAN_MAXF);
- span->redStep = span->greenStep = span->blueStep = span->alphaStep = 0;
- }
- else {
- span->interpMask |= SPAN_INDEX;
- span->index = ChanToFixed(ctx->Current.RasterIndex);
- span->indexStep = 0;
- }
+ /*span.arrayMask |= SPAN_MASK;*/ /* we'll init span.mask[] */
+ span.x = px;
+ span.y = py;
+ /*span.end = width;*/
+
+ _swrast_span_default_color(ctx, &span);
if (ctx->Depth.Test)
- _mesa_span_default_z(ctx, span);
- if (ctx->Fog.Enabled)
- _mesa_span_default_fog(ctx, span);
+ _swrast_span_default_z(ctx, &span);
+ if (swrast->_FogEnabled)
+ _swrast_span_default_fog(ctx, &span);
+ if (ctx->Texture._EnabledCoordUnits)
+ _swrast_span_default_texcoords(ctx, &span);
- for (row=0; row<height; row++, span->y++) {
- const GLubyte *src = (const GLubyte *) _mesa_image_address( unpack,
- bitmap, width, height, GL_COLOR_INDEX, GL_BITMAP, 0, row, 0 );
+ for (row=0; row<height; row++, span.y++) {
+ const GLubyte *src = (const GLubyte *) _mesa_image_address2d(unpack,
+ bitmap, width, height, GL_COLOR_INDEX, GL_BITMAP, row, 0);
if (unpack->LsbFirst) {
/* Lsb first */
GLubyte mask = 1U << (unpack->SkipPixels & 0x7);
for (col=0; col<width; col++) {
- span->mask[col] = (*src & mask) ? GL_TRUE : GL_FALSE;
+ span.array->mask[col] = (*src & mask) ? GL_TRUE : GL_FALSE;
if (mask == 128U) {
src++;
mask = 1U;
}
if (ctx->Visual.rgbMode)
- _mesa_write_rgba_span(ctx, span);
+ _swrast_write_rgba_span(ctx, &span);
else
- _mesa_write_index_span(ctx, span);
+ _swrast_write_index_span(ctx, &span);
/* get ready for next row */
if (mask != 1)
/* Msb first */
GLubyte mask = 128U >> (unpack->SkipPixels & 0x7);
for (col=0; col<width; col++) {
- span->mask[col] = (*src & mask) ? GL_TRUE : GL_FALSE;
+ span.array->mask[col] = (*src & mask) ? GL_TRUE : GL_FALSE;
if (mask == 1U) {
src++;
mask = 128U;
}
if (ctx->Visual.rgbMode)
- _mesa_write_rgba_span(ctx, span);
+ _swrast_write_rgba_span(ctx, &span);
else
- _mesa_write_index_span(ctx, span);
+ _swrast_write_index_span(ctx, &span);
/* get ready for next row */
if (mask != 128)
projects / mesa.git / blobdiff