pcxtest0 for planar dump test

diff --git a/16.exe b/16.exe
index 6cf1dd649bc9f23269b6acd45ab2aa76ff083118..05529702e14aeae8c49722b77e175b5935638c64 100755 (executable)
Binary files a/16.exe and b/16.exe differ

diff --git a/bakapi.exe b/bakapi.exe
index 00764d7a1a493311d07ea7de75d285baeaaa1cc2..41f0d5d925522c216c6bbbb4de364fea18139de9 100755 (executable)
Binary files a/bakapi.exe and b/bakapi.exe differ

diff --git a/exmmtest.exe b/exmmtest.exe
index bf2ec90343527c4b6700680c58b4080f79192163..a5b14e7011372fa5fa9471701fb3293302175379 100755 (executable)
Binary files a/exmmtest.exe and b/exmmtest.exe differ

diff --git a/fmemtest.exe b/fmemtest.exe
index d2fbb9048d51c3ef095e8226ec0636edb6169990..2328445723b4ff913dd104da2b95c6f5661ebf31 100755 (executable)
Binary files a/fmemtest.exe and b/fmemtest.exe differ

diff --git a/fontgfx.exe b/fontgfx.exe
index 25ee116dfc0e32f5ea7a2d7d0137f86d7958ba05..5c0cbbfaefc61df4430ace0e78597a64dd094a8b 100755 (executable)
Binary files a/fontgfx.exe and b/fontgfx.exe differ

diff --git a/fonttest.exe b/fonttest.exe
index 7bf6f43c0c92e7cb366fff0623605bf063726c60..b59fddc94df8589537fcb25e9ea35b72893f3d60 100755 (executable)
Binary files a/fonttest.exe and b/fonttest.exe differ

diff --git a/inputest.exe b/inputest.exe
index f529b881e2e6c0d81e6b72ebf17f12253685a793..0ea864fbee43741cb0d881cecf621483ee30dd91 100755 (executable)
Binary files a/inputest.exe and b/inputest.exe differ

diff --git a/makefile b/makefile
index d91dffb84b8d39f42115ab30835fba96b9f529c5..ff72a7f0ce542a6a170f807a36f083e797d631d7 100755 (executable)
--- a/makefile
+++ b/makefile
@@ -151,6 +151,9 @@ palettel.exe: palettel.$(OBJ) $(16LIBOBJS) gfx.lib
 pcxtest2.exe: pcxtest2.$(OBJ) gfx.lib
        wcl $(FLAGS) pcxtest2.$(OBJ) gfx.lib -fm=pcxtest2.map
 
+pcxtest0.exe: pcxtest0.$(OBJ) gfx.lib
+       wcl $(FLAGS) pcxtest0.$(OBJ) gfx.lib -fm=pcxtest0.map
+
 maptest.exe: maptest.$(OBJ) mapread.$(OBJ) jsmn.$(OBJ) $(16LIBOBJS) gfx.lib
        wcl $(FLAGS) maptest.$(OBJ) mapread.$(OBJ) jsmn.$(OBJ) $(16LIBOBJS) gfx.lib -fm=maptest.map
 
@@ -192,6 +195,9 @@ test2.$(OBJ): $(SRC)test2.c $(SRCLIB)modex16.h
 pcxtest.$(OBJ): $(SRC)pcxtest.c $(SRCLIB)modex16.h
        wcl $(FLAGS) -c $(SRC)pcxtest.c
 
+pcxtest0.$(OBJ): $(SRC)pcxtest0.c $(SRCLIB)modex16.h
+       wcl $(FLAGS) -c $(SRC)pcxtest0.c
+
 pcxtest2.$(OBJ): $(SRC)pcxtest2.c $(SRCLIB)modex16.h
        wcl $(FLAGS) -c $(SRC)pcxtest2.c
 

diff --git a/maptest.exe b/maptest.exe
index fb045bf153e034d6002c4cbbaf31720391ee9652..441425615d7291aabc9295e3da91a2370d281abd 100755 (executable)
Binary files a/maptest.exe and b/maptest.exe differ

