--- uae/src/include/picasso96.h	2018/04/24 16:40:14	1.1
+++ uae/src/include/picasso96.h	2018/04/24 17:02:24	1.1.1.4
@@ -15,6 +15,26 @@
 #define COMP 2
 #define INVERS 4
 
+typedef enum {
+    BLIT_FALSE,
+    BLIT_NOR,
+    BLIT_ONLYDST,
+    BLIT_NOTSRC,
+    BLIT_ONLYSRC,
+    BLIT_NOTDST,
+    BLIT_EOR,
+    BLIT_NAND,
+    BLIT_AND,
+    BLIT_NEOR,
+    BLIT_DST,
+    BLIT_NOTONLYSRC,
+    BLIT_SRC,
+    BLIT_NOTONLYDST,
+    BLIT_OR,
+    BLIT_TRUE,
+    BLIT_LAST
+} BLIT_OPCODE;
+
 struct ScreenResolution
 {
     uae_u32 width;  /* in pixels */
@@ -88,6 +108,12 @@ typedef enum {
 #define RGBFF_Y4U2V2	(1<<RGBFB_Y4U2V2)
 #define RGBFF_Y4U1V1	(1<<RGBFB_Y4U1V1)
 
+#define RGBMASK_8BIT RGBFF_CLUT
+#define RGBMASK_16BIT (RGBFF_R5G6B5PC | RGBFF_B5G6R5PC | RGBFF_R5G6B5)
+#define RGBMASK_15BIT (RGBFF_R5G5B5PC | RGBFF_B5G5R5PC | RGBFF_R5G5B5)
+#define RGBMASK_24BIT (RGBFF_R8G8B8 | RGBFF_B8G8R8)
+#define RGBMASK_32BIT (RGBFF_A8R8G8B8 | RGBFF_A8B8G8R8 | RGBFF_R8G8B8A8 | RGBFF_B8G8R8A8)
+
 /************************************************************************/
 
 #define	RGBFF_PLANAR	RGBFF_NONE
@@ -98,7 +124,7 @@ typedef enum {
 
 /************************************************************************/
 
-enum{
+enum {
     PLANAR,
     CHUNKY,
     HICOLOR,
@@ -147,9 +173,9 @@ struct BitMap
 /************************************************************************/
 
 #define	SETTINGSNAMEMAXCHARS		30
-#define	BOARDNAMEMAXCHARS			30
+#define	BOARDNAMEMAXCHARS		30
 
-struct Settings{
+struct Settings {
     uae_u32					BoardType;
     /* a value discribing assignment to nth board local to boardtype
      * to be used for reassignment when boards are added or removed.  */
@@ -176,7 +202,7 @@ struct Settings{
 #define PSSO_LibResolution_BoardInfo (52 + MAXMODES*4)
 #define PSSO_LibResolution_sizeof (60 + MAXMODES*4)
 
-struct LibResolution{
+struct LibResolution {
     char P96ID[6];
     char Name[MAXRESOLUTIONNAMELENGTH];
     uae_u32 DisplayID;
@@ -220,7 +246,7 @@ struct LibResolution{
 #define PSSO_RenderInfo_BytesPerRow 4
 #define PSSO_RenderInfo_pad 6
 #define PSSO_RenderInfo_RGBFormat 8
-#define PSSO_RenderInfo_sizeof /* ??? */
+#define PSSO_RenderInfo_sizeof 12
 
 struct RenderInfo {
     uae_u8 *Memory;
@@ -254,12 +280,12 @@ struct Pattern {
 #define PSSO_Template_sizeof 16
 
 struct Template {
-	char *Memory;
-	uae_s16 BytesPerRow;
-	uae_u8 XOffset;
-	uae_u8 DrawMode;
-	uae_u32 FgPen;
-	uae_u32 BgPen;
+    char *Memory;
+    uae_s16 BytesPerRow;
+    uae_u8 XOffset;
+    uae_u8 DrawMode;
+    uae_u32 FgPen;
+    uae_u32 BgPen;
 };
 
 #define PSSO_BoardInfo_MemoryBase 4
@@ -298,7 +324,7 @@ struct Template {
 #define PSSO_BoardInfo_ModeInfo (202 + 12*MAXMODES + 12 + 68*4 + 12)
 #define PSSO_BoardInfo_CLUT (202 + 12*MAXMODES + 12 + 68*4 + 32)
 
-struct BoardInfo{
+struct BoardInfo {
     uae_u8 *RegisterBase, *MemoryBase, *MemoryIOBase;
     uae_u32 MemorySize;
     char *BoardName, VBIName[32];
@@ -423,28 +449,39 @@ extern struct picasso96_state_struct pic
 extern unsigned int timer_id;
 #endif
 
-extern int DX_FillRect(uaecptr mem, uae_u16 X, uae_u16 Y, uae_u16 Width, uae_u16 Height, uae_u32 Pen, uae_u8 Bpp);
-extern void DX_BlitRect(struct RenderInfo *ri, uae_u16 srcx, uae_u16 srcy, uae_u16 dstx, uae_u16 dsty, uae_u16 w, uae_u16 h);
-extern void DX_BlitRectFromBuffer(struct RenderInfo *ri, uae_u8* buffer, uae_u16 dstx, uae_u16 dsty, uae_u16 w, uae_u16 h);
-extern void DX_InvertRect(struct RenderInfo *ri, uae_u16 X, uae_u16 Y, uae_u16 Width, uae_u16 Height);
-extern void DX_SetPalette(int start, int count);
+extern int DX_FillRect (uaecptr mem, uae_u16 X, uae_u16 Y, uae_u16 Width, uae_u16 Height, uae_u32 Pen, uae_u8 Bpp);
+extern void DX_BlitRect (struct RenderInfo *ri, uae_u16 srcx, uae_u16 srcy, uae_u16 dstx, uae_u16 dsty, uae_u16 w, uae_u16 h);
+extern void DX_BlitRectFromBuffer (struct RenderInfo *ri, uae_u8* buffer, uae_u16 dstx, uae_u16 dsty, uae_u16 w, uae_u16 h);
+extern void DX_InvertRect (struct RenderInfo *ri, uae_u16 X, uae_u16 Y, uae_u16 Width, uae_u16 Height);
+extern void DX_SetPalette (int start, int count);
 extern int DX_FillResolutions (uae_u16 *);
 extern int DX_BitsPerCannon (void);
 extern void DX_Invalidate (int first, int last);
 extern void picasso_enablescreen (int on);
+extern void picasso_refresh (void);
+extern void picasso_handle_vsync (void);
 
 extern uae_u8 *gfxmemory;
 
+/* This structure describes the UAE-side framebuffer for the Picasso
+ * screen.  */
 struct picasso_vidbuf_description {
     int width, height, depth;
     int rowbytes, pixbytes;
     int extra_mem; /* nonzero if there's a second buffer that must be updated */
+    uae_u32 rgbformat;
+    uae_u32 selected_rgbformat;
+    uae_u32 clut[256];
 };
 
 extern struct picasso_vidbuf_description picasso_vidinfo;
 
-extern void gfx_set_picasso_modeinfo (int w, int h, int d);
+extern void gfx_set_picasso_modeinfo (int w, int h, int d, int rgbfmt);
 extern void gfx_set_picasso_baseaddr (uaecptr);
 extern void gfx_set_picasso_state (int on);
+extern uae_u8 *gfx_lock_picasso (void);
+extern void gfx_unlock_picasso (void);
+extern int picasso_display_mode_index (uae_u32 x, uae_u32 y, uae_u32 d);
+extern int picasso_nr_resolutions (void);
 
 #endif