Changes for 32BPP rendering

diff --git a/src/include/jaguar.h b/src/include/jaguar.h
index c0fb46f2a29e5ab84c47e07d161e4c728e3d5218..daef7050b9177152259f78b3650ea4fb2d8ff5f2 100644 (file)
--- a/src/include/jaguar.h
+++ b/src/include/jaguar.h
@@ -44,7 +44,7 @@ void JaguarWriteLong(uint32 offset, uint32 data, uint32 who = UNKNOWN);
 uint32 jaguar_interrupt_handler_is_valid(uint32 i);
 void jaguar_dasm(uint32 offset, uint32 qt);
 
-void JaguarExecute(int16 * backbuffer, bool render);
+void JaguarExecute(uint32 * backbuffer, bool render);
 
 // Some handy macros to help converting native endian to big endian (jaguar native)
 // & vice versa

diff --git a/src/include/tom.h b/src/include/tom.h
index a03fa72870602ec434579935191c50d3d1b1a791..faaf4f7c9ecf01ff2158b1e1a75e5edff4be0da3 100644 (file)
--- a/src/include/tom.h
+++ b/src/include/tom.h
@@ -48,7 +48,7 @@ void tom_set_pending_video_int(void);
 void TOMResetPIT(void);
 
 //uint32 TOMGetSDLScreenPitch(void);
-void TOMResetBackbuffer(int16 * backbuffer);
+void TOMResetBackbuffer(uint32 * backbuffer);
 
 // Exported variables
 

diff --git a/src/jaguar.cpp b/src/jaguar.cpp
index e3477e41967fd4bd89d4d58aaad2631a1e7c3b79..d4ff90b90db1a037a81f77d852b1f81e39f209a8 100644 (file)
--- a/src/jaguar.cpp
+++ b/src/jaguar.cpp
@@ -1156,7 +1156,7 @@ void jaguar_done(void)
 //
 // Main Jaguar execution loop (1 frame)
 //
