--- hatari/src/falcon/hostscreen.h 2019/04/01 07:14:53 1.1.1.2 +++ hatari/src/falcon/hostscreen.h 2019/04/09 08:47:20 1.1.1.3 @@ -10,47 +10,13 @@ #include -#include "araglue.h" - -/** - * This macro handles the endianity for 24 bit per item data - **/ -#if SDL_BYTEORDER == SDL_BIG_ENDIAN - -#define putBpp24Pixel( address, color ) \ -{ \ - ((Uint8*)(address))[0] = ((color) >> 16) & 0xff; \ - ((Uint8*)(address))[1] = ((color) >> 8) & 0xff; \ - ((Uint8*)(address))[2] = (color) & 0xff; \ -} - -#define getBpp24Pixel( address ) \ - ( ((Uint32)(address)[0] << 16) | ((Uint32)(address)[1] << 8) | (Uint32)(address)[2] ) - -#else - -#define putBpp24Pixel( address, color ) \ -{ \ - ((Uint8*)(address))[0] = (color) & 0xff; \ - ((Uint8*)(address))[1] = ((color) >> 8) & 0xff; \ - ((Uint8*)(address))[2] = ((color) >> 16) & 0xff; \ -} - -#define getBpp24Pixel( address ) \ - ( ((Uint32)(address)[2] << 16) | ((Uint32)(address)[1] << 8) | (Uint32)(address)[0] ) - -#endif - - extern void HostScreen_Init(void); extern void HostScreen_UnInit(void); extern void HostScreen_toggleFullScreen(void); extern bool HostScreen_renderBegin(void); extern void HostScreen_renderEnd(void); extern void HostScreen_update1(bool forced); -extern void HostScreen_update0(void); extern Uint32 HostScreen_getBpp(void); /* Bytes per pixel */ -extern Uint32 HostScreen_getBitsPerPixel(void); extern Uint32 HostScreen_getPitch(void); extern Uint32 HostScreen_getWidth(void); extern Uint32 HostScreen_getHeight(void); @@ -60,6 +26,5 @@ extern Uint32 HostScreen_getPaletteColor extern void HostScreen_updatePalette(Uint16 colorCount); extern Uint32 HostScreen_getColor(Uint32 red, Uint32 green, Uint32 blue); extern void HostScreen_setWindowSize(Uint32 width, Uint32 height, Uint32 bpp); -extern void HostScreen_bitplaneToChunky(Uint16 *atariBitplaneData, Uint16 bpp, Uint8 colorValues[16]); #endif