#define LINE_WIDTH 328\r
#endif\r
\r
-int currpri = 0;\r
-\r
static int HighCache2A[41*(TILE_ROWS+1)+1+1]; // caches for high layers\r
static int HighCache2B[41*(TILE_ROWS+1)+1+1];\r
\r
code=Pico.vram[nametab_row+(tilex&xmask)];\r
if (code==blank) continue;\r
\r
-#ifdef USE_CACHE\r
if (code>>15) { // high priority tile\r
*hcache++ = code|(dx<<16)|(trow<<27); // cache it\r
-#else\r
- if ((code>>15) != currpri) {\r
-#endif\r
continue;\r
}\r
\r
}\r
#endif\r
\r
-static void DrawDisplayFull()\r
+static void DrawDisplayFull(void)\r
{\r
struct PicoVideo *pvid=&Pico.video;\r
int win, edge=0, hvwin=0; // LSb->MSb: hwin&plane, vwin&plane, full\r
}\r
\r
// horizontal window?\r
- if((win=pvid->reg[0x12])) {\r
+ if ((win=pvid->reg[0x12]))\r
+ {\r
hvwin=1; // hwindow shares display with plane A\r
edge=win&0x1f;\r
if(win == 0x80) {\r
}\r
\r
// check for vertical window, but only if win is not fullscreen\r
- if(hvwin != 4) {\r
+ if (hvwin != 4)\r
+ {\r
win=pvid->reg[0x11];\r
edge=win&0x1f;\r
if (win&0x80) {\r
}\r
}\r
\r
- if(hvwin==1) { winend|=maxcolc<<16; planeend|=maxcolc<<16; }\r
+ if (hvwin==1) { winend|=maxcolc<<16; planeend|=maxcolc<<16; }\r
\r
- currpri = 0;\r
- DrawLayerFull(1, HighCache2B, START_ROW, (maxcolc<<16)|END_ROW);\r
- switch(hvwin) {\r
+ HighCache2A[1] = HighCache2B[1] = 0;\r
+ if (PicoDrawMask & PDRAW_LAYERB_ON)\r
+ DrawLayerFull(1, HighCache2B, START_ROW, (maxcolc<<16)|END_ROW);\r
+ if (PicoDrawMask & PDRAW_LAYERA_ON) switch (hvwin)\r
+ {\r
case 4:\r
// fullscreen window\r
DrawWindowFull(START_ROW, (maxcolc<<16)|END_ROW, 0);\r
- HighCache2A[1] = 0;\r
break;\r
\r
case 3:\r
DrawLayerFull(0, HighCache2A, START_ROW, (maxcolc<<16)|END_ROW);\r
break;\r
}\r
- DrawAllSpritesFull(0, maxw);\r
+ if (PicoDrawMask & PDRAW_SPRITES_LOW_ON)\r
+ DrawAllSpritesFull(0, maxw);\r
\r
-#ifdef USE_CACHE\r
- if(HighCache2B[1]) DrawTilesFromCacheF(HighCache2B);\r
- if(HighCache2A[1]) DrawTilesFromCacheF(HighCache2A);\r
- switch(hvwin) {\r
+ if (HighCache2B[1]) DrawTilesFromCacheF(HighCache2B);\r
+ if (HighCache2A[1]) DrawTilesFromCacheF(HighCache2A);\r
+ if (PicoDrawMask & PDRAW_LAYERA_ON) switch (hvwin)\r
+ {\r
case 4:\r
// fullscreen window\r
DrawWindowFull(START_ROW, (maxcolc<<16)|END_ROW, 1);\r
DrawWindowFull(winstart, winend, 1);\r
break;\r
}\r
-#else\r
- currpri = 1;\r
- // TODO\r
-#endif\r
- DrawAllSpritesFull(1, maxw);\r
+ if (PicoDrawMask & PDRAW_SPRITES_HI_ON)\r
+ DrawAllSpritesFull(1, maxw);\r
}\r
\r
\r
PICO_INTERNAL void PicoFrameFull()\r
{\r
// prepare cram?\r
- if(PicoPrepareCram) PicoPrepareCram();\r
+ if (PicoPrepareCram) PicoPrepareCram();\r
\r
// Draw screen:\r
BackFillFull(Pico.video.reg[7]);\r