-void JaguarExecute(int16 * backbuffer, bool render)
+void JaguarExecute(uint32 * backbuffer, bool render)
 {
        uint16 vp = TOMReadWord(0xF0003E) + 1;//Hmm. This is a WO register. Will work? Looks like. But wrong behavior!
        uint16 vi = TOMReadWord(0xF0004E);//Another WO register...

diff --git a/src/tom.cpp b/src/tom.cpp
index c01ddecc032201b9b3d35ce0bc46c295269a1dce..604f2cce1e5d96fa1cf85a20eab159edf2c97800 100644 (file)
--- a/src/tom.cpp
+++ b/src/tom.cpp
@@ -317,27 +317,28 @@ static int32 tom_timer_counter;
 uint16 tom_jerry_int_pending, tom_timer_int_pending, tom_object_int_pending,
        tom_gpu_int_pending, tom_video_int_pending;
 uint16 * tom_cry_rgb_mix_lut;
-int16 * TOMBackbuffer;
+//int16 * TOMBackbuffer;
+uint32 * TOMBackbuffer;
 
 static char * videoMode_to_str[8] =
        { "16 BPP CRY", "24 BPP RGB", "16 BPP DIRECT", "16 BPP RGB",
          "Mixed mode", "24 BPP RGB", "16 BPP DIRECT", "16 BPP RGB" };
 
-typedef void (render_xxx_scanline_fn)(int16 *);
+typedef void (render_xxx_scanline_fn)(uint32 *);
 
 // Private function prototypes
 
-void tom_render_16bpp_cry_scanline(int16 * backbuffer);
-void tom_render_24bpp_scanline(int16 * backbuffer);
-void tom_render_16bpp_direct_scanline(int16 * backbuffer);
-void tom_render_16bpp_rgb_scanline(int16 * backbuffer);
-void tom_render_16bpp_cry_rgb_mix_scanline(int16 * backbuffer);
+void tom_render_16bpp_cry_scanline(uint32 * backbuffer);
+void tom_render_24bpp_scanline(uint32 * backbuffer);
+void tom_render_16bpp_direct_scanline(uint32 * backbuffer);
+void tom_render_16bpp_rgb_scanline(uint32 * backbuffer);
+void tom_render_16bpp_cry_rgb_mix_scanline(uint32 * backbuffer);
 
-void tom_render_16bpp_cry_stretch_scanline(int16 * backbuffer);
-void tom_render_24bpp_stretch_scanline(int16 * backbuffer);
-void tom_render_16bpp_direct_stretch_scanline(int16 * backbuffer);
-void tom_render_16bpp_rgb_stretch_scanline(int16 * backbuffer);
-void tom_render_16bpp_cry_rgb_mix_stretch_scanline(int16 * backbuffer);
+void tom_render_16bpp_cry_stretch_scanline(uint32 * backbuffer);
+void tom_render_24bpp_stretch_scanline(uint32 * backbuffer);
+void tom_render_16bpp_direct_stretch_scanline(uint32 * backbuffer);
+void tom_render_16bpp_rgb_stretch_scanline(uint32 * backbuffer);
+void tom_render_16bpp_cry_rgb_mix_stretch_scanline(uint32 * backbuffer);
 
 render_xxx_scanline_fn * scanline_render_normal[]=
 {
@@ -536,8 +537,39 @@ Trevor McFur
 Vertical resolution: 238 lines
 */
 
+uint32 RGB16ToRGB32[0x10000];
+uint32 CRY16ToRGB32[0x10000];
+uint32 MIX16ToRGB32[0x10000];
 
-void tom_calc_cry_rgb_mix_lut(void)
+void TOMFillLookupTables(void)
+{
+       for(uint32 i=0; i<0x10000; i++)
+               RGB16ToRGB32[i] = 0xFF000000
+                       | ((i & 0xF100) >> 8)  | ((i & 0xE000) >> 13)
+                       | ((i & 0x07C0) << 13) | ((i & 0x0700) << 8)
+                       | ((i & 0x003F) << 10) | ((i & 0x0030) << 4);
+
+
+       for(uint32 i=0; i<0x10000; i++)
+       {
+               uint32 chrm = (i & 0xF000) >> 12,
+                       chrl = (i & 0x0F00) >> 8,
+                       y = (i & 0x00FF);
+                               
+               uint32 r = (((uint32)redcv[chrm][chrl]) * y) >> 8,
+                       g = (((uint32)greencv[chrm][chrl]) * y) >> 8,
+                       b = (((uint32)bluecv[chrm][chrl]) * y) >> 8;
+               
+               CRY16ToRGB32[i] = 0xFF000000 | (b << 16) | (g << 8) | r;
+               MIX16ToRGB32[i] = CRY16ToRGB32[i];
+       }
+
+       for(uint32 i=0; i<0x10000; i++)
+               if (i & 0x01)
+                       MIX16ToRGB32[i] = RGB16ToRGB32[i];
+}
+
+/*void tom_calc_cry_rgb_mix_lut(void)
 {
        for (uint32 i=0; i<0x10000; i++)
        {
@@ -561,7 +593,7 @@ void tom_calc_cry_rgb_mix_lut(void)
 
                tom_cry_rgb_mix_lut[i] = color;
        }
-}
+}*/
 
 void tom_set_pending_jerry_int(void)
 {
@@ -610,8 +642,9 @@ uint16 tom_get_vdb(void)
 //
 // 16 BPP CRY/RGB mixed mode rendering
 //
-void tom_render_16bpp_cry_rgb_mix_scanline(int16 * backbuffer)
+void tom_render_16bpp_cry_rgb_mix_scanline(uint32 * backbuffer)
 {
+//CHANGED TO 32BPP RENDERING
        uint16 width = tom_width;
        uint8 * current_line_buffer = (uint8 *)&tom_ram_8[0x1800];
        
@@ -627,13 +660,15 @@ void tom_render_16bpp_cry_rgb_mix_scanline(int16 * backbuffer)
 //This case doesn't properly handle the "start on the right side of virtual screen" case
 //Dunno why--looks Ok...
 //What *is* for sure wrong is that it doesn't copy the linebuffer's BG pixels...
+//This should likely be 4 instead of 2 (?--not sure)
                backbuffer += 2 * startPos, width -= startPos;
 
        while (width)
        {
                uint16 color = (*current_line_buffer++) << 8;
                color |= *current_line_buffer++;
-               *backbuffer++ = tom_cry_rgb_mix_lut[color];
+//             *backbuffer++ = tom_cry_rgb_mix_lut[color];
+               *backbuffer++ = MIX16ToRGB32[color];
                width--;
        }
 }
@@ -641,8 +676,9 @@ void tom_render_16bpp_cry_rgb_mix_scanline(int16 * backbuffer)
 //
 // 16 BPP CRY mode rendering
 //
-void tom_render_16bpp_cry_scanline(int16 * backbuffer)
+void tom_render_16bpp_cry_scanline(uint32 * backbuffer)
 {
+//CHANGED TO 32BPP RENDERING
        uint16 width = tom_width;
        uint8 * current_line_buffer = (uint8 *)&tom_ram_8[0x1800];
 
@@ -654,22 +690,14 @@ void tom_render_16bpp_cry_scanline(int16 * backbuffer)
        if (startPos < 0)
                current_line_buffer += 2 * -startPos;
        else
+//This should likely be 4 instead of 2 (?--not sure)
                backbuffer += 2 * startPos, width -= startPos;
 
        while (width)
        {
                uint16 color = (*current_line_buffer++) << 8;
                color |= *current_line_buffer++;
-               
-               uint32 chrm = (color & 0xF000) >> 12,
-                       chrl = (color & 0x0F00) >> 8,
-                       y = (color & 0x00FF);
-                               
-               uint16 red   = (((uint32)redcv[chrm][chrl]) * y) >> 11,
-                       green = (((uint32)greencv[chrm][chrl]) * y) >> 11,
-                       blue  = (((uint32)bluecv[chrm][chrl]) * y) >> 11;
-               
-               *backbuffer++ = (red << 10) | (green << 5) | blue;
+               *backbuffer++ = CRY16ToRGB32[color];
                width--;
        }
 }
@@ -677,8 +705,9 @@ void tom_render_16bpp_cry_scanline(int16 * backbuffer)
 //
 // 24 BPP mode rendering
 //
-void tom_render_24bpp_scanline(int16 * backbuffer)
+void tom_render_24bpp_scanline(uint32 * backbuffer)
 {
+//CHANGED TO 32BPP RENDERING
        uint16 width = tom_width;
        uint8 * current_line_buffer = (uint8 *)&tom_ram_8[0x1800];
        
@@ -690,17 +719,16 @@ void tom_render_24bpp_scanline(int16 * backbuffer)
        if (startPos < 0)
                current_line_buffer += 4 * -startPos;
        else
+//This should likely be 4 instead of 2 (?--not sure)
                backbuffer += 2 * startPos, width -= startPos;
 
        while (width)
        {
-               // This is NOT a good 8 -> 5 bit RGB conversion! (It saturates values below 8
-               // to zero and throws away almost *half* the color resolution!)
-               uint16 green = (*current_line_buffer++) >> 3;
-               uint16 red = (*current_line_buffer++) >> 3;
+               uint32 g = *current_line_buffer++;
+               uint32 r = *current_line_buffer++;
                current_line_buffer++;
-               uint16 blue = (*current_line_buffer++) >> 3;
-               *backbuffer++ = (red << 10) | (green << 5) | blue;
+               uint32 b = *current_line_buffer++;
+               *backbuffer++ = 0xFF000000 | (b << 16) | (g << 8) | r;
                width--;
        }
 }
@@ -710,7 +738,7 @@ void tom_render_24bpp_scanline(int16 * backbuffer)
 //
 // 16 BPP direct mode rendering
 //
-void tom_render_16bpp_direct_scanline(int16 * backbuffer)
+void tom_render_16bpp_direct_scanline(uint32 * backbuffer)
 {
        uint16 width = tom_width;
        uint8 * current_line_buffer = (uint8 *)&tom_ram_8[0x1800];
@@ -727,8 +755,11 @@ void tom_render_16bpp_direct_scanline(int16 * backbuffer)
 //
 // 16 BPP RGB mode rendering
 //
-void tom_render_16bpp_rgb_scanline(int16 * backbuffer)
+void tom_render_16bpp_rgb_scanline(uint32 * backbuffer)
 {
+//CHANGED TO 32BPP RENDERING
+       // 16 BPP RGB: 0-5 green, 6-10 blue, 11-15 red
+
        uint16 width = tom_width;
        uint8 * current_line_buffer = (uint8 *)&tom_ram_8[0x1800];
        
@@ -737,25 +768,28 @@ void tom_render_16bpp_rgb_scanline(int16 * backbuffer)
        //NOTE: May have to check HDB2 as well!
        int16 startPos = GET16(tom_ram_8, HDB1) - (vjs.hardwareTypeNTSC ? LEFT_VISIBLE_HC : LEFT_VISIBLE_HC_PAL);       // Get start position in HC ticks
        startPos /= pwidth;
+
        if (startPos < 0)
                current_line_buffer += 2 * -startPos;
        else
+//This should likely be 4 instead of 2 (?--not sure)
                backbuffer += 2 * startPos, width -= startPos;
 
        while (width)
        {
-               uint16 color = (*current_line_buffer++) << 8;
-               color = (color | *current_line_buffer++) >> 1;
-               color = (color&0x7C00) | ((color&0x03E0) >> 5) | ((color&0x001F) << 5);
-               *backbuffer++ = color;
+               uint32 color = (*current_line_buffer++) << 8;
+               color |= *current_line_buffer++;
+               *backbuffer++ = RGB16ToRGB32[color];
                width--;
        }
 }
 
-// This stuff may just go away by itself, especially if we do some
-// good old OpenGL goodness...
+/////////////////////////////////////////////////////////////////////
+// This stuff may just go away by itself, especially if we do some //
+// good old OpenGL goodness...                                     //
+/////////////////////////////////////////////////////////////////////
 
-void tom_render_16bpp_cry_rgb_mix_stretch_scanline(int16 *backbuffer)
+void tom_render_16bpp_cry_rgb_mix_stretch_scanline(uint32 *backbuffer)
 {
        uint16 width=tom_width;
        uint8 *current_line_buffer=(uint8*)&tom_ram_8[0x1800];
@@ -772,7 +806,7 @@ void tom_render_16bpp_cry_rgb_mix_stretch_scanline(int16 *backbuffer)
        }
 }
 
-void tom_render_16bpp_cry_stretch_scanline(int16 *backbuffer)
+void tom_render_16bpp_cry_stretch_scanline(uint32 *backbuffer)
 {
        uint32 chrm, chrl, y;
 
@@ -816,7 +850,7 @@ void tom_render_16bpp_cry_stretch_scanline(int16 *backbuffer)
        }
 }
 
-void tom_render_24bpp_stretch_scanline(int16 *backbuffer)
+void tom_render_24bpp_stretch_scanline(uint32 *backbuffer)
 {
        uint16 width=tom_width;
        uint8 *current_line_buffer=(uint8*)&tom_ram_8[0x1800];
@@ -836,7 +870,7 @@ void tom_render_24bpp_stretch_scanline(int16 *backbuffer)
        }
 }
 
-void tom_render_16bpp_direct_stretch_scanline(int16 *backbuffer)
+void tom_render_16bpp_direct_stretch_scanline(uint32 *backbuffer)
 {
        uint16 width=tom_width;
        uint8 *current_line_buffer=(uint8*)&tom_ram_8[0x1800];
@@ -853,7 +887,7 @@ void tom_render_16bpp_direct_stretch_scanline(int16 *backbuffer)
        }
 }
 
