Changeset 81537 in vbox for trunk/src/VBox/Frontends/VBoxSDL/Framebuffer.cpp

Timestamp:

Oct 25, 2019 11:46:30 AM (5 years ago)

Author:

vboxsync

Message:

FE/VBoxSDL: Added first support for SDL2 (by setting VBOX_WITH_SDL2). Very rough / hacky by now and needs more testing first before enabling by default. Also fixed non-starting with SDL 1.2.x on Windows hosts.

Known limitations / todos when running with SDL 2 for now:

• No alpha channel support for cursors.
• No mouse wheel support.
• Desktop geometry handling needs a revamp for multi monitor setups.
• Check / revamp dirty rectangle blitting.
• OpenGL renderer needs testing wrt texture blitting.

File:

• trunk/src/VBox/Frontends/VBoxSDL/Framebuffer.cpp (modified) (28 diffs)

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

@@ -113 +113 @@
                      bool fUpdateImage)
 {
-    int rc;
     LogFlow(("VBoxSDLFB::VBoxSDLFB\n"));
 
@@ -119 +118 @@
     mfUpdateImage   = fUpdateImage;
     mScreen         = NULL;
-#ifdef VBOX_WITH_SDL13
-    mWindow         = 0;
-    mTexture        = 0;
+#ifdef VBOX_WITH_SDL2
+    mpWindow        = NULL;
+    mpTexture       = NULL;
+    mpRenderer      = NULL;
 #endif
     mSurfVRAM       = NULL;
@@ -150 +150 @@
     mfUpdates = false;
 
-    rc = RTCritSectInit(&mUpdateLock);
+    int rc = RTCritSectInit(&mUpdateLock);
     AssertMsg(rc == VINF_SUCCESS, ("Error from RTCritSectInit!\n"));
 
@@ -161 +161 @@
 #endif
 
-    return 0;
+#ifdef VBOX_WITH_SDL2
+    rc = SDL_GetRendererInfo(mpRenderer, &mRenderInfo);
+    if (RT_SUCCESS(rc))
+    {
+        if (fShowSDLConfig)
+            RTPrintf("Render info:\n"
+                     "  Name:                    %s\n"
+                     "  Render flags:            0x%x\n"
+                     "  SDL video driver:        %s\n",
+                     mRenderInfo.name,
+                     mRenderInfo.flags,
+                     RTEnvGet("SDL_VIDEODRIVER"));
+    }
+#endif
+
+    return rc;
 }
 
@@ -184 +199 @@
 }
 
+/* static */
 bool VBoxSDLFB::init(bool fShowSDLConfig)
 {
@@ -195 +211 @@
     if (!RTEnvExist("SDL_VIDEODRIVER"))
     {
-        _putenv("SDL_VIDEODRIVER=directx");
-//        _putenv("SDL_VIDEODRIVER=windib");
+# ifndef VBOX_WITH_SDL2
+        /* Always select the windib driver by default, as the directx one is known to be broken on newer Windows OSes. */
+        RTEnvSet("SDL_VIDEODRIVER", "windib");
+# else
+        RTEnvSet("SDL_VIDEODRIVER", "directx");
+# endif
     }
 #endif
@@ -204 +224 @@
     RTEnvSet("SDL_VIDEO_X11_DGAMOUSE", "0");
 #endif
+
     int rc = SDL_InitSubSystem(SDL_INIT_VIDEO | SDL_INIT_TIMER | SDL_INIT_NOPARACHUTE);
     if (rc != 0)
@@ -212 +233 @@
     gfSdlInitialized = true;
 
+#ifdef VBOX_WITH_SDL2
+    RT_NOREF(fShowSDLConfig);
+#else
     const SDL_VideoInfo *videoInfo = SDL_GetVideoInfo();
-    Assert(videoInfo);
+    AssertPtr(videoInfo);
     if (videoInfo)
     {
@@ -244 +268 @@
                          RTEnvGet("SDL_VIDEODRIVER"));
     }
-
-    if (12320 == g_cbIco64x01)
-    {
-        gWMIcon = SDL_AllocSurface(SDL_SWSURFACE, 64, 64, 24, 0xff, 0xff00, 0xff0000, 0);
-        /** @todo make it as simple as possible. No PNM interpreter here... */
-        if (gWMIcon)
-        {
-            memcpy(gWMIcon->pixels, g_abIco64x01+32, g_cbIco64x01-32);
-            SDL_WM_SetIcon(gWMIcon, NULL);
-        }
-    }
+#endif /* !VBOX_WITH_SDL2 */
+
+#ifndef VBOX_WITH_SDL2
+    gWMIcon = SDL_AllocSurface(SDL_SWSURFACE, 64, 64, 24, 0xff, 0xff00, 0xff0000, 0);
+    /** @todo make it as simple as possible. No PNM interpreter here... */
+    if (gWMIcon)
+    {
+        memcpy(gWMIcon->pixels, g_abIco64x01+32, g_cbIco64x01-32);
+        SDL_WM_SetIcon(gWMIcon, NULL);
+    }
+#endif
 
     return true;
