Changeset 99090 in vbox for trunk

Timestamp:

Mar 21, 2023 3:24:35 PM (23 months ago)

Author:

vboxsync

Message:

FE/SDL: Framebuffer rendering fixes for Windows hosts. bugref:9449

Location:

trunk/src/VBox/Frontends/VBoxSDL

Files:

• Framebuffer.cpp (modified) (6 diffs)
• VBoxSDL.cpp (modified) (5 diffs)

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

@@ -400 +400 @@
     event.user.code  = mScreenId;
     event.user.type  = SDL_USER_EVENT_UPDATERECT;
-    // 16 bit is enough for coordinates
-    event.user.data1 = (void*)(uintptr_t)(x << 16 | y);
-    event.user.data2 = (void*)(uintptr_t)(w << 16 | h);
+
+    SDL_Rect *pUpdateRect = (SDL_Rect *)RTMemAlloc(sizeof(SDL_Rect));
+    AssertPtrReturn(pUpdateRect, E_OUTOFMEMORY);
+    pUpdateRect->x = x;
+    pUpdateRect->y = y;
+    pUpdateRect->w = w;
+    pUpdateRect->h = h;
+    event.user.data1 = pUpdateRect;
+
+    event.user.data2 = NULL;
     PushNotifyUpdateEvent(&event);
 #else /* !VBOXSDL_WITH_X11 */
@@ -843 +850 @@
 #endif
     RTCritSectEnter(&mUpdateLock);
-    Log(("Updates %d, %d,%d %dx%d\n", mfUpdates, x, y, w, h));
-    // printf("Updates %d, %d,%d %dx%d\n", mfUpdates, x, y, w, h);
+    Log3Func(("mfUpdates=%RTbool %d,%d %dx%d\n", mfUpdates, x, y, w, h));
     if (!mfUpdates)
     {
@@ -858 +864 @@
     }
 
-    /* the source and destination rectangles */
-    SDL_Rect srcRect;
-    SDL_Rect dstRect;
-
     /* this is how many pixels we have to cut off from the height for this specific blit */
-    int yCutoffGuest = 0;
+    int const yCutoffGuest = 0;
+
     /**
      * If we get a SDL window relative update, we
@@ -878 +881 @@
     }
 
+    SDL_Rect srcRect;
     srcRect.x = x;
     srcRect.y = y + yCutoffGuest;
@@ -890 +894 @@
      * yCutoffGuest >= 0)
      */
+    SDL_Rect dstRect;
     dstRect.x = x + mCenterXOffset;
     dstRect.y = y + yCutoffGuest + mTopOffset + mCenterYOffset;
@@ -895 +900 @@
     dstRect.h = RT_MAX(0, h - yCutoffGuest);
 
-    SDL_Texture *pNewTexture = SDL_CreateTextureFromSurface(mpRenderer, mSurfVRAM);
-    /** @todo Do we need to update the dirty rect for the texture for SDL2 here as well? */
-    // SDL_RenderClear(mpRenderer);
-    //SDL_UpdateTexture(mpTexture, &dstRect, mSurfVRAM->pixels, mSurfVRAM->pitch);
-    // SDL_RenderCopy(mpRenderer, mpTexture, NULL, NULL);
-    SDL_RenderCopy(mpRenderer, pNewTexture, &srcRect, &dstRect);
+    /* Calculate the offset within the VRAM to update the streaming texture directly. */
+    uint8_t const *pbOff = (uint8_t *)mSurfVRAM->pixels
+                         + (srcRect.y * mBytesPerLine) + (srcRect.x * (mBitsPerPixel / 8));
+    SDL_UpdateTexture(mpTexture, &srcRect, pbOff, mSurfVRAM->pitch);
+    SDL_RenderCopy(mpRenderer, mpTexture, NULL, NULL);
+
+    RTCritSectLeave(&mUpdateLock);
+
     SDL_RenderPresent(mpRenderer);
-    SDL_DestroyTexture(pNewTexture);
-    RTCritSectLeave(&mUpdateLock);
 }
 

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

