diff options
| -rw-r--r-- | src/mesa/drivers/x11/xm_dd.c | 6 | ||||
| -rw-r--r-- | src/mesa/swrast/s_drawpix.c | 47 | ||||
| -rw-r--r-- | src/mesa/swrast/s_drawpix.h | 7 |
3 files changed, 4 insertions, 56 deletions
diff --git a/src/mesa/drivers/x11/xm_dd.c b/src/mesa/drivers/x11/xm_dd.c index a83c5ec3ec..bee46a53a8 100644 --- a/src/mesa/drivers/x11/xm_dd.c +++ b/src/mesa/drivers/x11/xm_dd.c @@ -31,6 +31,7 @@ #include "drawpix.h" #include "extensions.h" #include "macros.h" +#include "image.h" #include "imports.h" #include "mtypes.h" #include "state.h" @@ -43,7 +44,6 @@ #include "swrast/swrast.h" #include "swrast/s_auxbuffer.h" #include "swrast/s_context.h" -#include "swrast/s_drawpix.h" #include "swrast/s_alphabuf.h" #include "swrast_setup/swrast_setup.h" #include "tnl/tnl.h" @@ -865,7 +865,7 @@ xmesa_DrawPixels_8R8G8B( GLcontext *ctx, pixels = ADD_POINTERS(buf, pixels); } - if (_swrast_clip_pixelrect(ctx, &dstX, &dstY, &w, &h, &srcX, &srcY)) { + if (_mesa_clip_drawpixels(ctx, &dstX, &dstY, &w, &h, &srcX, &srcY)) { /* This is a little tricky since all coordinates up to now have * been in the OpenGL bottom-to-top orientation. X is top-to-bottom * so we have to carefully compute the Y coordinates/addresses here. @@ -968,7 +968,7 @@ xmesa_DrawPixels_5R6G5B( GLcontext *ctx, pixels = ADD_POINTERS(buf, pixels); } - if (_swrast_clip_pixelrect(ctx, &dstX, &dstY, &w, &h, &srcX, &srcY)) { + if (_mesa_clip_drawpixels(ctx, &dstX, &dstY, &w, &h, &srcX, &srcY)) { /* This is a little tricky since all coordinates up to now have * been in the OpenGL bottom-to-top orientation. X is top-to-bottom * so we have to carefully compute the Y coordinates/addresses here. diff --git a/src/mesa/swrast/s_drawpix.c b/src/mesa/swrast/s_drawpix.c index 00cc5e83c0..74c820c43b 100644 --- a/src/mesa/swrast/s_drawpix.c +++ b/src/mesa/swrast/s_drawpix.c @@ -40,53 +40,6 @@ #include "s_zoom.h" - -/* - * Given the dest position, size and skipPixels and skipRows values - * for a glDrawPixels command, perform clipping of the image bounds - * so the result lies withing the context's buffer bounds. - * Return: GL_TRUE if image is ready for drawing - * GL_FALSE if image was completely clipped away (draw nothing) - */ -GLboolean -_swrast_clip_pixelrect(const GLcontext *ctx, - GLint *destX, GLint *destY, - GLsizei *width, GLsizei *height, - GLint *skipPixels, GLint *skipRows) -{ - const GLframebuffer *buffer = ctx->DrawBuffer; - - /* left clipping */ - if (*destX < buffer->_Xmin) { - *skipPixels += (buffer->_Xmin - *destX); - *width -= (buffer->_Xmin - *destX); - *destX = buffer->_Xmin; - } - /* right clipping */ - if (*destX + *width > buffer->_Xmax) - *width -= (*destX + *width - buffer->_Xmax); - - if (*width <= 0) - return GL_FALSE; - - /* bottom clipping */ - if (*destY < buffer->_Ymin) { - *skipRows += (buffer->_Ymin - *destY); - *height -= (buffer->_Ymin - *destY); - *destY = buffer->_Ymin; - } - /* top clipping */ - if (*destY + *height > buffer->_Ymax) - *height -= (*destY + *height - buffer->_Ymax); - - if (*height <= 0) - return GL_TRUE; - - return GL_TRUE; -} - - - /* * Try to do a fast and simple RGB(a) glDrawPixels. * Return: GL_TRUE if success, GL_FALSE if slow path must be used instead diff --git a/src/mesa/swrast/s_drawpix.h b/src/mesa/swrast/s_drawpix.h index 605a293dae..66067115dd 100644 --- a/src/mesa/swrast/s_drawpix.h +++ b/src/mesa/swrast/s_drawpix.h @@ -31,11 +31,6 @@ #include "mtypes.h" #include "swrast.h" - -extern GLboolean -_swrast_clip_pixelrect(const GLcontext *ctx, - GLint *destX, GLint *destY, - GLsizei *width, GLsizei *height, - GLint *skipPixels, GLint *skipRows); +/* XXX kill this header? */ #endif |