Changeset 23646 in vbox for trunk/src

Timestamp:

Oct 9, 2009 12:51:05 PM (15 years ago)

Author:

vboxsync

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

53346

Message:

video 2d accel: move program start/stop outside display list to satisfy old ATI drivers

Location:

trunk/src/VBox/Frontends/VirtualBox

Files:

• include/VBoxFBOverlay.h (modified) (2 diffs)
• src/VBoxFBOverlay.cpp (modified) (7 diffs)

trunk/src/VBox/Frontends/VirtualBox/include/VBoxFBOverlay.h

@@ -586 +586 @@
     void deleteDisplay();
 
-    int createDisplay(VBoxVHWASurfaceBase *pPrimary, GLuint *pDisplay);
-    void doDisplay(VBoxVHWASurfaceBase *pPrimary, VBoxVHWAGlProgramVHWA * pProgram, bool bBindDst);
+    int createDisplay(VBoxVHWASurfaceBase *pPrimary, GLuint *pDisplay, class VBoxVHWAGlProgram ** ppProgram);
+    void doDisplay(VBoxVHWASurfaceBase *pPrimary, bool bProgram, bool bBindDst);
     bool synchTexMem(const QRect * aRect);
 
@@ -605 +605 @@
 
     GLuint mVisibleDisplay;
+    class VBoxVHWAGlProgram * mpProgram;
 
     bool mVisibleDisplayInitialized;

trunk/src/VBox/Frontends/VirtualBox/src/VBoxFBOverlay.cpp

@@ -1828 +1828 @@
                     bool bVGA) :
                 mRect(0,0,aSize.width(),aSize.height()),
+                mpProgram(NULL),
                 mVisibleDisplayInitialized(false),
                 mAddress(NULL),
@@ -2824 +2825 @@
             glDeleteLists(mVisibleDisplay, 1);
         }
+        if(mpProgram)
+        {
+            mpProgram = NULL;
+        }
         mVisibleDisplayInitialized = false;
     }
 }
 
-void VBoxVHWASurfaceBase::doDisplay(VBoxVHWASurfaceBase *pPrimary, VBoxVHWAGlProgramVHWA * pProgram, bool bBindDst)
+void VBoxVHWASurfaceBase::doDisplay(VBoxVHWASurfaceBase *pPrimary, bool bProgram, bool bBindDst)
 {
     bool bInvokeMultiTex2 = false;
 
-    if(pProgram)
-    {
-        pProgram->start();
+    if(bProgram)
+    {
+//        pProgram->start();
 
 //            if(pSrcCKey != NULL)
@@ -2902 +2907 @@
     }
 
-    if(pProgram)
-    {
-        pProgram->stop();
-    }
-}
-
-int VBoxVHWASurfaceBase::createDisplay(VBoxVHWASurfaceBase *pPrimary, GLuint *pDisplay)
+//    if(pProgram)
+//    {
+//        pProgram->stop();
+//    }
+}
+
+int VBoxVHWASurfaceBase::createDisplay(VBoxVHWASurfaceBase *pPrimary, GLuint *pDisplay, class VBoxVHWAGlProgram ** ppProgram)
 {
     if(mVisibleTargRect.isEmpty())
@@ -2968 +2973 @@
             glNewList(display, GL_COMPILE);
 
-            doDisplay(pPrimary, pProgram, pDstCKey != NULL);
+            doDisplay(pPrimary, pProgram != 0, pDstCKey != NULL);
 
             glEndList();
             VBOXQGL_ASSERTNOERR();
             *pDisplay = display;
+            *ppProgram = pProgram;
             return VINF_SUCCESS;
         }
@@ -2989 +2995 @@
     deleteDisplay();
 
-    int rc = createDisplay(pPrimary, &mVisibleDisplay);
+    int rc = createDisplay(pPrimary, &mVisibleDisplay, &mpProgram);
     if(RT_SUCCESS(rc))
     {
         mVisibleDisplayInitialized = true;
+    }
+    else
+    {
+        mVisibleDisplayInitialized = false;
     }
 }
@@ -3058 +3068 @@
         }
 
-        doDisplay(pPrimary, pProgram, pDstCKey != NULL);
+        if(pProgram)
+            pProgram->start();
+        doDisplay(pPrimary, pProgram != 0, pDstCKey != NULL);
+        if(pProgram)
+            pProgram->stop();
+
 
 //        doDisplay(pPrimary, NULL, false);
@@ -3064 +3079 @@
     else
     {
+        if(mpProgram)
+            mpProgram->start();
         VBOXQGL_CHECKERR(
                 glCallList(mVisibleDisplay);
                 );
+        if(mpProgram)
+            mpProgram->stop();
+
     }