summaryrefslogtreecommitdiffstats
path: root/src/mesa
diff options
context:
space:
mode:
authorKeith Whitwell <[email protected]>1999-09-11 16:01:26 +0000
committerKeith Whitwell <[email protected]>1999-09-11 16:01:26 +0000
commit6fd3b9682268ee37d5e1150680e63604292206e9 (patch)
tree0699d0929ca7d7e462ca40eda392affda21dbaaa /src/mesa
parent84ffacb978457a4ac57e88bf5500cb1140981638 (diff)
bugix from raul for fxddbitmap
Diffstat (limited to 'src/mesa')
-rw-r--r--src/mesa/drivers/glide/fxdd.c37
1 files changed, 29 insertions, 8 deletions
diff --git a/src/mesa/drivers/glide/fxdd.c b/src/mesa/drivers/glide/fxdd.c
index f7feb24ceac..7dc921b9007 100644
--- a/src/mesa/drivers/glide/fxdd.c
+++ b/src/mesa/drivers/glide/fxdd.c
@@ -203,6 +203,7 @@ static GLboolean fxDDSetBuffer(GLcontext *ctx, GLenum mode )
}
+
static GLboolean fxDDDrawBitMap(GLcontext *ctx, GLint px, GLint py,
GLsizei width, GLsizei height,
const struct gl_pixelstore_attrib *unpack,
@@ -212,7 +213,7 @@ static GLboolean fxDDDrawBitMap(GLcontext *ctx, GLint px, GLint py,
FxU16 *p;
GrLfbInfo_t info;
const GLubyte *pb;
- int x,y;
+ int x,y,xmin,xmax,ymin,ymax;
GLint r,g,b,a,scrwidth,scrheight,stride;
FxU16 color;
@@ -227,13 +228,26 @@ static GLboolean fxDDDrawBitMap(GLcontext *ctx, GLint px, GLint py,
(unpack->LsbFirst))
return GL_FALSE;
-#define ISCLIPPED(rx) ( ((rx)<0) || ((rx)>=scrwidth) )
-#define DRAWBIT(i) { \
- if(!ISCLIPPED(x+px)) \
+ if (ctx->Scissor.Enabled) {
+ xmin=ctx->Scissor.X;
+ xmax=ctx->Scissor.X+ctx->Scissor.Width;
+ ymin=ctx->Scissor.Y;
+ ymax=ctx->Scissor.Y+ctx->Scissor.Height;
+ } else {
+ xmin=0;
+ xmax=fxMesa->width;
+ ymin=0;
+ ymax=fxMesa->height;
+ }
+
+
+#define ISCLIPPED(rx) ( ((rx)<xmin) || ((rx)>=xmax) )
+#define DRAWBIT(i) { \
+ if(!ISCLIPPED(x+px)) \
if( (*pb) & (1<<(i)) ) \
- (*p)=color; \
+ (*p)=color; \
p++; \
- x++; \
+ x++; \
if(x>=width) { \
pb++; \
break; \
@@ -283,8 +297,15 @@ static GLboolean fxDDDrawBitMap(GLcontext *ctx, GLint px, GLint py,
/* This code is a bit slow... */
- for(y=0;y<height;y++) {
- p=((FxU16 *)info.lfbPtr)+px+((scrheight-(y+py))*stride);
+ for(y=py;y<(py+height);y++) {
+
+ if (y>=ymax)
+ break;
+
+ if (y<=ymin)
+ continue;
+
+ p=((FxU16 *)info.lfbPtr)+px+((scrheight-y)*stride);
for(x=0;;) {
DRAWBIT(7); DRAWBIT(6); DRAWBIT(5); DRAWBIT(4);