Changeset 523 in vbox for trunk/src/VBox

Timestamp:

Feb 1, 2007 9:31:13 PM (18 years ago)

Author:

vboxsync

Message:

use the SDL-provided default bpp if there is one

Location:

trunk/src/VBox/Frontends/VBoxSDL

Files:

• Framebuffer.cpp (modified) (5 diffs)
• Framebuffer.h (modified) (2 diffs)

trunk/src/VBox/Frontends/VBoxSDL/Framebuffer.cpp

@@ -94 +94 @@
     mFixedSDLHeight = u32FixedHeight;
     mFixedSDLBPP    = u32FixedBPP;
+    mDefaultSDLBPP  = 32;
     mCenterXOffset  = 0;
     mCenterYOffset  = 0;
@@ -140 +141 @@
 #endif
 
-    if (mfShowSDLConfig)
-    {
+    const SDL_VideoInfo *videoInfo = SDL_GetVideoInfo();
+    Assert(videoInfo);
+    if (videoInfo)
+    {
+        switch (videoInfo->vfmt->BitsPerPixel)
+        {
+            case 16: mDefaultSDLBPP = 16; break;
+            case 24: mDefaultSDLBPP = 24; break;
+            default:
+            case 32: mDefaultSDLBPP = 32; break;
+        }
+
         /* output what SDL is capable of */
-        const SDL_VideoInfo *videoInfo = SDL_GetVideoInfo();
-        Assert(videoInfo);
-        if (videoInfo)
-        {
+        if (mfShowSDLConfig)
             RTPrintf("SDL capabilities:\n"
                      "  Hardware surface support:                    %s\n"
@@ -172 +180 @@
                          videoInfo->vfmt->BitsPerPixel,
                          getenv("SDL_VIDEODRIVER"));
-        }
     }
 
@@ -574 +581 @@
     AssertMsg(mSdlNativeThread == RTThreadNativeSelf(), ("Wrong thread! SDL is not threadsafe!\n"));
 
+    int      cBitsPerPixel = 32;
+    uint32_t Rmask, Gmask, Bmask, Amask = 0;
+
     /* pixel characteristics, default to fallback 32bpp format */
-    int bitsPerPixel = 32;
-    Uint32 Rmask = 0x00FF0000;
-    Uint32 Gmask = 0x0000FF00;
-    Uint32 Bmask = 0x000000FF;
-    Uint32 Amask = 0;
-
-    /* a different format we support directly? */
-    switch (mPixelFormat)
-    {
-        case FramebufferPixelFormat_PixelFormatRGB24:
-        {
-            bitsPerPixel = 24;
-            Rmask = 0x00FF0000;
-            Gmask = 0x0000FF00;
-            Bmask = 0x000000FF;
-            break;
-        }
-
-        case FramebufferPixelFormat_PixelFormatRGB16:
-        {
-            bitsPerPixel = 16;
-            Rmask = 0xF800;
-            Gmask = 0x07E0;
-            Bmask = 0x001F;
-            break;
-        }
+    if (mPixelFormat == FramebufferPixelFormat_PixelFormatRGB16)
+        cBitsPerPixel = 16;
+    else if (mPixelFormat == FramebufferPixelFormat_PixelFormatRGB24)
+        cBitsPerPixel = 24;
+
+    switch (cBitsPerPixel)
+    {
+        case 16: Rmask = 0xF8000000; Gmask = 0x000007E0; Bmask = 0x0000001F; break;
+        default: Rmask = 0x00FF0000; Gmask = 0x0000FF00; Bmask = 0x000000FF; break;
     }
 
@@ -614 +607 @@
     {
         /* Create a source surface from guest VRAM. */
-        mSurfVRAM = SDL_CreateRGBSurfaceFrom(mPtrVRAM, mGuestXRes, mGuestYRes, bitsPerPixel, mLineSize,
-                                             Rmask, Gmask, Bmask, Amask);
+        mSurfVRAM = SDL_CreateRGBSurfaceFrom(mPtrVRAM, mGuestXRes, mGuestYRes, cBitsPerPixel,
+                                             mLineSize, Rmask, Gmask, Bmask, Amask);
     }
     else
     {
         /* Create a software surface for which SDL allocates the RAM */
-        mSurfVRAM = SDL_CreateRGBSurface(SDL_SWSURFACE, mGuestXRes, mGuestYRes, bitsPerPixel,
+        mSurfVRAM = SDL_CreateRGBSurface(SDL_SWSURFACE, mGuestXRes, mGuestYRes, cBitsPerPixel,
                                          Rmask, Gmask, Bmask, Amask);
     }

trunk/src/VBox/Frontends/VBoxSDL/Framebuffer.h

@@ -148 +148 @@
     /** fixed SDL bits per pixel (~0 = not set) */
     uint32_t mFixedSDLBPP;
+    /** default BPP */
+    uint32_t mDefaultSDLBPP;
     /** Y offset in pixels, i.e. guest-nondrawable area at the top */
     uint32_t mTopOffset;
@@ -185 +187 @@
     /** the application Icon */
     SDL_Surface *mWMIcon;
-
 };