-void tom_render_16bpp_rgb_stretch_scanline(int16 *backbuffer)
+void tom_render_16bpp_rgb_stretch_scanline(uint32 *backbuffer)
 {
        uint16 width=tom_width;
        uint8 *current_line_buffer=(uint8*)&tom_ram_8[0x1800];
@@ -878,7 +912,7 @@ void tom_render_16bpp_rgb_stretch_scanline(int16 *backbuffer)
        }
 }
 
-void TOMResetBackbuffer(int16 * backbuffer)
+void TOMResetBackbuffer(uint32 * backbuffer)
 {
        TOMBackbuffer = backbuffer;
 }
@@ -923,15 +957,19 @@ uint16 topVisible = (vjs.hardwareTypeNTSC ? TOP_VISIBLE_VC : TOP_VISIBLE_VC_PAL)
                else
                {
                        // If outside of VDB & VDE, then display the border color
-                       int16 * currentLineBuffer = TOMBackbuffer;
+/*                     int16 * currentLineBuffer = TOMBackbuffer;
+                       uint8 g = tom_ram_8[BORD1], r = tom_ram_8[BORD1 + 1], b = tom_ram_8[BORD2 + 1];
+                       uint16 pixel = ((r & 0xF8) << 7) | ((g & 0xF8) << 2) | (b >> 3);//*/
+                       uint32 * currentLineBuffer = TOMBackbuffer;
                        uint8 g = tom_ram_8[BORD1], r = tom_ram_8[BORD1 + 1], b = tom_ram_8[BORD2 + 1];
-                       uint16 pixel = ((r & 0xF8) << 7) | ((g & 0xF8) << 2) | (b >> 3);
+                       uint32 pixel = 0xFF000000 | (b << 16) | (g << 8) | r;
 
                        for(uint32 i=0; i<tom_width; i++)
                                *currentLineBuffer++ = pixel;
                }
 