@@ -270 +294 @@
         AssertMsg(gSdlNativeThread == RTThreadNativeSelf(), ("Wrong thread! SDL is not threadsafe!\n"));
         SDL_QuitSubSystem(SDL_INIT_VIDEO);
+
+#ifndef VBOX_WITH_SDL2
         if (gWMIcon)
         {
@@ -275 +301 @@
             gWMIcon = NULL;
         }
+#endif
     }
 }
@@ -581 +608 @@
         /* nope, we don't want that (but still don't freak out if it is set) */
 #ifdef DEBUG
-        printf("VBoxSDL::VideoModeSupported: we refused mode %dx%dx%d\n", width, height, bpp);
+        RTPrintf("VBoxSDL::VideoModeSupported: we refused mode %dx%dx%d\n", width, height, bpp);
 #endif
         *supported = false;
@@ -770 +797 @@
 {
     LogFlow(("VBoxSDL:resizeSDL\n"));
+
+#ifdef VBOX_WITH_SDL2
+    const int cDisplays = SDL_GetNumVideoDisplays();
+    if (cDisplays > 0)
+    {
+        for (int d = 0; d < cDisplays; d++)
+        {
+            const int cDisplayModes = SDL_GetNumDisplayModes(d);
+            for (int m = 0; m < cDisplayModes; m++)
+            {
+                SDL_DisplayMode mode = { SDL_PIXELFORMAT_UNKNOWN, 0, 0, 0, 0 };
+                if (SDL_GetDisplayMode(d, m, &mode) != 0)
+                {
+                    RTPrintf("Display #%d, mode %d:\t\t%i bpp\t%i x %i",
+                             SDL_BITSPERPIXEL(mode.format), mode.w, mode.h);
+                }
+
+                if (m == 0)
+                {
+                    /*
+                     * according to the SDL documentation, the API guarantees that
+                     * the modes are sorted from larger to smaller, so we just
+                     * take the first entry as the maximum.
+                     */
+                    mMaxScreenWidth  = mode.w;
+                    mMaxScreenHeight = mode.h;
+                }
+
+                /* Keep going. */
+            }
+        }
+    }
+    else
+        AssertFailed(); /** @todo */
+#else
 
     /*
@@ -814 +876 @@
         mMaxScreenHeight = ~(uint32_t)0;
     }
+#endif /* VBOX_WITH_SDL2 */
 
     uint32_t newWidth;
@@ -841 +904 @@
     mTopOffset = 0;
 
-#if defined(VBOX_WITH_SDL13)
+#ifdef VBOX_WITH_SDL2
     int sdlWindowFlags = SDL_WINDOW_SHOWN;
     if (mfResizable)
         sdlWindowFlags |= SDL_WINDOW_RESIZABLE;
-    if (!mWindow)
+    if (!mpWindow)
     {
         SDL_DisplayMode desktop_mode;
@@ -851 +914 @@
         int y = 40 + mScreenId * 15;
 
-        SDL_GetDesktopDisplayMode(&desktop_mode);
+        SDL_GetDesktopDisplayMode(mScreenId, &desktop_mode);
         /* create new window */
 
         char szTitle[64];
         RTStrPrintf(szTitle, sizeof(szTitle), "SDL window %d", mScreenId);
-        mWindow = SDL_CreateWindow(szTitle, x, y,
+        mpWindow = SDL_CreateWindow(szTitle, x, y,
                                    newWidth, newHeight, sdlWindowFlags);
-        if (SDL_CreateRenderer(mWindow, -1,
-                               SDL_RENDERER_SINGLEBUFFER | SDL_RENDERER_PRESENTDISCARD) < 0)
+        mpRenderer = SDL_CreateRenderer(mpWindow, -1, 0 /* SDL_RendererFlags */);
+        if (mpRenderer)
+        {
+            SDL_GetRendererInfo(mpRenderer, &mRenderInfo);
+
+            mpTexture = SDL_CreateTexture(mpRenderer, desktop_mode.format,
+                                          SDL_TEXTUREACCESS_STREAMING, newWidth, newHeight);
+            if (!mpTexture)
+                AssertReleaseFailed();
+        }
+        else
             AssertReleaseFailed();
 
-        SDL_GetRendererInfo(&mRenderInfo);
-
-        mTexture = SDL_CreateTexture(desktop_mode.format,
-                                     SDL_TEXTUREACCESS_STREAMING, newWidth, newHeight);
-        if (!mTexture)
-            AssertReleaseFailed();
+        if (12320 == g_cbIco64x01)
+        {
+            gWMIcon = SDL_CreateRGBSurface(0 /* Flags, must be 0 */, 64, 64, 24, 0xff, 0xff00, 0xff0000, 0);
+            /** @todo make it as simple as possible. No PNM interpreter here... */
+            if (gWMIcon)
+            {
+                memcpy(gWMIcon->pixels, g_abIco64x01+32, g_cbIco64x01-32);
+                SDL_SetWindowIcon(mpWindow, gWMIcon);
+            }
+        }
     }
     else
@@ -876 +952 @@
 
         /* resize current window */
-        SDL_GetWindowSize(mWindow, &w, &h);
+        SDL_GetWindowSize(mpWindow, &w, &h);
 
         if (w != (int)newWidth || h != (int)newHeight)
-            SDL_SetWindowSize(mWindow, newWidth, newHeight);
-
-        SDL_QueryTexture(mTexture, &format, &access, &w, &h);
-        SDL_SelectRenderer(mWindow);
-        SDL_DestroyTexture(mTexture);
-        mTexture = SDL_CreateTexture(format, access, newWidth, newHeight);
-        if (!mTexture)
+            SDL_SetWindowSize(mpWindow, newWidth, newHeight);
+
+        SDL_QueryTexture(mpTexture, &format, &access, &w, &h);
+        SDL_DestroyTexture(mpTexture);
+        mpTexture = SDL_CreateTexture(mpRenderer, format, access, newWidth, newHeight);
+        if (!mpTexture)
             AssertReleaseFailed();
     }
@@ -895 +970 @@
     uint32_t format;
 
-    if (SDL_QueryTexture(mTexture, &format, NULL, &w, &h) < 0)
+    if (SDL_QueryTexture(mpTexture, &format, NULL, &w, &h) < 0)
         AssertReleaseFailed();
 
@@ -901 +976 @@
         AssertReleaseFailed();
 
-    if (SDL_QueryTexturePixels(mTexture, &pixels, &pitch) == 0)
+    if (SDL_LockTexture(mpTexture, NULL /* SDL_Rect */, &pixels, &pitch) == 0)
     {
         mScreen = SDL_CreateRGBSurfaceFrom(pixels, w, h, bpp, pitch,
                                            Rmask, Gmask, Bmask, Amask);
+        SDL_UnlockTexture(mpTexture); /** @BUGBUG See: https://bugzilla.libsdl.org/show_bug.cgi?id=1586 */
     }
     else
@@ -933 +1009 @@
     SDL_VERSION(&info.version);
     if (SDL_GetWMInfo(&info))
-        mWinId = (LONG64) info.info.x11.wmwindow;
+        mWinId = (LONG64) info.info.x11.wmpWindow;
 # elif defined(RT_OS_DARWIN)
     mWinId = (intptr_t)VBoxSDLGetDarwinWindowId();
@@ -939 +1015 @@
     /* XXX ignore this for other architectures */
 # endif
-#endif
+#endif /* VBOX_WITH_SDL2 */
 #ifdef VBOX_SECURELABEL
     /*
@@ -971 +1047 @@
             mCenterYOffset = (mFixedSDLHeight - (mGuestYRes + mLabelHeight)) / 2;
     }
-#endif
+#endif /* VBOX_SECURELABEL */
+
     AssertMsg(mScreen, ("Error: SDL_SetVideoMode failed!\n"));
     if (mScreen)
@@ -980 +1057 @@
 #endif
         if (mfShowSDLConfig)
-            RTPrintf("Resized to %dx%d, screen surface type: %s\n", mScreen->w, mScreen->h,
-                     ((mScreen->flags & SDL_HWSURFACE) == 0) ? "software" : "hardware");
+            RTPrintf("Resized to %dx%d\n", mScreen->w, mScreen->h);
     }
 }
