X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=pico%2F32x%2Fdraw.c;h=e20238e4dacb13d1c36b1c52c0944d541ef1616c;hb=99bdfd31b8708f8059fbc16ec8be90cb8d7c8bc3;hp=48908d8335efda380f8a031d62a108f3d1cfc8a6;hpb=7a961c19baab782879b7428e9a467113603b31c1;p=picodrive.git

diff --git a/pico/32x/draw.c b/pico/32x/draw.c
index 48908d8..e20238e 100644
--- a/pico/32x/draw.c
+++ b/pico/32x/draw.c
@@ -1,3 +1,10 @@
+/*
+ * PicoDrive
+ * (C) notaz, 2009,2010
+ *
+ * This work is licensed under the terms of MAME license.
+ * See COPYING file in the top-level directory.
+ */
 #include "../pico_int.h"
 
 int (*PicoScan32xBegin)(unsigned int num);
@@ -36,7 +43,7 @@ static void convert_pal555(int invert_prio)
                                                                   \
   for (i = 320; i > 0; i--, pd++, p32x++, pmd++) {                \
     unsigned short t = *p32x;                                     \
-    if (*pmd != mdbg && !((t ^ inv) & 0x8000)) {                  \
+    if ((*pmd & 0x3f) != mdbg && !((t ^ inv) & 0x8000)) {         \
       pmd_draw_code;                                              \
       continue;                                                   \
     }                                                             \
@@ -52,7 +59,7 @@ static void convert_pal555(int invert_prio)
   int i;                                                          \
   for (i = 320; i > 0; i--, pd++, p32x++, pmd++) {                \
     t = pal[*(unsigned char *)((long)p32x ^ 1)];                  \
-    if ((t & 0x20) || *pmd == mdbg)                               \
+    if ((t & 0x20) || (*pmd & 0x3f) == mdbg)                      \
       *pd = t;                                                    \
     else                                                          \
       pmd_draw_code;                                              \
@@ -67,7 +74,7 @@ static void convert_pal555(int invert_prio)
   for (i = 320; i > 0; p32x++) {                                  \
     t = pal[*p32x & 0xff];                                        \
     for (len = (*p32x >> 8) + 1; len > 0 && i > 0; len--, i--, pd++, pmd++) { \
-      if (*pmd == mdbg || (t & 0x20))                             \
+      if ((*pmd & 0x3f) == mdbg || (t & 0x20))                    \
         *pd = t;                                                  \
       else                                                        \
         pmd_draw_code;                                            \
@@ -75,15 +82,16 @@ static void convert_pal555(int invert_prio)
   }                                                               \
 }
 
-void FinalizeLine32xRGB555(int sh, int line)
+// this is almost never used (Wiz and menu bg gen only)
+void FinalizeLine32xRGB555(int sh, int line, struct PicoEState *est)
 {
-  unsigned short *pd = DrawLineDest;
+  unsigned short *pd = est->DrawLineDest;
   unsigned short *pal = Pico32xMem->pal_native;
-  unsigned char  *pmd = HighCol + 8;
+  unsigned char  *pmd = est->HighCol + 8;
   unsigned short *dram, *p32x;
   unsigned char   mdbg;
 
-  FinalizeLine555(sh, line);
+  FinalizeLine555(sh, line, est);
 
   if ((Pico32x.vdp_regs[0] & P32XV_Mx) == 0 || // 32x blanking
       // XXX: how is 32col mode hadled by real hardware?
@@ -122,7 +130,7 @@ void FinalizeLine32xRGB555(int sh, int line)
 
 #define PICOSCAN_PRE \
   PicoScan32xBegin(l + (lines_sft_offs & 0xff)); \
-  dst = DrawLineDest; \
+  dst = Pico.est.DrawLineDest; \
 
 #define PICOSCAN_POST \
   PicoScan32xEnd(l + (lines_sft_offs & 0xff)); \
@@ -220,7 +228,7 @@ void PicoDraw32xLayer(int offs, int lines, int md_bg)
   int lines_sft_offs;
   int which_func;
 
-  DrawLineDest = (char *)DrawLineDestBase + offs * DrawLineDestIncrement;
+  Pico.est.DrawLineDest = (char *)DrawLineDestBase + offs * DrawLineDestIncrement;
   dram = Pico32xMem->dram[Pico32x.vdp_regs[0x0a/2] & P32XV_FS];
 
   if (Pico32xDrawMode == PDM32X_BOTH) {
@@ -258,7 +266,7 @@ do_it:
   if (Pico32x.vdp_regs[2 / 2] & P32XV_SFT)
     lines_sft_offs |= 1 << 8;
 
-  do_loop[which_func](DrawLineDest, dram, lines_sft_offs, md_bg);
+  do_loop[which_func](Pico.est.DrawLineDest, dram, lines_sft_offs, md_bg);
 }
 
 // mostly unused, games tend to keep 32X layer on
@@ -284,7 +292,7 @@ void PicoDraw32xLayerMdOnly(int offs, int lines)
   for (l = 0; l < lines; l++) {
     if (have_scan) {
       PicoScan32xBegin(l + offs);
-      dst = DrawLineDest + poffs;
+      dst = Pico.est.DrawLineDest + poffs;
     }
     for (p = 0; p < plen; p += 4) {
       dst[p + 0] = pal[*pmd++];
@@ -299,20 +307,23 @@ void PicoDraw32xLayerMdOnly(int offs, int lines)
   }
 }
 
-void PicoDraw32xSetFrameMode(int is_on, int only_32x)
+void PicoDrawSetOutFormat32x(pdso_t which, int use_32x_line_mode)
 {
 #ifdef _ASM_32X_DRAW
   extern void *Pico32xNativePal;
   Pico32xNativePal = Pico32xMem->pal_native;
 #endif
 
-  if (is_on) {
-    // use the same layout as alt renderer
-    PicoDrawSetInternalBuf(PicoDraw2FB + 328*8, 328);
-    Pico32xDrawMode = only_32x ? PDM32X_32X_ONLY : PDM32X_BOTH;
-  } else {
+  if (which == PDF_RGB555 && use_32x_line_mode) {
+    // we'll draw via FinalizeLine32xRGB555 (rare)
     PicoDrawSetInternalBuf(NULL, 0);
     Pico32xDrawMode = PDM32X_OFF;
+    return;
   }
+
+  // use the same layout as alt renderer
+  PicoDrawSetInternalBuf(PicoDraw2FB, 328);
+  Pico32xDrawMode = (which == PDF_RGB555) ? PDM32X_32X_ONLY : PDM32X_BOTH;
 }
 
+// vim:shiftwidth=2:ts=2:expandtab