-               TOMBackbuffer += GetSDLScreenPitch() / 2;       // Returns bytes, but we need words
+//             TOMBackbuffer += GetSDLScreenPitch() / 2;       // Returns bytes, but we need words
+               TOMBackbuffer += GetSDLScreenPitch() / 4;       // Returns bytes, but we need dwords
        }
 }
 
@@ -949,7 +987,8 @@ void tom_init(void)
        tom_reset();
        // Setup the non-stretchy scanline rendering...
        memcpy(scanline_render, scanline_render_normal, sizeof(scanline_render));
-       tom_calc_cry_rgb_mix_lut();
+//     tom_calc_cry_rgb_mix_lut();
+       TOMFillLookupTables();
 }
 
 void tom_done(void)

diff --git a/src/video.cpp b/src/video.cpp
index cd2a844a95bb068e88723e158795a7649f56d8d6..45fd04c2af8f73e121ef49590f471f8c5ca45c0c 100644 (file)
--- a/src/video.cpp
+++ b/src/video.cpp
@@ -15,7 +15,8 @@
 //And now, they do! :-)
 SDL_Surface * surface, * mainSurface;
 Uint32 mainSurfaceFlags;
-int16 * backbuffer;
+//int16 * backbuffer;
+uint32 * backbuffer;
 SDL_Joystick * joystick;
 
 // One of the reasons why OpenGL is slower then normal SDL rendering, is because