@@ -1079 +1155 @@
     SDL_BlitSurface(mSurfVRAM, &srcRect, mScreen, &dstRect);
     /* hardware surfaces don't need update notifications */
-#if defined(VBOX_WITH_SDL13)
+#if defined(VBOX_WITH_SDL2)
     AssertRelease(mScreen->flags & SDL_PREALLOC);
-    SDL_SelectRenderer(mWindow);
-    SDL_DirtyTexture(mTexture, 1, &dstRect);
-    AssertRelease(mRenderInfo.flags & SDL_RENDERER_PRESENTCOPY);
-    SDL_RenderCopy(mTexture, &dstRect, &dstRect);
-    SDL_RenderPresent();
+    /** @todo Do we need to update the dirty rect for the texture for SDL2 here as well? */
+    SDL_RenderClear(mpRenderer);
+    SDL_RenderCopy(mpRenderer, mpTexture, &dstRect, &dstRect);
+    SDL_RenderPresent(mpRenderer);
 #else
     if ((mScreen->flags & SDL_HWSURFACE) == 0)
@@ -1131 +1206 @@
 void VBoxSDLFB::getFullscreenGeometry(uint32_t *width, uint32_t *height)
 {
+#ifndef VBOX_WITH_SDL2
     SDL_Rect **modes;
 
@@ -1159 +1235 @@
         }
     }