diff --git a/palettec.exe b/palettec.exe
index 6040b6fde7ad87ab49c4dd7bc9765c1cb8028ebe..655a308faa592e3fe6f2127b78ab631b702a60bf 100755 (executable)
Binary files a/palettec.exe and b/palettec.exe differ

diff --git a/palettel.exe b/palettel.exe
index e4c5ad1f316d314fe7c5c0ffcb5b786bd754fad0..a1339ce8c97fd55c154c7142e18e6768b50ea4e0 100755 (executable)
Binary files a/palettel.exe and b/palettel.exe differ

diff --git a/pcxtest.exe b/pcxtest.exe
index 1fe9a5a2046a90018f171f1e58f4b8e1835769ed..338d1f0a7a821d91dfdd2f1e7a074ed592406601 100755 (executable)
Binary files a/pcxtest.exe and b/pcxtest.exe differ

diff --git a/pcxtest2.exe b/pcxtest2.exe
index ba1ce313d3ff8aa2bcb67731b83512c1e2d18415..fd899f5ba64ab652a6ab9a0f061c2c188649811c 100755 (executable)
Binary files a/pcxtest2.exe and b/pcxtest2.exe differ

diff --git a/scroll.exe b/scroll.exe
index a5d7b73ecbf6492f937cf20c5614ab901dbbc0dd..66d711e60214604c3fd9eb4e95f28f004a839daa 100755 (executable)
Binary files a/scroll.exe and b/scroll.exe differ

diff --git a/src/lib/16_head.h b/src/lib/16_head.h
index 5db7e3f4e2619a414da03aefc76d9fa1cecae647..941069c2732b9816c40a48a270bd9a8dcc3f08d1 100755 (executable)
--- a/src/lib/16_head.h
+++ b/src/lib/16_head.h
@@ -172,6 +172,16 @@ typedef void __based(__self) * memptr;
 typedef void _seg * memptr;\r
 #endif\r
 \r
+#define AARED          "\x1b[41;31m"\r
+#define AABLUE         "\x1b[44;34m"\r
+#define AAGREEN        "\x1b[42;32m"\r
+#define AAYELLOW       "\x1b[43;33m"\r
+#define AAGREY         "\x1b[47;37m"\r
+#define AABLACK        "\x1b[40;30m"\r
+#define AAWHITE                "\x1b[47;37m"\r
+#define AAMAGENTA      "\x1b[45;35m"\r
+#define AARESET        "\x1b[0m"\r
+\r
 /* local function */\r
 void wait(clock_t wait);\r
 \r

diff --git a/src/lib/16_mm.h b/src/lib/16_mm.h
index 23daa0bb1b231b090f967b4acfa729b713800f61..de35b428b6197884a9ead179cce0d1e9c0e388ad 100755 (executable)
--- a/src/lib/16_mm.h
+++ b/src/lib/16_mm.h
@@ -39,16 +39,6 @@
 
 #define FREEBLOCK(x) {*x->useptr=NULL;x->next=mm->mmfree;mm->mmfree=x;}
 
-#define AARED          "\x1b[41;31m"
-#define AABLUE         "\x1b[44;34m"
-#define AAGREEN        "\x1b[42;32m"
-#define AAYELLOW       "\x1b[43;33m"
-#define AAGREY         "\x1b[47;37m"
-#define AABLACK        "\x1b[40;30m"
-#define AAWHITE                "\x1b[47;37m"
-#define AAMAGENTA      "\x1b[45;35m"
-#define AARESET        "\x1b[0m"
-
 #define SAVENEARHEAP   0x200           // space to leave in data segment
 #define SAVEFARHEAP    0//x400                 // space to leave in far heap
 