@@ -25,7 +26,7 @@ SDL_Joystick * joystick;
 // [Shamus] This isn't the case. OpenGL is slower because 60 frames a second is a
 //          lot of data to pump through the system. In any case, frameskip is probably
 //          a good idea for now, since most systems are probably too slow to run at
-//           60 FPS. But doing so will have some nasty side effects in some games.
+//          60 FPS. But doing so will have some nasty side effects in some games.
 //          You have been warned!
 
 int frame_ticker = vjs.frameSkip;
@@ -64,7 +65,7 @@ bool InitVideo(void)
        if (vjs.fullscreen)
                mainSurfaceFlags |= SDL_FULLSCREEN;
 
-       if (!vjs.useOpenGL)
+/*     if (!vjs.useOpenGL)
 //             mainSurface = SDL_SetVideoMode(VIRTUAL_SCREEN_WIDTH, VIRTUAL_SCREEN_HEIGHT_NTSC, 16, mainSurfaceFlags);
                mainSurface = SDL_SetVideoMode(VIRTUAL_SCREEN_WIDTH,
                        (vjs.hardwareTypeNTSC ? VIRTUAL_SCREEN_HEIGHT_NTSC : VIRTUAL_SCREEN_HEIGHT_PAL),
@@ -74,7 +75,19 @@ bool InitVideo(void)
                // This way we have good scaling functionality and when the screen is resized
                // because of the NTSC <-> PAL resize, we only have to re-create the texture
                // instead of initializing the entire OpenGL texture en screens.
-               mainSurface = SDL_SetVideoMode(640, 480, 16, mainSurfaceFlags);
+               mainSurface = SDL_SetVideoMode(640, 480, 16, mainSurfaceFlags);//*/
+//24BPP
+       if (!vjs.useOpenGL)
+//             mainSurface = SDL_SetVideoMode(VIRTUAL_SCREEN_WIDTH, VIRTUAL_SCREEN_HEIGHT_NTSC, 16, mainSurfaceFlags);
+               mainSurface = SDL_SetVideoMode(VIRTUAL_SCREEN_WIDTH,
+                       (vjs.hardwareTypeNTSC ? VIRTUAL_SCREEN_HEIGHT_NTSC : VIRTUAL_SCREEN_HEIGHT_PAL),
+                       32, mainSurfaceFlags);
+       else
+               // When OpenGL is used, we're going to use a standard resolution of 640x480.
+               // This way we have good scaling functionality and when the screen is resized
+               // because of the NTSC <-> PAL resize, we only have to re-create the texture
+               // instead of initializing the entire OpenGL texture en screens.
+               mainSurface = SDL_SetVideoMode(640, 480, 32, mainSurfaceFlags);//*/
 
        if (mainSurface == NULL)
        {
@@ -85,9 +98,17 @@ bool InitVideo(void)
        SDL_WM_SetCaption("Virtual Jaguar", "Virtual Jaguar");
 
        // Create the primary SDL display (16 BPP, 5/5/5 RGB format)
-       surface = SDL_CreateRGBSurface(SDL_SWSURFACE, VIRTUAL_SCREEN_WIDTH,
+/*     surface = SDL_CreateRGBSurface(SDL_SWSURFACE, VIRTUAL_SCREEN_WIDTH,
                (vjs.hardwareTypeNTSC ? VIRTUAL_SCREEN_HEIGHT_NTSC : VIRTUAL_SCREEN_HEIGHT_PAL),
-               16, 0x7C00, 0x03E0, 0x001F, 0);
+               16, 0x7C00, 0x03E0, 0x001F, 0);//*/
+//24BPP
+       surface = SDL_CreateRGBSurface(SDL_SWSURFACE, VIRTUAL_SCREEN_WIDTH,
+               (vjs.hardwareTypeNTSC ? VIRTUAL_SCREEN_HEIGHT_NTSC : VIRTUAL_SCREEN_HEIGHT_PAL), 32,
+#if SDL_BYTEORDER == SDL_BIG_ENDIAN
+                0xFF000000, 0x00FF0000, 0x0000FF00, 0x000000FF);
+#else
+                0x000000FF, 0x0000FF00, 0x00FF0000, 0xFF000000);
+#endif//*/
 
        if (surface == NULL)
        {
@@ -127,11 +148,17 @@ bool InitVideo(void)
        // Set up the backbuffer
 //To be safe, this should be 1280 * 625 * 2...
 //     backbuffer = (int16 *)malloc(845 * 525 * sizeof(int16));
-       backbuffer = (int16 *)malloc(1280 * 625 * sizeof(int16));
+/*     backbuffer = (int16 *)malloc(1280 * 625 * sizeof(int16));
+//     memset(backbuffer, 0x44, VIRTUAL_SCREEN_WIDTH * VIRTUAL_SCREEN_HEIGHT_NTSC * sizeof(int16));
+       memset(backbuffer, 0x44, VIRTUAL_SCREEN_WIDTH *
+               (vjs.hardwareTypeNTSC ? VIRTUAL_SCREEN_HEIGHT_NTSC : VIRTUAL_SCREEN_HEIGHT_PAL)
+               * sizeof(int16));//*/
+//24BPP
+       backbuffer = (uint32 *)malloc(1280 * 625 * sizeof(uint32));
 //     memset(backbuffer, 0x44, VIRTUAL_SCREEN_WIDTH * VIRTUAL_SCREEN_HEIGHT_NTSC * sizeof(int16));
        memset(backbuffer, 0x44, VIRTUAL_SCREEN_WIDTH *
                (vjs.hardwareTypeNTSC ? VIRTUAL_SCREEN_HEIGHT_NTSC : VIRTUAL_SCREEN_HEIGHT_PAL)
-               * sizeof(int16));
+               * sizeof(uint32));
 
        return true;
 }
