wwww polished vrstest.c

diff --git a/src/vrstest.c b/src/vrstest.c
index afa7dea09bda89c8f652543986ae92fde8687935..e12abe92a37ae334d218af4ae9e9700cc2b2cc25 100755 (executable)
--- a/src/vrstest.c
+++ b/src/vrstest.c
@@ -157,48 +157,24 @@ void main() {
 
        /* non sprite comparison */
        start = *clockw;
-       //for(i=0; i<100 ;i++) {
-       //      oldDrawBmp(VGA, 20, 20, &bmp, 0);
-       //}
-
-       start = *clockw;
-       //for(i=0; i<100 ;i++) {
-//0000         modexDrawBmp(&gvar.video.page[0], 20, 20, &bmp);
-       //      modexDrawBmp(&gvar.video.page[0], 160, 120, &bmp);
-       //}
+       modexCopyPageRegion(&gvar.video.page[0], &gvar.video.page[0], 0, 0, 0, 0, 320, 240);
+       animate_spri(&spri);
        t1 = (*clockw-start) /18.2;
 
        start = *clockw;
-       //for(i=0; i<100; i++) {
-//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);
-               animate_spri(&spri);
+
        draw_vrl1_vgax_modex(5,5,curr_vrl/*vrl->buffer*/,vrl->line_offsets,vrl->buffer + sizeof(struct vrl1_vgax_header),vrl->data_size);
        draw_vrl1_vgax_modex(40,40,curr_vrl/*vrs.buffer*/ + vrl_headers_offsets[0],vrs.vrl_line_offsets[0],vrs.buffer + vrl_headers_offsets[0] + sizeof(struct vrl1_vgax_header),vrl_headers_offsets[1] - vrl_headers_offsets[0] - sizeof(struct vrl1_vgax_header));
        draw_vrl1_vgax_modex(100, 5, bigbuffer, off1, (byte *)bigbuffer + sizeof(struct vrl1_vgax_header), size - sizeof(struct vrl1_vgax_header));
 
-       //}
        t2 = (*clockw-start)/18.2;
 
        //for (i = 0; i < 5; i++){
        //animate_spri(&spri);
 
-       start = *clockw;
-       //for(i=0; i<100 ;i++) {
-       //      oldDrawBmp(VGA, 20, 20, &bmp, 1);
-       //}
-
-
-       start = *clockw;
-       //for(i=0; i<100 ;i++) {
-//0000         modexDrawSprite(&gvar.video.page[0], 20, 20, &bmp);
-       //      modexDrawSprite(&gvar.video.page[0], 160, 120, &bmp);
-       //}
-       //_fmemset(MK_FP(0xA000, 0), (int)p->plane, gvar.video.page[0].sw*(gvar.video.page[0].sh*2));
-       //modexDrawBmp(&gvar.video.page[0], 0, 0, &bmp);
        while(!kbhit())
        {
-               //DrawPBuf(&gvar.video.page[0], 0, 0, p, 0);
+               modexPalUpdate0(pal);
        }
        VGAmodeX(0, 1, &gvar);
        free(spri.sprite_vrl_cont);
@@ -206,21 +182,10 @@ void main() {
        //MM_FreePtr(&((void __based(sega)*)spri.spritesheet->buffer), &mm);
        MM_Shutdown(&mm);
        CA_Shutdown(&gvar);
-       /*printf("\nmain=%Fp\n\n", &i);
-       printf("bmp.data=%Fp\n", bmp.data);
-       printf("*bmp.data=%Fp\n", *(bmp.data));
-       printf("&bmp.data=%Fp\n", &(bmp.data));
-
-       printf("\n%d\n", sizeof(p->plane));
-       printf("%d\n", sizeof(bmp));*/
-
-       /*for(i=0; i<(320*240); i++)
-       {
-               fprintf(stdout, "%d", bmp.data[i]);
-               if(i%bmp.width==0) fprintf(stdout, "\n");
-       }*/
-       printf("CPU to VGA: %f\n", t1);
-       printf("VGA to VGA: %f\n", t2);
+       //printf("CPU to VGA: %f\n", t1);
+       //printf("VGA to VGA: %f\n", t2);
+       printf("t1: %f\n", t1);
+       printf("t2: %f\n", t2);
        printf("gvar.video.page[0].width: %u\n", gvar.video.page[0].width);
        printf("gvar.video.page[0].height: %u\n", gvar.video.page[0].height);
        printf("Num %d", num_of_vrl);