Changeset 46528 in vbox for trunk/src/VBox/Additions/common

Timestamp:

Jun 13, 2013 12:32:47 PM (12 years ago)

Author:

vboxsync

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

86384

Message:

crOpenGL: remove viewport hack as it is no longer needed

Location:

trunk/src/VBox/Additions/common/crOpenGL

Files:

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

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

@@ -48 +48 @@
 #endif
 
-#ifdef WINDOWS
-static char* gsViewportHackApps[] = {"googleearth.exe", NULL};
-#endif
-
 static bool stub_initialized = 0;
 #ifdef WINDOWS
@@ -247 +243 @@
     stubCheckWindowsState();
     /* call the original SPU glViewport function */
-    if (!stub.viewportHack)
-    {
-        origViewport(x, y, w, h);
-    }
-    else
-    {
-        ContextInfo *context = stubGetCurrentContext();
-        int winX, winY;
-        unsigned int winW, winH;
-        WindowInfo *pWindow;
-        pWindow = context->currentDrawable;
-        stubGetWindowGeometry(pWindow, &winX, &winY, &winW, &winH);
-        origViewport(0, 0, winW, winH);
-    }
+    origViewport(x, y, w, h);
 }
 
@@ -305 +288 @@
         stub.spuDispatch.Viewport = trapViewport;
 
-        if (stub.viewportHack)
-            stub.spuDispatch.Scissor = trapScissor;
         /*stub.spuDispatch.SwapBuffers = trapSwapBuffers;
         stub.spuDispatch.DrawBuffer = trapDrawBuffer;*/
@@ -753 +734 @@
     crNetSetKey(key,sizeof(key));
     stub.force_pbuffers = 0;
-    stub.viewportHack = 0;
-
-#ifdef WINDOWS
-    {
-        char name[1000];
-        int i;
-
+
+#ifdef WINDOWS
 # ifdef VBOX_WITH_WDDM
-        stub.bRunningUnderWDDM = false;
+    stub.bRunningUnderWDDM = false;
 # endif
-        /* Apply viewport hack only if we're running under wine */
-        if (NULL!=GetModuleHandle("wined3d.dll") || NULL != GetModuleHandle("wined3dwddm.dll"))
-        {
-            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

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