-/* $Id: s_drawpix.c,v 1.43 2003/01/15 23:46:34 brianp Exp $ */
-
/*
* Mesa 3-D graphics library
- * Version: 5.1
+ * Version: 6.2
*
- * Copyright (C) 1999-2003 Brian Paul All Rights Reserved.
+ * Copyright (C) 1999-2004 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 "image.h"
#include "macros.h"
#include "imports.h"
-#include "mmath.h"
#include "pixel.h"
#include "s_context.h"
* GL_FALSE if image was completely clipped away (draw nothing)
*/
GLboolean
-_mesa_clip_pixelrect(const GLcontext *ctx,
+_swrast_clip_pixelrect(const GLcontext *ctx,
GLint *destX, GLint *destY,
GLsizei *width, GLsizei *height,
GLint *skipPixels, GLint *skipRows)
static GLboolean
fast_draw_pixels(GLcontext *ctx, GLint x, GLint y,
GLsizei width, GLsizei height,
- GLenum format, GLenum type, const GLvoid *pixels)
+ GLenum format, GLenum type,
+ const struct gl_pixelstore_attrib *unpack,
+ const GLvoid *pixels)
{
SWcontext *swrast = SWRAST_CONTEXT(ctx);
- const struct gl_pixelstore_attrib *unpack = &ctx->Unpack;
struct sw_span span;
INIT_SPAN(span, GL_BITMAP, 0, 0, SPAN_RGBA);
}
if (ctx->Depth.Test)
- _mesa_span_default_z(ctx, &span);
+ _swrast_span_default_z(ctx, &span);
if (ctx->Fog.Enabled)
- _mesa_span_default_fog(ctx, &span);
- if (ctx->Texture._EnabledUnits)
- _mesa_span_default_texcoords(ctx, &span);
+ _swrast_span_default_fog(ctx, &span);
+ if (ctx->Texture._EnabledCoordUnits)
+ _swrast_span_default_texcoords(ctx, &span);
if ((SWRAST_CONTEXT(ctx)->_RasterMask & ~CLIP_BIT) == 0
- && ctx->Texture._EnabledUnits == 0
+ && ctx->Texture._EnabledCoordUnits == 0
&& unpack->Alignment == 1
&& !unpack->SwapBytes
&& !unpack->LsbFirst) {
GLint skipPixels = unpack->SkipPixels;
GLint skipRows = unpack->SkipRows;
GLint rowLength;
- GLdepth zSpan[MAX_WIDTH]; /* only used when zooming */
GLint zoomY0 = 0;
if (unpack->RowLength > 0)
rowLength = width;
/* If we're not using pixel zoom then do all clipping calculations
- * now. Otherwise, we'll let the _mesa_write_zoomed_*_span() functions
+ * now. Otherwise, we'll let the _swrast_write_zoomed_*_span() functions
* handle the clipping.
*/
if (ctx->Pixel.ZoomX==1.0F && ctx->Pixel.ZoomY==1.0F) {
return GL_TRUE;
}
else {
- /* setup array of fragment Z value to pass to zoom function */
- GLdepth z = (GLdepth) (ctx->Current.RasterPos[2] * ctx->DepthMaxF);
- GLint i;
if (drawWidth > MAX_WIDTH)
return GL_FALSE; /* fall back to general case path */
- for (i=0; i<drawWidth; i++)
- zSpan[i] = z;
/* save Y value of first row */
zoomY0 = IROUND(ctx->Current.RasterPos[1]);
span.x = destX;
span.y = destY;
span.end = drawWidth;
- _mesa_write_zoomed_rgba_span(ctx, &span,
+ _swrast_write_zoomed_rgba_span(ctx, &span,
(CONST GLchan (*)[4]) src, zoomY0, 0);
src += rowLength * 4;
destY++;
span.x = destX;
span.y = destY;
span.end = drawWidth;
- _mesa_write_zoomed_rgb_span(ctx, &span,
+ _swrast_write_zoomed_rgb_span(ctx, &span,
(CONST GLchan (*)[3]) src, zoomY0, 0);
src += rowLength * 3;
destY++;
if (ctx->Pixel.ZoomX==1.0F && ctx->Pixel.ZoomY==1.0F) {
/* no zooming */
GLint row;
- ASSERT(drawWidth < MAX_WIDTH);
+ ASSERT(drawWidth <= MAX_WIDTH);
for (row=0; row<drawHeight; row++) {
GLint i;
for (i=0;i<drawWidth;i++) {
else if (ctx->Pixel.ZoomX==1.0F && ctx->Pixel.ZoomY==-1.0F) {
/* upside-down */
GLint row;
- ASSERT(drawWidth < MAX_WIDTH);
+ ASSERT(drawWidth <= MAX_WIDTH);
for (row=0; row<drawHeight; row++) {
GLint i;
for (i=0;i<drawWidth;i++) {
else {
/* with zooming */
GLint row;
- ASSERT(drawWidth < MAX_WIDTH);
+ ASSERT(drawWidth <= MAX_WIDTH);
for (row=0; row<drawHeight; row++) {
GLint i;
for (i=0;i<drawWidth;i++) {
span.x = destX;
span.y = destY;
span.end = drawWidth;
- _mesa_write_zoomed_rgb_span(ctx, &span,
+ _swrast_write_zoomed_rgb_span(ctx, &span,
(CONST GLchan (*)[3]) span.array->rgb, zoomY0, 0);
src += rowLength;
destY++;
if (ctx->Pixel.ZoomX==1.0F && ctx->Pixel.ZoomY==1.0F) {
/* no zooming */
GLint row;
- ASSERT(drawWidth < MAX_WIDTH);
+ ASSERT(drawWidth <= MAX_WIDTH);
for (row=0; row<drawHeight; row++) {
GLint i;
GLchan *ptr = src;
else if (ctx->Pixel.ZoomX==1.0F && ctx->Pixel.ZoomY==-1.0F) {
/* upside-down */
GLint row;
- ASSERT(drawWidth < MAX_WIDTH);
+ ASSERT(drawWidth <= MAX_WIDTH);
for (row=0; row<drawHeight; row++) {
GLint i;
GLchan *ptr = src;
else {
/* with zooming */
GLint row;
- ASSERT(drawWidth < MAX_WIDTH);
+ ASSERT(drawWidth <= MAX_WIDTH);
for (row=0; row<drawHeight; row++) {
GLchan *ptr = src;
GLint i;
span.x = destX;
span.y = destY;
span.end = drawWidth;
- _mesa_write_zoomed_rgba_span(ctx, &span,
+ _swrast_write_zoomed_rgba_span(ctx, &span,
(CONST GLchan (*)[4]) span.array->rgba, zoomY0, 0);
src += rowLength*2;
destY++;
/* no zooming */
GLint row;
for (row=0; row<drawHeight; row++) {
- ASSERT(drawWidth < MAX_WIDTH);
+ ASSERT(drawWidth <= MAX_WIDTH);
_mesa_map_ci8_to_rgba(ctx, drawWidth, src, span.array->rgba);
(*swrast->Driver.WriteRGBASpan)(ctx, drawWidth, destX, destY,
(const GLchan (*)[4]) span.array->rgba, NULL);
/* upside-down */
GLint row;
for (row=0; row<drawHeight; row++) {
- ASSERT(drawWidth < MAX_WIDTH);
+ ASSERT(drawWidth <= MAX_WIDTH);
_mesa_map_ci8_to_rgba(ctx, drawWidth, src, span.array->rgba);
destY--;
(*swrast->Driver.WriteRGBASpan)(ctx, drawWidth, destX, destY,
/* with zooming */
GLint row;
for (row=0; row<drawHeight; row++) {
- ASSERT(drawWidth < MAX_WIDTH);
+ ASSERT(drawWidth <= MAX_WIDTH);
_mesa_map_ci8_to_rgba(ctx, drawWidth, src, span.array->rgba);
span.x = destX;
span.y = destY;
span.end = drawWidth;
- _mesa_write_zoomed_rgba_span(ctx, &span,
+ _swrast_write_zoomed_rgba_span(ctx, &span,
(CONST GLchan (*)[4]) span.array->rgba, zoomY0, 0);
src += rowLength;
destY++;
static void
draw_index_pixels( GLcontext *ctx, GLint x, GLint y,
GLsizei width, GLsizei height,
- GLenum type, const GLvoid *pixels )
+ GLenum type,
+ const struct gl_pixelstore_attrib *unpack,
+ const GLvoid *pixels )
{
const GLboolean zoom = ctx->Pixel.ZoomX!=1.0 || ctx->Pixel.ZoomY!=1.0;
GLint row, skipPixels;
INIT_SPAN(span, GL_BITMAP, 0, 0, SPAN_INDEX);
if (ctx->Depth.Test)
- _mesa_span_default_z(ctx, &span);
+ _swrast_span_default_z(ctx, &span);
if (ctx->Fog.Enabled)
- _mesa_span_default_fog(ctx, &span);
+ _swrast_span_default_fog(ctx, &span);
/*
* General solution
*/
skipPixels = 0;
while (skipPixels < width) {
- span.x = x + (zoom ? 0 : skipPixels);
- span.y = y;
- span.end = (width - skipPixels > MAX_WIDTH)
- ? MAX_WIDTH : (width - skipPixels);
- ASSERT(span.end <= MAX_WIDTH);
- for (row = 0; row < height; row++, span.y++) {
- const GLvoid *source = _mesa_image_address(&ctx->Unpack, pixels,
+ const GLint spanX = x + (zoom ? 0 : skipPixels);
+ GLint spanY = y;
+ const GLint spanEnd = (width - skipPixels > MAX_WIDTH)
+ ? MAX_WIDTH : (width - skipPixels);
+ ASSERT(spanEnd <= MAX_WIDTH);
+ for (row = 0; row < height; row++, spanY++) {
+ const GLvoid *source = _mesa_image_address(unpack, pixels,
width, height,
GL_COLOR_INDEX, type,
0, row, skipPixels);
- _mesa_unpack_index_span(ctx, span.end, GL_UNSIGNED_INT,
- span.array->index, type, source, &ctx->Unpack,
+ _mesa_unpack_index_span(ctx, spanEnd, GL_UNSIGNED_INT,
+ span.array->index, type, source, unpack,
ctx->_ImageTransferState);
+
+ /* These may get changed during writing/clipping */
+ span.x = spanX;
+ span.y = spanY;
+ span.end = spanEnd;
+
if (zoom)
- _mesa_write_zoomed_index_span(ctx, &span, y, skipPixels);
+ _swrast_write_zoomed_index_span(ctx, &span, y, skipPixels);
else
- _mesa_write_index_span(ctx, &span);
+ _swrast_write_index_span(ctx, &span);
}
- skipPixels += span.end;
+ skipPixels += spanEnd;
}
}
static void
draw_stencil_pixels( GLcontext *ctx, GLint x, GLint y,
GLsizei width, GLsizei height,
- GLenum type, const GLvoid *pixels )
+ GLenum type,
+ const struct gl_pixelstore_attrib *unpack,
+ const GLvoid *pixels )
{
const GLboolean zoom = ctx->Pixel.ZoomX!=1.0 || ctx->Pixel.ZoomY!=1.0;
const GLint desty = y;
GLstencil values[MAX_WIDTH];
GLenum destType = (sizeof(GLstencil) == sizeof(GLubyte))
? GL_UNSIGNED_BYTE : GL_UNSIGNED_SHORT;
- const GLvoid *source = _mesa_image_address(&ctx->Unpack, pixels,
+ const GLvoid *source = _mesa_image_address(unpack, pixels,
width, height,
GL_COLOR_INDEX, type,
0, row, skipPixels);
_mesa_unpack_index_span(ctx, spanWidth, destType, values,
- type, source, &ctx->Unpack,
+ type, source, unpack,
ctx->_ImageTransferState);
if (ctx->_ImageTransferState & IMAGE_SHIFT_OFFSET_BIT) {
_mesa_shift_and_offset_stencil(ctx, spanWidth, values);
}
if (zoom) {
- _mesa_write_zoomed_stencil_span(ctx, (GLuint) spanWidth,
+ _swrast_write_zoomed_stencil_span(ctx, (GLuint) spanWidth,
spanX, spanY, values, desty, 0);
}
else {
- _mesa_write_stencil_span(ctx, (GLuint) spanWidth,
+ _swrast_write_stencil_span(ctx, (GLuint) spanWidth,
spanX, spanY, values);
}
}
static void
draw_depth_pixels( GLcontext *ctx, GLint x, GLint y,
GLsizei width, GLsizei height,
- GLenum type, const GLvoid *pixels )
+ GLenum type,
+ const struct gl_pixelstore_attrib *unpack,
+ const GLvoid *pixels )
{
const GLboolean bias_or_scale = ctx->Pixel.DepthBias!=0.0 || ctx->Pixel.DepthScale!=1.0;
- const GLboolean zoom = ctx->Pixel.ZoomX!=1.0 || ctx->Pixel.ZoomY!=1.0;
+ const GLboolean zoom = ctx->Pixel.ZoomX != 1.0 || ctx->Pixel.ZoomY != 1.0;
const GLint desty = y;
struct sw_span span;
return;
}
- _mesa_span_default_color(ctx, &span);
+ _swrast_span_default_color(ctx, &span);
if (ctx->Fog.Enabled)
- _mesa_span_default_fog(ctx, &span);
- if (ctx->Texture._EnabledUnits)
- _mesa_span_default_texcoords(ctx, &span);
-
- if (type == GL_UNSIGNED_SHORT && ctx->Visual.depthBits == 16
- && !bias_or_scale && !zoom && ctx->Visual.rgbMode
- && width < MAX_WIDTH) {
+ _swrast_span_default_fog(ctx, &span);
+ if (ctx->Texture._EnabledCoordUnits)
+ _swrast_span_default_texcoords(ctx, &span);
+
+ if (type == GL_UNSIGNED_SHORT
+ && ctx->Visual.depthBits == 16
+ && !bias_or_scale
+ && !zoom
+ && ctx->Visual.rgbMode
+ && width <= MAX_WIDTH) {
/* Special case: directly write 16-bit depth values */
- GLint row;
- span.x = x;
- span.y = y;
- span.end = width;
- for (row = 0; row < height; row++, span.y++) {
- const GLushort *zptr = (const GLushort *)
- _mesa_image_address(&ctx->Unpack, pixels, width, height,
+ GLint row, spanY = y;
+ for (row = 0; row < height; row++, spanY++) {
+ const GLushort *zSrc = (const GLushort *)
+ _mesa_image_address(unpack, pixels, width, height,
GL_DEPTH_COMPONENT, type, 0, row, 0);
GLint i;
for (i = 0; i < width; i++)
- span.array->z[i] = zptr[i];
- _mesa_write_rgba_span(ctx, &span);
+ span.array->z[i] = zSrc[i];
+ span.x = x;
+ span.y = spanY;
+ span.end = width;
+ _swrast_write_rgba_span(ctx, &span);
}
}
- else if (type == GL_UNSIGNED_INT && ctx->Visual.depthBits == 32
- && !bias_or_scale && !zoom && ctx->Visual.rgbMode
- && width < MAX_WIDTH) {
- /* Special case: directly write 32-bit depth values */
- GLint row;
- span.x = x;
- span.y = y;
- span.end = width;
- for (row = 0; row < height; row++, span.y++) {
- const GLuint *zptr = (const GLuint *)
- _mesa_image_address(&ctx->Unpack, pixels, width, height,
+ else if (type == GL_UNSIGNED_INT
+ && sizeof(GLdepth) == 4
+ && !bias_or_scale
+ && !zoom
+ && ctx->Visual.rgbMode
+ && width <= MAX_WIDTH) {
+ /* Special case: shift 32-bit values down to ctx->Visual.depthBits */
+ const GLint shift = 32 - ctx->Visual.depthBits;
+ GLint row, spanY = y;
+ for (row = 0; row < height; row++, spanY++) {
+ const GLuint *zSrc = (const GLuint *)
+ _mesa_image_address(unpack, pixels, width, height,
GL_DEPTH_COMPONENT, type, 0, row, 0);
- MEMCPY(span.array->z, zptr, width * sizeof(GLdepth));
- _mesa_write_rgba_span(ctx, &span);
+ if (shift == 0) {
+ MEMCPY(span.array->z, zSrc, width * sizeof(GLdepth));
+ }
+ else {
+ GLint col;
+ for (col = 0; col < width; col++)
+ span.array->z[col] = zSrc[col] >> shift;
+ }
+ span.x = x;
+ span.y = spanY;
+ span.end = width;
+ _swrast_write_rgba_span(ctx, &span);
}
}
else {
ASSERT(span.end <= MAX_WIDTH);
for (row = 0; row < height; row++, spanY++) {
GLfloat floatSpan[MAX_WIDTH];
- const GLvoid *src = _mesa_image_address(&ctx->Unpack,
- pixels, width, height,
- GL_DEPTH_COMPONENT, type,
- 0, row, skipPixels);
+ const GLvoid *zSrc = _mesa_image_address(unpack,
+ pixels, width, height,
+ GL_DEPTH_COMPONENT, type,
+ 0, row, skipPixels);
- /* Set these for each row since the _mesa_write_* function may
+ /* Set these for each row since the _swrast_write_* function may
* change them while clipping.
*/
span.x = spanX;
span.end = spanEnd;
_mesa_unpack_depth_span(ctx, span.end, floatSpan, type,
- src, &ctx->Unpack);
+ zSrc, unpack);
/* clamp depth values to [0,1] and convert from floats to ints */
{
- const GLfloat zs = ctx->DepthMaxF;
- GLint i;
+ const GLfloat zScale = ctx->DepthMaxF;
+ GLuint i;
for (i = 0; i < span.end; i++) {
- span.array->z[i] = (GLdepth) (floatSpan[i] * zs + 0.5F);
+ span.array->z[i] = (GLdepth) (floatSpan[i] * zScale);
}
}
- if (ctx->Visual.rgbMode) {
- if (zoom) {
- _mesa_write_zoomed_rgba_span(ctx, &span,
- (const GLchan (*)[4]) span.array->rgba,
- desty, skipPixels);
- }
- else
- _mesa_write_rgba_span(ctx, &span);
+ if (zoom) {
+ _swrast_write_zoomed_depth_span(ctx, &span, desty, skipPixels);
+ }
+ else if (ctx->Visual.rgbMode) {
+ _swrast_write_rgba_span(ctx, &span);
}
else {
- if (zoom)
- _mesa_write_zoomed_index_span(ctx, &span, desty, 0);
- else
- _mesa_write_index_span(ctx, &span);
+ _swrast_write_index_span(ctx, &span);
}
}
- skipPixels += span.end;
+ skipPixels += spanEnd;
}
}
}
static void
draw_rgba_pixels( GLcontext *ctx, GLint x, GLint y,
GLsizei width, GLsizei height,
- GLenum format, GLenum type, const GLvoid *pixels )
+ GLenum format, GLenum type,
+ const struct gl_pixelstore_attrib *unpack,
+ const GLvoid *pixels )
{
SWcontext *swrast = SWRAST_CONTEXT(ctx);
- const struct gl_pixelstore_attrib *unpack = &ctx->Unpack;
const GLboolean zoom = ctx->Pixel.ZoomX!=1.0 || ctx->Pixel.ZoomY!=1.0;
const GLint desty = y;
GLboolean quickDraw;
INIT_SPAN(span, GL_BITMAP, 0, 0, SPAN_RGBA);
- if (!_mesa_is_legal_format_and_type(format, type)) {
+ if (!_mesa_is_legal_format_and_type(ctx, format, type)) {
_mesa_error(ctx, GL_INVALID_ENUM, "glDrawPixels(format or type)");
return;
}
/* Try an optimized glDrawPixels first */
- if (fast_draw_pixels(ctx, x, y, width, height, format, type, pixels))
+ if (fast_draw_pixels(ctx, x, y, width, height, format, type, unpack, pixels))
return;
if (ctx->Depth.Test)
- _mesa_span_default_z(ctx, &span);
+ _swrast_span_default_z(ctx, &span);
if (ctx->Fog.Enabled)
- _mesa_span_default_fog(ctx, &span);
- if (ctx->Texture._EnabledUnits)
- _mesa_span_default_texcoords(ctx, &span);
+ _swrast_span_default_fog(ctx, &span);
+ if (ctx->Texture._EnabledCoordUnits)
+ _swrast_span_default_texcoords(ctx, &span);
if (SWRAST_CONTEXT(ctx)->_RasterMask == 0 && !zoom && x >= 0 && y >= 0
&& x + width <= (GLint) ctx->DrawBuffer->Width
GLint row;
GLfloat *dest, *tmpImage;
- tmpImage = (GLfloat *) MALLOC(width * height * 4 * sizeof(GLfloat));
+ tmpImage = (GLfloat *) _mesa_malloc(width * height * 4 * sizeof(GLfloat));
if (!tmpImage) {
_mesa_error(ctx, GL_OUT_OF_MEMORY, "glDrawPixels");
return;
}
- convImage = (GLfloat *) MALLOC(width * height * 4 * sizeof(GLfloat));
+ convImage = (GLfloat *) _mesa_malloc(width * height * 4 * sizeof(GLfloat));
if (!convImage) {
- FREE(tmpImage);
+ _mesa_free(tmpImage);
_mesa_error(ctx, GL_OUT_OF_MEMORY, "glDrawPixels");
return;
}
for (row = 0; row < height; row++) {
const GLvoid *source = _mesa_image_address(unpack,
pixels, width, height, format, type, 0, row, 0);
- _mesa_unpack_float_color_span(ctx, width, GL_RGBA, (GLfloat *) dest,
- format, type, source, unpack,
- transferOps & IMAGE_PRE_CONVOLUTION_BITS,
- GL_FALSE);
+ _mesa_unpack_color_span_float(ctx, width, GL_RGBA, (GLfloat *) dest,
+ format, type, source, unpack,
+ transferOps & IMAGE_PRE_CONVOLUTION_BITS);
dest += width * 4;
}
ASSERT(ctx->Pixel.Separable2DEnabled);
_mesa_convolve_sep_image(ctx, &width, &height, tmpImage, convImage);
}
- FREE(tmpImage);
+ _mesa_free(tmpImage);
/* continue transfer ops and draw the convolved image */
- unpack = &_mesa_native_packing;
+ unpack = &ctx->DefaultPacking;
pixels = convImage;
format = GL_RGBA;
type = GL_FLOAT;
* General solution
*/
{
+ const GLuint interpMask = span.interpMask;
+ const GLuint arrayMask = span.arrayMask;
GLint row, skipPixels = 0;
/* if the span is wider than MAX_WIDTH we have to do it in chunks */
const GLvoid *source = _mesa_image_address(unpack,
pixels, width, height, format, type, 0, row, skipPixels);
- /* Set these for each row since the _mesa_write_* function may
+ /* Set these for each row since the _swrast_write_* function may
* change them while clipping.
*/
span.x = spanX;
span.y = spanY;
span.end = spanEnd;
+ span.arrayMask = arrayMask;
+ span.interpMask = interpMask;
- _mesa_unpack_chan_color_span(ctx, span.end, GL_RGBA,
+ _mesa_unpack_color_span_chan(ctx, span.end, GL_RGBA,
(GLchan *) span.array->rgba,
format, type, source, unpack,
transferOps);
_swrast_pixel_texture(ctx, &span);
}
+ /* draw the span */
if (quickDraw) {
(*swrast->Driver.WriteRGBASpan)(ctx, span.end, span.x, span.y,
(CONST GLchan (*)[4]) span.array->rgba, NULL);
}
else if (zoom) {
- _mesa_write_zoomed_rgba_span(ctx, &span,
+ _swrast_write_zoomed_rgba_span(ctx, &span,
(CONST GLchan (*)[4]) span.array->rgba, desty, skipPixels);
}
else {
- _mesa_write_rgba_span(ctx, &span);
+ _swrast_write_rgba_span(ctx, &span);
}
}
- skipPixels += span.end;
+
+ skipPixels += spanEnd;
}
}
if (convImage) {
- FREE(convImage);
+ _mesa_free(convImage);
}
}
const GLvoid *pixels )
{
SWcontext *swrast = SWRAST_CONTEXT(ctx);
- (void) unpack;
if (swrast->NewState)
_swrast_validate_derived( ctx );
+ pixels = _swrast_validate_pbo_access(unpack, width, height, 1,
+ format, type, (GLvoid *) pixels);
+ if (!pixels)
+ return;
+
RENDER_START(swrast,ctx);
switch (format) {
case GL_STENCIL_INDEX:
- draw_stencil_pixels( ctx, x, y, width, height, type, pixels );
+ draw_stencil_pixels( ctx, x, y, width, height, type, unpack, pixels );
break;
case GL_DEPTH_COMPONENT:
- draw_depth_pixels( ctx, x, y, width, height, type, pixels );
+ draw_depth_pixels( ctx, x, y, width, height, type, unpack, pixels );
break;
case GL_COLOR_INDEX:
if (ctx->Visual.rgbMode)
- draw_rgba_pixels(ctx, x,y, width, height, format, type, pixels);
+ draw_rgba_pixels(ctx, x,y, width, height, format, type, unpack, pixels);
else
- draw_index_pixels(ctx, x, y, width, height, type, pixels);
+ draw_index_pixels(ctx, x, y, width, height, type, unpack, pixels);
break;
case GL_RED:
case GL_GREEN:
case GL_RGBA:
case GL_BGRA:
case GL_ABGR_EXT:
- draw_rgba_pixels(ctx, x, y, width, height, format, type, pixels);
+ draw_rgba_pixels(ctx, x, y, width, height, format, type, unpack, pixels);
break;
default:
_mesa_error( ctx, GL_INVALID_ENUM, "glDrawPixels(format)" );
const struct gl_pixelstore_attrib *unpack )
{
SWcontext *swrast = SWRAST_CONTEXT(ctx);
- (void) unpack;
if (swrast->NewState)
_swrast_validate_derived( ctx );
switch (colorFormat) {
case GL_COLOR_INDEX:
if (ctx->Visual.rgbMode)
- draw_rgba_pixels(ctx, x,y, width, height, colorFormat, colorType, colors);
+ draw_rgba_pixels(ctx, x,y, width, height, colorFormat, colorType, unpack, colors);
else
- draw_index_pixels(ctx, x, y, width, height, colorType, colors);
+ draw_index_pixels(ctx, x, y, width, height, colorType, unpack, colors);
break;
case GL_RED:
case GL_GREEN:
case GL_RGBA:
case GL_BGRA:
case GL_ABGR_EXT:
- draw_rgba_pixels(ctx, x, y, width, height, colorFormat, colorType, colors);
+ draw_rgba_pixels(ctx, x, y, width, height, colorFormat, colorType, unpack, colors);
break;
default:
_mesa_error( ctx, GL_INVALID_ENUM,
projects / mesa.git / blobdiff