summaryrefslogtreecommitdiff
path: root/src/mesa/drivers/x11/xm_dd.c
diff options
context:
space:
mode:
authorBrian Paul <brian.paul@tungstengraphics.com>2004-11-09 01:04:50 +0000
committerBrian Paul <brian.paul@tungstengraphics.com>2004-11-09 01:04:50 +0000
commitc55c963f4c3ec6101241501de0f759520b985853 (patch)
tree55d6ad640a2c902496c46bf916690a4f82606ab5 /src/mesa/drivers/x11/xm_dd.c
parent4084e3c215d4db6370422fc718217bade7445618 (diff)
Removed _swrast_clip_pixelrect(). Use _mesa_clip_drawpixels() instead.
Diffstat (limited to 'src/mesa/drivers/x11/xm_dd.c')
-rw-r--r--src/mesa/drivers/x11/xm_dd.c6
1 files changed, 3 insertions, 3 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.