@@ -494 +494 @@
                 Uint32 winId = 0;
                 VBoxSDLFB *fb = getFbFromWinId(winId);
-                SDL_SysWMinfo info;
-                SDL_VERSION(&info.version);
-                if (SDL_GetWindowWMInfo(fb->getWindow(), &info))
-                    fCanShow = true;
-                if (fCanShow)
-                    pCSWEv->AddApproval(NULL);
-                else
-                    pCSWEv->AddVeto(NULL);
+                if (fb) /* Framebuffer might not be around (yet). */
+                {
+                    SDL_SysWMinfo info;
+                    SDL_VERSION(&info.version);
+                    if (SDL_GetWindowWMInfo(fb->getWindow(), &info))
+                        fCanShow = true;
+                    if (fCanShow)
+                        pCSWEv->AddApproval(NULL);
+                    else
+                        pCSWEv->AddVeto(NULL);
+                }
 #endif
                 break;
@@ -2477 +2480 @@
                 if (gfGrabbed || UseAbsoluteMouse())
                 {
-                    VBoxSDLFB *fb;
-                    fb = getFbFromWinId(event.motion.windowID);
-                    AssertPtrBreak(fb);
-                    SendMouseEvent(fb, 0, 0, 0);
+                    VBoxSDLFB *fb = getFbFromWinId(event.motion.windowID);
+                    if (fb)
+                        SendMouseEvent(fb, 0, 0, 0);
                 }
                 break;
@@ -2487 +2489 @@
             case SDL_MOUSEWHEEL:
             {
-                VBoxSDLFB *fb;
-                fb = getFbFromWinId(event.button.windowID);
-                AssertPtrBreak(fb);
-                SendMouseEvent(fb, -1 * event.wheel.y, 0, 0);
+                VBoxSDLFB *fb = getFbFromWinId(event.button.windowID);
+                if (fb)
+                    SendMouseEvent(fb, -1 * event.wheel.y, 0, 0);
                 break;
             }
@@ -2537 +2538 @@
                     VBoxSDLFB *fb;
                     fb = getFbFromWinId(event.button.windowID);
-                    AssertPtrBreak(fb);
-                    SendMouseEvent(fb, 0 /*wheel vertical movement*/, event.type == SDL_MOUSEBUTTONDOWN, bev->button);
+                    if (fb)
+                        SendMouseEvent(fb, 0 /*wheel vertical movement*/, event.type == SDL_MOUSEBUTTONDOWN, bev->button);
                 }
                 break;
@@ -2599 +2600 @@
                  */
                 ASMAtomicDecS32(&g_cNotifyUpdateEventsPending);
-                #define DECODEX(event) (int)((intptr_t)(event).user.data1 >> 16)
-                #define DECODEY(event) (int)((intptr_t)(event).user.data1 & 0xFFFF)
-                #define DECODEW(event) (int)((intptr_t)(event).user.data2 >> 16)
-                #define DECODEH(event) (int)((intptr_t)(event).user.data2 & 0xFFFF)
-                int x = DECODEX(event);
-                int y = DECODEY(event);
-                int w = DECODEW(event);
-                int h = DECODEH(event);
-                LogFlow(("SDL_USER_EVENT_UPDATERECT: x = %d, y = %d, w = %d, h = %d\n",
-                         x, y, w, h));
+
+                SDL_Rect *pUpdateRect = (SDL_Rect *)event.user.data1;
+                AssertPtrBreak(pUpdateRect);
+
+                int const x = pUpdateRect->x;
+                int const y = pUpdateRect->y;
+                int const w = pUpdateRect->w;
+                int const h = pUpdateRect->h;
+
+                RTMemFree(event.user.data1);
+
+                Log3Func(("SDL_USER_EVENT_UPDATERECT: x=%d y=%d, w=%d, h=%d\n", x, y, w, h));
 
                 Assert(gpFramebuffer[event.user.code]);
                 gpFramebuffer[event.user.code]->update(x, y, w, h, true /* fGuestRelative */);
-
-                #undef DECODEX
-                #undef DECODEY
-                #undef DECODEW
-                #undef DECODEH
                 break;
             }