Changeset 20616 in vbox for trunk/src

Timestamp:

Jun 16, 2009 9:52:32 AM (16 years ago)

Author:

vboxsync

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

48677

Message:

crOpenGL: enable viewport hack for googleearth in d3d9 mode

Location:

trunk/src/VBox/Additions/common/crOpenGL

Files:

• load.c (modified) (6 diffs)
• stub.h (modified) (1 diff)

trunk/src/VBox/Additions/common/crOpenGL/load.c

@@ -40 +40 @@
 #endif
 
+#ifdef WINDOWS
+static char* gsViewportHackApps[] = {"googleearth.exe", NULL};
+#endif
+
 static int stub_initialized = 0;
 
@@ -145 +149 @@
 {
     stubCheckWindowState();
-    /* call the original SPU glViewport function */  
-    origViewport(x, y, w, h);
-
-    /*
+    /* call the original SPU glViewport function */
+    if (!stub.viewportHack)
+    {
+        origViewport(x, y, w, h);
+    }
+    else
     {
         int winX, winY;
@@ -157 +163 @@
         origViewport(0, 0, winW, winH);
     }
-    */
 }
 
@@ -174 +179 @@
 static void SPU_APIENTRY trapScissor(GLint x, GLint y, GLsizei w, GLsizei h)
 {
-    origScissor(x, y, w, h);
-
-    /*
-    {
-        int winX, winY;
-        unsigned int winW, winH;
-        WindowInfo *pWindow;
-        pWindow = stub.currentContext->currentDrawable;
-        stubGetWindowGeometry(pWindow, &winX, &winY, &winW, &winH);
-        origScissor(0, 0, winW, winH);
-    }
-    */
+    int winX, winY;
+    unsigned int winW, winH;
+    WindowInfo *pWindow;
+    pWindow = stub.currentContext->currentDrawable;
+    stubGetWindowGeometry(pWindow, &winX, &winY, &winW, &winH);
+    origScissor(0, 0, winW, winH);
 }
 
@@ -206 +205 @@
         stub.spuDispatch.Clear = trapClear;
         stub.spuDispatch.Viewport = trapViewport;
-        /*stub.spuDispatch.Scissor = trapScissor;*/
+        if (stub.viewportHack)
+            stub.spuDispatch.Scissor = trapScissor;
         /*stub.spuDispatch.SwapBuffers = trapSwapBuffers;
         stub.spuDispatch.DrawBuffer = trapDrawBuffer;*/
@@ -517 +517 @@
     crNetSetKey(key,sizeof(key));
     stub.force_pbuffers = 0;
+    stub.viewportHack = 0;
+
+#ifdef WINDOWS
+    {
+        char name[1000];
+        int i;
+
+        crGetProcName(name, 1000);
+        for (i=0; gsViewportHackApps[i]; ++i)
+        {
+            if (!stricmp(name, gsViewportHackApps[i]))
+            {
+                stub.viewportHack = 1;
+                break;
+            }
+        }
+    }
+#endif
 }
 

trunk/src/VBox/Additions/common/crOpenGL/stub.h

@@ -183 +183 @@
     char *spu_dir;
     int force_pbuffers;
+    int viewportHack;
 
     /* thread safety stuff */