Changeset 41404 in vbox for trunk/src/VBox/HostServices/SharedOpenGL

Timestamp:

May 22, 2012 4:41:38 PM (13 years ago)

Author:

vboxsync

Message:

crOpenGL: VM window scroll handling

Location:

trunk/src/VBox/HostServices/SharedOpenGL

Files:

• crserver/crservice.cpp (modified) (1 diff)
• crserverlib/server_main.c (modified) (1 diff)
• crserverlib/server_muralfbo.c (modified) (5 diffs)

trunk/src/VBox/HostServices/SharedOpenGL/crserver/crservice.cpp

@@ -1133 +1133 @@
                 rc = VINF_SUCCESS;
             }
+            break;
+        }
+        case SHCRGL_HOST_FN_VIEWPORT_CHANGED:
+        {
+            Log(("svcCall: SHCRGL_HOST_FN_VIEWPORT_CHANGED\n"));
+
+            /* Verify parameter count and types. */
+            if (cParms != SHCRGL_CPARMS_VIEWPORT_CHANGED)
+            {
+                LogRel(("SHCRGL_HOST_FN_VIEWPORT_CHANGED: cParms invalid - %d", cParms));
+                rc = VERR_INVALID_PARAMETER;
+                break;
+            }
+
+            for (int i = 0; i < SHCRGL_CPARMS_VIEWPORT_CHANGED; ++i)
+            {
+                if (paParms[i].type != VBOX_HGCM_SVC_PARM_32BIT)
+                {
+                    LogRel(("SHCRGL_HOST_FN_VIEWPORT_CHANGED: param[%d] type invalid - %d", i, paParms[i].type));
+                    rc = VERR_INVALID_PARAMETER;
+                    break;
+                }
+            }
+
+            if (!RT_SUCCESS(rc))
+            {
+                LogRel(("SHCRGL_HOST_FN_VIEWPORT_CHANGED: param validation failed, returning.."));
+                break;
+            }
+
+            rc = crVBoxServerSetScreenViewport((int)paParms[0].u.uint32,
+                    paParms[1].u.uint32, /* x */
+                    paParms[2].u.uint32, /* y */
+                    paParms[3].u.uint32, /* w */
+                    paParms[4].u.uint32  /* h */);
+            if (!RT_SUCCESS(rc))
+            {
+                LogRel(("SHCRGL_HOST_FN_VIEWPORT_CHANGED: crVBoxServerSetScreenViewport failed, rc %d", rc));
+                break;
+            }
+
             break;
         }

trunk/src/VBox/HostServices/SharedOpenGL/crserverlib/server_main.c

@@ -1389 +1389 @@
 }
 
+static void crVBoxServerUpdateScreenViewportCB(unsigned long key, void *data1, void *data2)
+{
+    CRMuralInfo *mural = (CRMuralInfo*) data1;
+    int *sIndex = (int*) data2;
+
+    if (mural->screenId != sIndex)
+        return;
+
+    if (!mural->width || !mural->height)
+        return;
+
+    crServerCheckMuralGeometry(mural);
+}
+
+
+DECLEXPORT(int32_t) crVBoxServerSetScreenViewport(int sIndex, int32_t x, int32_t y, uint32_t w, uint32_t h)
+{
+    CRScreenViewportInfo *pVieport;
+    GLboolean fPosChanged, fSizeChanged;
+
+    crDebug("crVBoxServerSetScreenViewport(%i)", sIndex);
+
+    if (sIndex<0 || sIndex>=cr_server.screenCount)
+    {
+        crWarning("crVBoxServerSetScreenViewport: invalid screen id %d", sIndex);
+        return VERR_INVALID_PARAMETER;
+    }
+
+    pVieport = &cr_server.screenVieport[sIndex];
+    fPosChanged = (pVieport->x != x || pVieport->y != y);
+    fSizeChanged = (pVieport->w != w || pVieport->h != h);
+
+    if (!fPosChanged && !fSizeChanged)
+    {
+        crDebug("crVBoxServerSetScreenViewport: no changes");
+        return;
+    }
+
+    if (fPosChanged)
+    {
+        pVieport->x = x;
+        pVieport->y = y;
+
+        crHashtableWalk(cr_server.muralTable, crVBoxServerUpdateScreenViewportCB, NULL);
+    }
+
+    if (fSizeChanged)
+    {
+        pVieport->w = w;
+        pVieport->h = h;
+
+        /* no need to do anything here actually */
+    }
+    return VINF_SUCCESS;
+}
+
 
 #ifdef VBOX_WITH_CRHGSMI

trunk/src/VBox/HostServices/SharedOpenGL/crserverlib/server_muralfbo.c

@@ -103 +103 @@
     if (cr_server.screenCount<2 && !cr_server.bForceOffscreenRendering)
     {
+        CRScreenViewportInfo *pVieport = &cr_server.screenVieport[mural->screenId];
         CRASSERT(cr_server.screenCount>0);
 
@@ -108 +109 @@
         mural->hY = mural->gY-cr_server.screen[0].y;
 
-        cr_server.head_spu->dispatch_table.WindowPosition(mural->spuWindow, mural->hX, mural->hY);
+        cr_server.head_spu->dispatch_table.WindowPosition(mural->spuWindow, mural->hX - pVieport->x, mural->hY - pVieport->y);
 
         return;
@@ -157 +158 @@
     if (overlappingScreenCount<2 && !cr_server.bForceOffscreenRendering)
     {
+        CRScreenViewportInfo *pVieport = &cr_server.screenVieport[mural->screenId];
+
         if (mural->bUseFBO)
         {
@@ -163 +166 @@
         }
 
-        cr_server.head_spu->dispatch_table.WindowPosition(mural->spuWindow, mural->hX, mural->hY);
+        cr_server.head_spu->dispatch_table.WindowPosition(mural->spuWindow, mural->hX - pVieport->x, mural->hY - pVieport->y);
     }
     else
@@ -193 +196 @@
         if (!mural->bUseFBO)
         {
-            cr_server.head_spu->dispatch_table.WindowPosition(mural->spuWindow, mural->hX, mural->hY);
+            CRScreenViewportInfo *pVieport = &cr_server.screenVieport[mural->screenId];
+
+            cr_server.head_spu->dispatch_table.WindowPosition(mural->spuWindow, mural->hX - pVieport->x, mural->hY - pVieport->y);
         }
     }