@@ -158,7 +185,8 @@ void RenderBackbuffer(void)
                while (SDL_LockSurface(surface) < 0)
                        SDL_Delay(10);
 
-       memcpy(surface->pixels, backbuffer, tom_getVideoModeWidth() * tom_getVideoModeHeight() * 2);
+//     memcpy(surface->pixels, backbuffer, tom_getVideoModeWidth() * tom_getVideoModeHeight() * 2);
+       memcpy(surface->pixels, backbuffer, tom_getVideoModeWidth() * tom_getVideoModeHeight() * 4);
 
        if (SDL_MUSTLOCK(surface))
                SDL_UnlockSurface(surface);
@@ -193,7 +221,14 @@ void ResizeScreen(uint32 width, uint32 height)
        char window_title[256];
 
        SDL_FreeSurface(surface);
-       surface = SDL_CreateRGBSurface(SDL_SWSURFACE, width, height, 16, 0x7C00, 0x03E0, 0x001F, 0);
+//     surface = SDL_CreateRGBSurface(SDL_SWSURFACE, width, height, 16, 0x7C00, 0x03E0, 0x001F, 0);
+//24BPP
+       surface = SDL_CreateRGBSurface(SDL_SWSURFACE, width, height, 32,
+#if SDL_BYTEORDER == SDL_BIG_ENDIAN
+                0xFF000000, 0x00FF0000, 0x0000FF00, 0x000000FF);
+#else
+                0x000000FF, 0x0000FF00, 0x00FF0000, 0xFF000000);
+#endif//*/
 
        if (surface == NULL)
        {
@@ -231,6 +266,14 @@ uint32 GetSDLScreenPitch(void)
        return surface->pitch;
 }
 
+//
+// Return the screen's width in pixels
+//
+uint32 GetSDLScreenWidthInPixels(void)
+{
+       return surface->pitch / 4;                                              // Pitch / 4 since we're in 32BPP mode
+}
+
 //
 // Fullscreen <-> window switching
 //