diff --git a/src/lib/modex16.c b/src/lib/modex16.c
index b8e603bbffde2201412ac5f7e9f4e34c55351ca2..9403ce7c26a06efbe1ff1304a7178c57465b6e82 100755 (executable)
--- a/src/lib/modex16.c
+++ b/src/lib/modex16.c
@@ -115,14 +115,14 @@ modexEnter(sword vq, global_game_variables_t *gv)
                        }\r
                break;\r
                case 2:\r
-                       CRTParmCount = sizeof(ModeX_192x144regs) / sizeof(ModeX_192x144regs[0]);\r
+                       CRTParmCount = sizeof(ModeX_160x120regs) / sizeof(ModeX_160x120regs[0]);\r
                        /* width and height */\r
-                       gv->video.page[0].sw=192;\r
-                       gv->video.page[0].sh=144;\r
+                       gv->video.page[0].sw=120;\r
+                       gv->video.page[0].sh=160;\r
 \r
                        /* send the CRTParms */\r
                        for(i=0; i<CRTParmCount; i++) {\r
-                               outpw(CRTC_INDEX, ModeX_192x144regs[i]);\r
+                               outpw(CRTC_INDEX, ModeX_160x120regs[i]);\r
                        }\r
 \r
                        /* clear video memory */\r
@@ -148,6 +148,23 @@ modexEnter(sword vq, global_game_variables_t *gv)
                                ptr[i] = 0x0000;\r
                        }\r
                break;\r
+               case 4:\r
+                       CRTParmCount = sizeof(ModeX_192x144regs) / sizeof(ModeX_192x144regs[0]);\r
+                       /* width and height */\r
+                       gv->video.page[0].sw=192;\r
+                       gv->video.page[0].sh=144;\r
+\r
+                       /* send the CRTParms */\r
+                       for(i=0; i<CRTParmCount; i++) {\r
+                               outpw(CRTC_INDEX, ModeX_192x144regs[i]);\r
+                       }\r
+\r
+                       /* clear video memory */\r
+                       outpw(SC_INDEX, 0x0f02);\r
+                       for(i=0; i<0x8000; i++) {\r
+                               ptr[i] = 0x0000;\r
+                       }\r
+               break;\r
                case 5:\r
                        CRTParmCount = sizeof(ModeX_256x192regs) / sizeof(ModeX_256x192regs[0]);\r
                        /* width and height */\r

diff --git a/src/lib/modex16.h b/src/lib/modex16.h
index fbcc398200fc2013cf099cd2882852296139bf9e..cd134b471cd09987bbc0c00a2b993240ea7b1959 100755 (executable)
--- a/src/lib/modex16.h
+++ b/src/lib/modex16.h
@@ -35,6 +35,7 @@
 #include "src/lib/modex16/320x200.h"
 #include "src/lib/modex16/256x192.h"
 #include "src/lib/modex16/192x144_.h"
+#include "src/lib/modex16/160x120.h"
 
 //320x240 = 20x15
 //192x144 = 12x9

diff --git a/src/lib/modex16/160x120.h b/src/lib/modex16/160x120.h
index fc5a764d8bfe58f18f8d4776a05fb4b06d9be1e6..04253da677613e32f8b6dbe42854e10997ff480f 100755 (executable)
--- a/src/lib/modex16/160x120.h
+++ b/src/lib/modex16/160x120.h
@@ -20,8 +20,8 @@
  *\r
  */\r
 \r
-#ifndef _SMALLMODEXRESS_H_\r
-#define _SMALLMODEXRESS_H_\r
+#ifndef _SMALLMODEXREST_H_\r
+#define _SMALLMODEXREST_H_\r
 \r
 #include "src/lib/types.h"\r
 \r
@@ -54,27 +54,27 @@
        0x3c0, 0x13, 0x00\r
 };*/\r
 \r
