From: sparky4 <sparky4@cock.li>
Date: Fri, 23 Oct 2015 22:47:35 +0000 (-0500)
Subject: planrpcx.exe now can time it's drawing~
X-Git-Url: http://4ch.mooo.com/gitweb/?a=commitdiff_plain;h=4b889090f4bfb628d99a7940bc14469b3de12dba;p=16.git

planrpcx.exe now can time it's drawing~
---

diff --git a/16.exe b/16.exe
index 8b71c15c..9bd74855 100755
Binary files a/16.exe and b/16.exe differ
diff --git a/bakapi.exe b/bakapi.exe
index cf5fc7cf..d47a44a0 100755
Binary files a/bakapi.exe and b/bakapi.exe differ
diff --git a/exmmtest.exe b/exmmtest.exe
index a26c6365..81bcbabb 100755
Binary files a/exmmtest.exe and b/exmmtest.exe differ
diff --git a/fontgfx.exe b/fontgfx.exe
index bde105c1..e643b2ef 100755
Binary files a/fontgfx.exe and b/fontgfx.exe differ
diff --git a/maptest.exe b/maptest.exe
index 2a49e37a..8e8169c9 100755
Binary files a/maptest.exe and b/maptest.exe differ
diff --git a/palettec.exe b/palettec.exe
index bb67d4b0..8d036009 100755
Binary files a/palettec.exe and b/palettec.exe differ
diff --git a/palettel.exe b/palettel.exe
index cbde6f44..9e9c506b 100755
Binary files a/palettel.exe and b/palettel.exe differ
diff --git a/pcxtest.exe b/pcxtest.exe
index 52d91504..7190cfd2 100755
Binary files a/pcxtest.exe and b/pcxtest.exe differ
diff --git a/pcxtest2.exe b/pcxtest2.exe
index 3a0dfd64..a188e143 100755
Binary files a/pcxtest2.exe and b/pcxtest2.exe differ
diff --git a/planrpcx.exe b/planrpcx.exe
index 186eb2c5..0ae32912 100755
Binary files a/planrpcx.exe and b/planrpcx.exe differ
diff --git a/scroll.exe b/scroll.exe
index 87fcf0a8..31c9c95e 100755
Binary files a/scroll.exe and b/scroll.exe differ
diff --git a/src/lib/modex16.c b/src/lib/modex16.c
index 80730a2b..3a76b8d4 100755
--- a/src/lib/modex16.c
+++ b/src/lib/modex16.c
@@ -422,7 +422,7 @@ DrawPBuf(page_t *page, int x, int y, planar_buf_t *p, byte sprite)
 	for(plane=0; plane < 4; plane++) {
 		i=0;
 		modexSelectPlane(PLANE(plane+x));
-		for(; y < p->height-1; y++) {
+		for(; y < py+p->height; y++) {
 			//for(px=0; px < p->width; px++) {
 				//printf("%02X ", (int) p->plane[plane][i++]);
 // 				_fmemcpy(buff, &(p->plane[plane][i+=p->pwidth]), p->pwidth);
@@ -431,7 +431,6 @@ DrawPBuf(page_t *page, int x, int y, planar_buf_t *p, byte sprite)
 				_fmemcpy(page->data + (((page->width/4) * (y+page->dy)) + ((x+page->dx) / 4)), &(p->plane[plane][i+=p->pwidth]), p->pwidth);
 			//}
 		}
-		//getch();
 		x=px;
 		y=py;
 	}
diff --git a/src/planrpcx.c b/src/planrpcx.c
index 1eafcd6c..4829b54f 100755
--- a/src/planrpcx.c
+++ b/src/planrpcx.c
@@ -71,21 +71,18 @@ baka = 1;
 	/* non sprite comparison */
 	start = *clockw;
 // 		oldDrawBmp(VGA, 20, 20, &bmp, 0);
-//0000		modexDrawBmp(&gvar.video.page[0], 20, 20, &bmp);
-// 		modexDrawBmp(&gvar.video.page[0], 160, 120, &bmp);
-// 	t1 = (*clockw-start) /18.2;
+	for(i=0; i<100 ;i++) {
+		modexDrawBmp(&gvar.video.page[0], 32, 32, &bmp);
+	}
+	t1 = (*clockw-start) /18.2;
 // 	start = *clockw;
-//0000		modexCopyPageRegion(&gvar.video.page[0], &gvar.video.page[0], 20, 20, 128, 20, 64, 64);
 // 		modexCopyPageRegion(&gvar.video.page[0], &gvar.video.page[0], 0, 0, 0, 0, 320, 240);
 // 	t2 = (*clockw-start)/18.2;
-// 	start = *clockw;
-// 		oldDrawBmp(VGA, 20, 20, &bmp, 1);
-//0000		modexDrawSprite(&gvar.video.page[0], 20, 20, &bmp);
-// 		modexDrawSprite(&gvar.video.page[0], 160, 120, &bmp);
+	start = *clockw;
 	for(i=0; i<100 ;i++) {
-		DrawPBuf(&gvar.video.page[0], 0, 0, p, 0);
+		DrawPBuf(&gvar.video.page[0], gvar.video.page[0].sw-(p->width), gvar.video.page[0].sh-(p->height), p, 0);
 	}
-	t1 = (*clockw-start) /18.2;
+	t2 = (*clockw-start) /18.2;
 	while(!kbhit())
 	{
 	}
@@ -114,8 +111,8 @@ baka = 1;
 	fprintf(stderr,"ppw=%d\n", p->pwidth);
 	fprintf(stderr,"%d\n", sizeof(bmp));
 	planar_buf_free(p);
-	fprintf(stderr, "CPU to VGA: %f\n", t1);
-// 	fprintf(stderr, "VGA to VGA: %f\n", t2);
+	fprintf(stderr, "modexDrawBmp:	%f\n", t1);
+	fprintf(stderr, "DrawPBuf:	%f\n", t2);
 	fprintf(stderr, "gvar.video.page[0].width: %u\n", gvar.video.page[0].width);
 	fprintf(stderr, "gvar.video.page[0].height: %u\n", gvar.video.page[0].height);
 	return;
diff --git a/test.exe b/test.exe
index 5bbef7eb..44c5f736 100755
Binary files a/test.exe and b/test.exe differ
diff --git a/test2.exe b/test2.exe
index 6738ad4a..e82e1004 100755
Binary files a/test2.exe and b/test2.exe differ