xserver/hw/kdrive/neomagic ChangeLog,1.4,1.5 neo_draw.c,1.5,1.6

[Franco Catrin L.]

Committed by: fcatrin

Update of /cvs/xserver/xserver/hw/kdrive/neomagic
In directory pdx:/tmp/cvs-serv30582

Modified Files:
	ChangeLog neo_draw.c 
Log Message:
Fixed size calculation in solid rendering

Index: ChangeLog
===================================================================
RCS file: /cvs/xserver/xserver/hw/kdrive/neomagic/ChangeLog,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- a/ChangeLog	11 Apr 2004 15:20:17 -0000	1.4
+++ b/ChangeLog	11 Apr 2004 15:51:04 -0000	1.5
@@ -1,5 +1,6 @@
 2004-04-11 Franco Catrin L. <fcatrin at tuxpan.com>
         * Basic bitblt implementation
+	* Fixed width and height calculation in solids
 
 2004-04-10 Franco Catrin L. <fcatrin at tuxpan.com>
         * MMIO enabled after switching to new VT

Index: neo_draw.c
===================================================================
RCS file: /cvs/xserver/xserver/hw/kdrive/neomagic/neo_draw.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- a/neo_draw.c	11 Apr 2004 15:20:17 -0000	1.5
+++ b/neo_draw.c	11 Apr 2004 15:51:04 -0000	1.6
@@ -62,7 +62,7 @@
                             Pixel fg)
 {
     FbBits depthMask = FbFullMask(pPixmap->drawable.depth);
-
+	DBGOUT("ROP %i\n", alu);
     if ((pm & depthMask) != depthMask) {
         return FALSE;
     } else {
@@ -76,17 +76,8 @@
     int x, y, w, h;
     x = x1;
     y = y1;
-    w = x2-x1 + 1;
-    h = y2-y1 + 1;
-    if (x1>x2) {
-        x = x2;
-        w = -w;
-    }
-    if (y1>y2) {
-        y = y2;
-        h = -h;
-    }
-	
+    w = x2-x1;
+    h = y2-y1;
 	neoWaitIdle(card);
 	mmio->fgColor = fgColor;
 	mmio->bltCntl =
@@ -115,7 +106,7 @@
 	
     if ((dstY < srcY) || ((dstY == srcY) && (dstX < srcX))) {
 		mmio->bltCntl  = 
-					NEO_BC3_FIFO_EN      |
+					NEO_BC3_FIFO_EN |
 					NEO_BC3_SKIP_MAPPING |  0x0c0000;
 		mmio->srcStart = srcY * screen->pitch + srcX * screen->depth;
 		mmio->dstStart = dstY * screen->pitch + dstX * screen->depth;