-static const word ModeX_192x144regs[] = {\r
-       0x3f00,         /* Horizontal total */\r
-       0x2f01,         /* horizontal display enable end */\r
-       0x3002,         /* Start horizontal blanking */\r
-       0x0003,         /* End horizontal blanking */\r
-       0x3404,         /* Start horizontal retrace */\r
-       0x4805,         /* End horizontal retrace */\r
+static const word ModeX_160x120regs[] = {\r
+       0x3200,         /* Horizontal total */\r
+       0x2701,         /* horizontal display enable end */\r
+       0x2802,         /* Start horizontal blanking */\r
+       0x2003,         /* End horizontal blanking */\r
+       0x2b04,         /* Start horizontal retrace */\r
+       0x7005,         /* End horizontal retrace */\r
        0x0d06,          /* vertical total */\r
        0x3e07,          /* overflow (bit 8 of vertical counts) */\r
-       0x4109,          /* cell height (2 to double-scan */\r
+       0x4309,          /* cell height (2 to double-scan */\r
        0xea10,          /* v sync start */\r
        0xac11,          /* v sync end and protect cr0-cr7 */\r
-       0x1f12,          /* vertical displayed */\r
-       0x1813,         /* offset/logical width */\r
+       0xdf12,          /* vertical displayed */\r
+       0x1413,         /* offset/logical width */\r
        0x0014,          /* turn off dword mode */\r
        0xe715,          /* v blank start */\r
        0x0616,          /* v blank end */\r
        0xe317            /* turn on byte mode */\r
 };//50 => 30\r
 \r
-#endif /*_SMALLMODEXRESS_H_*/\r
+#endif /*_SMALLMODEXREST_H_*/\r
 /*#include "TwkUser.h" // get Register definition\r
 Register 192x144[] =\r
        {\r

diff --git a/src/lib/modex16/192x144.h b/src/lib/modex16/192x144.h
index a6f645e68bb16c575df56f54c1f5cf9697de7de5..8271a0db4b16034e143d8a0e520d40be0787a89e 100755 (executable)
--- a/src/lib/modex16/192x144.h
+++ b/src/lib/modex16/192x144.h
@@ -20,8 +20,8 @@
  *\r
  */\r
 \r
-#ifndef _SMALLMODEXRES_H_\r
-#define _SMALLMODEXRES_H_\r
+#ifndef _SMALLMODEXRESS_H_\r
+#define _SMALLMODEXRESS_H_\r
 \r
 #include "src/lib/types.h"\r
 \r
@@ -55,12 +55,12 @@
 };*/\r
 \r
 static const word ModeX_192x144regs[] = {\r
-       0x5f00,         /* Horizontal total */\r
-       0x2f01,         /* horizontal display enable end */\r
-       0x5002,         /* Start horizontal blanking */\r
-       0x8203,         /* End horizontal blanking */\r
-       0x5404,         /* Start horizontal retrace */\r
-       0x8005,         /* End horizontal retrace */\r
+       0x3f00,         /* Horizontal total */\r
+       0x2701,         /* horizontal display enable end */\r
+       0x3002,         /* Start horizontal blanking */\r
+       0x0003,         /* End horizontal blanking */\r
+       0x3404,         /* Start horizontal retrace */\r
+       0x4805,         /* End horizontal retrace */\r
        0x0d06,          /* vertical total */\r
        0x3e07,          /* overflow (bit 8 of vertical counts) */\r
        0x4109,          /* cell height (2 to double-scan */\r
@@ -74,17 +74,16 @@ static const word ModeX_192x144regs[] = {
        0xe317            /* turn on byte mode */\r
 };//50 => 30\r
 \r
-#endif /*_SMALLMODEXRES_H_*/\r
-/*\r
-192x144[] =\r
+#endif /*_SMALLMODEXRESS_H_*/\r
+/*#include "TwkUser.h" // get Register definition\r
+Register 192x144[] =\r
        {\r
-       { 0x3c2, 0x0, 0xe3},\r
        { 0x3d4, 0x0, 0x3f},\r
        { 0x3d4, 0x1, 0x2f},\r
-       { 0x3d4, 0x2, 0x50},\r
-       { 0x3d4, 0x3, 0x82},\r
-       { 0x3d4, 0x4, 0x54},\r
-       { 0x3d4, 0x5, 0x80},\r
+       { 0x3d4, 0x2, 0x30},\r
+       { 0x3d4, 0x3, 0x0},\r
+       { 0x3d4, 0x4, 0x34},\r
+       { 0x3d4, 0x5, 0x48},\r
        { 0x3d4, 0x6, 0xd},\r
        { 0x3d4, 0x7, 0x3e},\r
        { 0x3d4, 0x8, 0x0},\r
@@ -102,6 +101,6 @@ static const word ModeX_192x144regs[] = {
        { 0x3ce, 0x5, 0x40},\r
        { 0x3ce, 0x6, 0x5},\r
        { 0x3c0, 0x10, 0x41},\r
+       { 0x3c0, 0x11, 0xe},\r
        { 0x3c0, 0x13, 0x0}\r
-       };\r
-*/\r
+       };*/\r