-}
+#else
+    SDL_DisplayMode dm;
+    int rc = SDL_GetDesktopDisplayMode(0, &dm); /** @BUGBUG Handle multi monitor setups! */
+    if (rc == 0)
+    {
+        *width  = dm.w;
+        *height = dm.w;
+    }
+#endif
+}
+
+#ifdef VBOX_WITH_SDL2
+int VBoxSDLFB::setWindowTitle(const char *pcszTitle)
+{
+    SDL_SetWindowTitle(mpWindow, pcszTitle);
+
+    return VINF_SUCCESS;
+}
+#endif
 
 #ifdef VBOX_SECURELABEL
@@ -1302 +1396 @@
 HRESULT VBoxSDLFBOverlay::init()
 {
-    mBlendedBits = SDL_CreateRGBSurface(SDL_ANYFORMAT, mOverlayWidth, mOverlayHeight, 32,
+#ifndef VBOX_WITH_SDL2
+    Uint32 fFlags = SDL_ANYFORMAT;
+#else
+    Uint32 fFlags = 0;
+#endif
+
+    mBlendedBits = SDL_CreateRGBSurface(fFlags, mOverlayWidth, mOverlayHeight, 32,
                                         0x00ff0000, 0x0000ff00, 0x000000ff, 0);
     AssertMsgReturn(mBlendedBits != NULL, ("Failed to create an SDL surface\n"),
                     E_OUTOFMEMORY);
-    mOverlayBits = SDL_CreateRGBSurface(SDL_SWSURFACE | SDL_SRCALPHA, mOverlayWidth,
+
+#ifndef VBOX_WITH_SDL2
+    fFlags = SDL_SWSURFACE | SDL_SRCALPHA, mOverlayWidth;
+#else
+    fFlags = 0;
+#endif
+
+    mOverlayBits = SDL_CreateRGBSurface(fFlags,
                                         mOverlayHeight, 32, 0x00ff0000, 0x0000ff00,
-                                        0x000000ff, 0xff000000);
+                                        0x000000ff, 0xff000000, 0);
     AssertMsgReturn(mOverlayBits != NULL, ("Failed to create an SDL surface\n"),
                     E_OUTOFMEMORY);
@@ -1617 +1724 @@
     mOverlayHeight = h;
     SDL_FreeSurface(mOverlayBits);
-    mBlendedBits = SDL_CreateRGBSurface(SDL_ANYFORMAT, mOverlayWidth, mOverlayHeight, 32,
+
+#ifndef VBOX_WITH_SDL2
+    Uint32 fFlags = SDL_ANYFORMAT;
+#else
+    Uint32 fFlags = 0;
+#endif
+
+    mBlendedBits = SDL_CreateRGBSurface(fFlags, mOverlayWidth, mOverlayHeight, 32,
                                         0x00ff0000, 0x0000ff00, 0x000000ff, 0);
     AssertMsgReturn(mBlendedBits != NULL, ("Failed to create an SDL surface\n"),
                     E_OUTOFMEMORY);
-    mOverlayBits = SDL_CreateRGBSurface(SDL_SWSURFACE | SDL_SRCALPHA, mOverlayWidth,
+
+#ifndef VBOX_WITH_SDL2
+    fFlags = SDL_SWSURFACE | SDL_SRCALPHA;
+#else
+    fFlags = 0;
+#endif
+
+    mOverlayBits = SDL_CreateRGBSurface(fFlags, mOverlayWidth,
                                         mOverlayHeight, 32, 0x00ff0000, 0x0000ff00,
                                         0x000000ff, 0xff000000);