puae 2.3.0

src/custom.c

@@ -33,6 +33,7 @@
 #include "autoconf.h"
 #include "traps.h"
 #include "gui.h"
+#include "gfxdep/gfx.h"
 #include "picasso96.h"
 #include "drawing.h"
 #include "savestate.h"

src/gfx-sdl/gfx.h

@@ -9,3 +9,4 @@
 #define GFX_NAME "sdl"
 #define USE_SDL_GFX
 #define PICASSO96_SUPPORTED
+#define PICASSO96

src/gfx-sdl/sdlgfx.c

@@ -92,8 +92,8 @@ static SDL_Rect screenmode[MAX_SDL_SCREENMODE];
 static int mode_count;
 
 
-static int red_bits, green_bits, blue_bits;
-static int red_shift, green_shift, blue_shift;
+static int red_bits, green_bits, blue_bits, alpha_bits;
+static int red_shift, green_shift, blue_shift, alpha_shift;
 
 #ifdef PICASSO96
 static int screen_is_picasso;
@@ -389,6 +389,27 @@ static int find_best_mode (int *width, int *height, int depth, int fullscreen)
 }
 
 #ifdef PICASSO96
+
+int picasso_palette (void)
+{
+        int i, changed;
+
+        changed = 0;
+        for (i = 0; i < 256; i++) {
+                int r = picasso96_state.CLUT[i].Red;
+                int g = picasso96_state.CLUT[i].Green;
+                int b = picasso96_state.CLUT[i].Blue;
+                uae_u32 v = (doMask256 (r, red_bits, red_shift)
+                        | doMask256 (g, green_bits, green_shift)
+                        | doMask256 (b, blue_bits, blue_shift))
+                        | doMask256 (0xff, alpha_bits, alpha_shift);
+                if (v !=  picasso_vidinfo.clut[i]) {
+                        picasso_vidinfo.clut[i] = v;
+                        changed = 1;
+                }
+        }
+        return changed;
+}
 /*
  * Map an SDL pixel format to a P96 pixel format
  */

src/misc.c

@@ -1236,8 +1236,6 @@ void addmode (struct MultiDisplay *md, int w, int h, int d, int rate, int nondx)
                 md->DisplayModes[i].res.width, md->DisplayModes[i].res.height, md->DisplayModes[i].depth * 8);
 }
 
-
-
 //dxwrap
 int DirectDraw_CurrentRefreshRate (void)
 {

src/sysconfig.h

@@ -456,4 +456,3 @@
 /* Define to empty if the keyword `volatile' does not work. Warning: valid
    code using `volatile' can become incorrect without. Disable with care. */
 /* #undef volatile */
-#define PICASSO96

src/tools/config.log

@@ -445,7 +445,7 @@ configure:4344: $? = 0
 configure:4344: result: yes
 configure:4350: checking for _doprnt
 configure:4350: gcc -o conftest -g -O2 -Wall -W -Wno-unused   conftest.c  >&5
-/tmp/cc3ddsdl.o: In function `main':
+/tmp/cctA4xTI.o: In function `main':
 /home/gnostic/puaex/src/tools/conftest.c:67: undefined reference to `_doprnt'
 collect2: ld returned 1 exit status
 configure:4350: $? = 1
@@ -533,7 +533,7 @@ configure:4364: $? = 0
 configure:4364: result: yes
 configure:4364: checking for strcmpi
 configure:4364: gcc -o conftest -g -O2 -Wall -W -Wno-unused   conftest.c  >&5
-/tmp/ccyjfxIA.o: In function `main':
+/tmp/cc0VeH5X.o: In function `main':
 /home/gnostic/puaex/src/tools/conftest.c:69: undefined reference to `strcmpi'
 collect2: ld returned 1 exit status
 configure:4364: $? = 1
@@ -613,7 +613,7 @@ configure: failed program was:
 configure:4364: result: no
 configure:4364: checking for stricmp
 configure:4364: gcc -o conftest -g -O2 -Wall -W -Wno-unused   conftest.c  >&5
-/tmp/ccs8WUKF.o: In function `main':
+/tmp/ccAFSU92.o: In function `main':
 /home/gnostic/puaex/src/tools/conftest.c:69: undefined reference to `stricmp'
 collect2: ld returned 1 exit status
 configure:4364: $? = 1