diff --git a/src/lib/modex16/192x144_.h b/src/lib/modex16/192x144_.h
index fc5a764d8bfe58f18f8d4776a05fb4b06d9be1e6..a6f645e68bb16c575df56f54c1f5cf9697de7de5 100755 (executable)
--- a/src/lib/modex16/192x144_.h
+++ b/src/lib/modex16/192x144_.h
@@ -20,8 +20,8 @@
  *\r
  */\r
 \r
-#ifndef _SMALLMODEXRESS_H_\r
-#define _SMALLMODEXRESS_H_\r
+#ifndef _SMALLMODEXRES_H_\r
+#define _SMALLMODEXRES_H_\r
 \r
 #include "src/lib/types.h"\r
 \r
@@ -55,12 +55,12 @@
 };*/\r
 \r
 static const word ModeX_192x144regs[] = {\r
-       0x3f00,         /* Horizontal total */\r
+       0x5f00,         /* Horizontal total */\r
        0x2f01,         /* horizontal display enable end */\r
-       0x3002,         /* Start horizontal blanking */\r
-       0x0003,         /* End horizontal blanking */\r
-       0x3404,         /* Start horizontal retrace */\r
-       0x4805,         /* End horizontal retrace */\r
+       0x5002,         /* Start horizontal blanking */\r
+       0x8203,         /* End horizontal blanking */\r
+       0x5404,         /* Start horizontal retrace */\r
+       0x8005,         /* End horizontal retrace */\r
        0x0d06,          /* vertical total */\r
        0x3e07,          /* overflow (bit 8 of vertical counts) */\r
        0x4109,          /* cell height (2 to double-scan */\r
@@ -74,16 +74,17 @@ static const word ModeX_192x144regs[] = {
        0xe317            /* turn on byte mode */\r
 };//50 => 30\r
 \r
-#endif /*_SMALLMODEXRESS_H_*/\r
-/*#include "TwkUser.h" // get Register definition\r
-Register 192x144[] =\r
+#endif /*_SMALLMODEXRES_H_*/\r
+/*\r
+192x144[] =\r
        {\r
+       { 0x3c2, 0x0, 0xe3},\r
        { 0x3d4, 0x0, 0x3f},\r
        { 0x3d4, 0x1, 0x2f},\r
-       { 0x3d4, 0x2, 0x30},\r
-       { 0x3d4, 0x3, 0x0},\r
-       { 0x3d4, 0x4, 0x34},\r
-       { 0x3d4, 0x5, 0x48},\r
+       { 0x3d4, 0x2, 0x50},\r
+       { 0x3d4, 0x3, 0x82},\r
+       { 0x3d4, 0x4, 0x54},\r
+       { 0x3d4, 0x5, 0x80},\r
        { 0x3d4, 0x6, 0xd},\r
        { 0x3d4, 0x7, 0x3e},\r
        { 0x3d4, 0x8, 0x0},\r
@@ -101,6 +102,6 @@ Register 192x144[] =
        { 0x3ce, 0x5, 0x40},\r
        { 0x3ce, 0x6, 0x5},\r
        { 0x3c0, 0x10, 0x41},\r
-       { 0x3c0, 0x11, 0xe},\r
        { 0x3c0, 0x13, 0x0}\r
-       };*/\r
+       };\r
+*/\r

