Changeset 75811 in vbox for trunk/src/VBox/Devices/Graphics

Timestamp:

Nov 29, 2018 12:07:41 PM (6 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

127014

Message:

DevVGA-SVGA3d-ogl.cpp: get rid of the overlay window on X11 host.

Location:

trunk/src/VBox/Devices/Graphics

Files:

• DevVGA-SVGA3d-info.cpp (modified) (1 diff)
• DevVGA-SVGA3d-internal.h (modified) (2 diffs)
• DevVGA-SVGA3d-ogl.cpp (modified) (4 diffs)

trunk/src/VBox/Devices/Graphics/DevVGA-SVGA3d-info.cpp

@@ -1547 +1547 @@
 #else
     pHlp->pfnPrintf(pHlp, "window:                  %p\n", pContext->window);
-    pHlp->pfnPrintf(pHlp, "fMapped:                 %RTbool\n", pContext->fMapped);
     if (pContext->window)
         vmsvga3dInfoHostWindow(pHlp, (uintptr_t)pContext->window);

trunk/src/VBox/Devices/Graphics/DevVGA-SVGA3d-internal.h

@@ -782 +782 @@
     /** Device context window handle */
     Window                  window;
-    /** flag whether the window is mapped (=visible) */
-    bool                    fMapped;
 #endif
 
@@ -874 +872 @@
     SSMFIELD_ENTRY_IGNORE(          VMSVGA3DCONTEXT, glxContext),
     SSMFIELD_ENTRY_IGNORE(          VMSVGA3DCONTEXT, window),
-    SSMFIELD_ENTRY_IGNORE(          VMSVGA3DCONTEXT, fMapped),
 # endif
 

trunk/src/VBox/Devices/Graphics/DevVGA-SVGA3d-ogl.cpp

@@ -3004 +3004 @@
 
 #else
-    /** @todo No overlay like on Windows. */
-    VMSVGASCREENOBJECT *pScreen = vmsvgaGetScreenObject(pThis, 0);
-    uint32_t const uWidth  = pScreen ? pScreen->cWidth : -1;
-    uint32_t const uHeight = pScreen ? pScreen->cHeight: -1;
-
-    Window hostWindow = (Window)pThis->svga.u64HostWindowId;
-
     if (pState->display == NULL)
     {
@@ -3027 +3020 @@
         }
     }
+
+    /* Create a small 4x4 window required for GL context. */
     int attrib[] =
     {
@@ -3042 +3037 @@
     swa.border_pixel = 0;
     swa.background_pixel = 0;
-    swa.event_mask = StructureNotifyMask | ExposureMask;
+    swa.event_mask = StructureNotifyMask;
     unsigned long flags = CWBorderPixel | CWBackPixel | CWColormap | CWEventMask;
-    pContext->window = XCreateWindow(pState->display, hostWindow,//XDefaultRootWindow(pState->display),//hostWindow,
-                                     0, 0, uWidth, uHeight,
+    pContext->window = XCreateWindow(pState->display, XDefaultRootWindow(pState->display),
+                                     0, 0, 4, 4,
                                      0, vi->depth, InputOutput,
                                      vi->visual, flags, &swa);
-    AssertMsgReturn(pContext->window, ("XCreateWindow failed"), VERR_INTERNAL_ERROR);
-    //uint32_t cardinal_alpha = (uint32_t) (0.5 * (uint32_t)-1); - unused
-
-    /* the window is hidden by default and only mapped when CommandPresent is executed on it */
+    AssertLogRelMsgReturn(pContext->window, ("XCreateWindow failed"), VERR_INTERNAL_ERROR);
+
+    /* The window is hidden by default and never mapped, because we only render offscreen and never present to it. */
 
     GLXContext shareContext = pSharedCtx ? pSharedCtx->glxContext : NULL;
     pContext->glxContext = glXCreateContext(pState->display, vi, shareContext, GL_TRUE);
-    AssertMsgReturn(pContext->glxContext, ("glXCreateContext failed"), VERR_INTERNAL_ERROR);
+    AssertLogRelMsgReturn(pContext->glxContext, ("glXCreateContext failed"), VERR_INTERNAL_ERROR);
 #endif
 
@@ -4773 +4767 @@
         /* Record the texture state for vm state saving. */
         if (    pTextureState[i].stage < RT_ELEMENTS(pContext->state.aTextureStates)
-            &&  pTextureState[i].name < RT_ELEMENTS(pContext->state.aTextureStates[0]))
+            &&  (unsigned)pTextureState[i].name < RT_ELEMENTS(pContext->state.aTextureStates[0]))
         {
             pContext->state.aTextureStates[pTextureState[i].stage][pTextureState[i].name] = pTextureState[i];