diff --git a/src/pcxtest0.c b/src/pcxtest0.c
new file mode 100755 (executable)
index 0000000..f5efc3c
--- /dev/null
+++ b/src/pcxtest0.c
@@ -0,0 +1,143 @@
+/* Project 16 Source Code~\r
+ * Copyright (C) 2012-2015 sparky4 & pngwen & andrius4669\r
+ *\r
+ * This file is part of Project 16.\r
+ *\r
+ * Project 16 is free software; you can redistribute it and/or modify\r
+ * it under the terms of the GNU General Public License as published by\r
+ * the Free Software Foundation; either version 3 of the License, or\r
+ * (at your option) any later version.\r
+ *\r
+ * Project 16 is distributed in the hope that it will be useful,\r
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of\r
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the\r
+ * GNU General Public License for more details.\r
+ *\r
+ * You should have received a copy of the GNU General Public License\r
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>, or\r
+ * write to the Free Software Foundation, Inc., 51 Franklin Street,\r
+ * Fifth Floor, Boston, MA 02110-1301 USA.\r
+ *\r
+ */\r
+\r
+#include <stdio.h>\r
+#include <dos.h>\r
+#include <string.h>\r
+#include "src/lib/modex16.h"\r
+#include "src/lib/bitmap.h"\r
+#include "src/lib/planar.h"\r
+\r
+global_game_variables_t gvar;\r
+\r
+/*\r
+void\r
+DrawPBuf(page_t *page, int x, int y, planar_buf_t *p, byte sprite)\r
+{\r
+       byte plane;\r
+       word px, py;\r
+       word offset;\r
+\r
+       // TODO Make this fast.  It's SLOOOOOOW\r
+       for(plane=0; plane < 4; plane++) {\r
+       modexSelectPlane(PLANE(plane+x));\r
+       for(px = plane; px < p->width; px+=4) {\r
+               offset=px;\r
+               for(py=0; py<p->height/2; py++) {\r
+               SELECT_ALL_PLANES();\r
+               if(!sprite || p->plane[offset])\r
+                       page->data = p->plane;\r
+               //offset+=p->width;\r
+               //offset++;\r
+               }\r
+       }\r
+       }\r
+}\r
+*/\r
+\r
+void main() {\r
+       bitmap_t bmp;\r
+       planar_buf_t *p;\r
+       int i;\r
+       word start;\r
+       int plane;\r
+       float t1, t2;\r
+\r
+//0000 bmp = bitmapLoadPcx("data/koishi~~.pcx");\r
+//     bmp = bitmapLoadPcx("data/chikyuu.pcx");\r
+       bmp = bitmapLoadPcx("data/koishi^^.pcx");\r
+//     bmp = bitmapLoadPcx("16/PCX_LIB/chikyuu.pcx");\r
+       p = planar_buf_from_bitmap(&bmp);\r
+       VGAmodeX(1, &gvar);\r
+       gvar.video.page[0]=modexDefaultPage(&gvar.video.page[0]);\r
+       gvar.video.page[0].sw+=32;\r
+       gvar.video.page[0].sh+=32;\r
+\r
+       /* fix up the palette and everything */\r
+       modexPalUpdate1(bmp.palette);\r
+\r
+       /* clear and draw one sprite and one bitmap */\r
+       modexClearRegion(&gvar.video.page[0], 0, 0, gvar.video.page[0].sw, gvar.video.page[0].sh, 1);\r
+\r
+       /* update display~*/\r
+       gvar.video.page[0].dx+=16;\r
+       gvar.video.page[0].dy+=16;\r
+       modexShowPage(&gvar.video.page[0]);\r
+\r
+       /* non sprite comparison */\r
+       start = *clockw;\r
+       //for(i=0; i<100 ;i++) {\r
+               oldDrawBmp(VGA, 20, 20, &bmp, 0);\r
+       //}\r
+\r
+       start = *clockw;\r
+       //for(i=0; i<100 ;i++) {\r
+//0000         modexDrawBmp(&gvar.video.page[0], 20, 20, &bmp);\r
+               modexDrawBmp(&gvar.video.page[0], 160, 120, &bmp);\r
+       //}\r
+       t1 = (*clockw-start) /18.2;\r
+\r
+       start = *clockw;\r
+       //for(i=0; i<100; i++) {\r
+//0000         modexCopyPageRegion(&gvar.video.page[0], &gvar.video.page[0], 20, 20, 128, 20, 64, 64);\r
+               modexCopyPageRegion(&gvar.video.page[0], &gvar.video.page[0], 0, 0, 0, 0, 320, 240);\r
+       //}\r
+       t2 = (*clockw-start)/18.2;\r
+\r
+\r
+       start = *clockw;\r
+       //for(i=0; i<100 ;i++) {\r
+               oldDrawBmp(VGA, 20, 20, &bmp, 1);\r
+       //}\r
+\r
+\r
+       start = *clockw;\r
+       //for(i=0; i<100 ;i++) {\r
+//0000         modexDrawSprite(&gvar.video.page[0], 20, 20, &bmp);\r
+               modexDrawSprite(&gvar.video.page[0], 160, 120, &bmp);\r
+       //}\r
+       //_fmemset(MK_FP(0xA000, 0), (int)p->plane, gvar.video.page[0].sw*(gvar.video.page[0].sh*2));\r
+       //modexDrawBmp(&gvar.video.page[0], 0, 0, &bmp);\r
+       while(!kbhit())\r
+       {\r
+               //DrawPBuf(&gvar.video.page[0], 0, 0, p, 0);\r
+       }\r
+       VGAmodeX(0, &gvar);\r
+       /*printf("\nmain=%Fp\n\n", &i);\r
+       printf("bmp.data=%Fp\n", bmp.data);\r
+       printf("*bmp.data=%Fp\n", *(bmp.data));\r
+       printf("&bmp.data=%Fp\n", &(bmp.data));\r
+\r
+       printf("\n%d\n", sizeof(p->plane));\r
+       printf("%d\n", sizeof(bmp));*/\r
+\r
+       /*for(i=0; i<(320*240); i++)\r
+       {\r
+               fprintf(stdout, "%d", bmp.data[i]);\r
+               if(i%bmp.width==0) fprintf(stdout, "\n");\r
+       }*/\r
+       printf("CPU to VGA: %f\n", t1);\r
+       printf("VGA to VGA: %f\n", t2);\r
+       printf("gvar.video.page[0].width: %u\n", gvar.video.page[0].width);\r
+       printf("gvar.video.page[0].height: %u\n", gvar.video.page[0].height);\r
+       return;\r
+}\r

diff --git a/test.exe b/test.exe
index a3d4a5904b55b5b13d481fb15b71536113de4afa..3b6a85100a9bb731562b45a73a34c586c4d1efc1 100755 (executable)
Binary files a/test.exe and b/test.exe differ

diff --git a/test2.exe b/test2.exe
index 0d3af2a4b55eac1b0ec184493b70e3304984119e..33a72c8590da247f707e31fa12e587cff1680bdf 100755 (executable)
Binary files a/test2.exe and b/test2.exe differ

diff --git a/tesutobakapee.exe b/tesutobakapee.exe
index 4e0a1ea5045b0a2e34e6ea5de1b7d67f6c77ad44..e667a14337ce9c4155d7a403f25283e5d4ce7a64 100755 (executable)
Binary files a/tesutobakapee.exe and b/tesutobakapee.exe differ

diff --git a/vgmtest.exe b/vgmtest.exe
index f0bd57fe2b907ea1cf5068ee28e87c583c1b10f0..ddce9f04a170b1cf111c17aff7959946ec81dc35 100755 (executable)
Binary files a/vgmtest.exe and b/vgmtest.exe differ