Changeset 22834 in vbox for trunk/src/VBox/Frontends/VirtualBox/include

Timestamp:

Sep 8, 2009 12:03:54 PM (15 years ago)

Author:

vboxsync

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

52065

Message:

video hw accel: bugfixes & perf improvements

Location:

trunk/src/VBox/Frontends/VirtualBox/include

Files:

• VBoxConsoleView.h (modified) (1 diff)
• VBoxFBOverlay.h (modified) (6 diffs)
• VBoxFrameBuffer.h (modified) (1 diff)

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

@@ -138 +138 @@
     void requestToResize (const QSize &aSize);
 
+#ifdef VBOX_WITH_VIDEOHWACCEL
+    void scrollContentsBy (int dx, int dy);
+#endif
+
 #if defined(Q_WS_MAC)
     void updateDockIcon();

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

@@ -572 +572 @@
     void setHandle(uint32_t h) {mHGHandle = h;}
 
+    const VBoxVHWADirtyRect & getDirtyRect() { return mUpdateMem2TexRect; }
+
 private:
     void doSetRectValuesInternal(const QRect & aTargRect, const QRect & aSrcRect, const QRect & aVisTargRect);
@@ -1187 +1189 @@
     void onResizeEventPostprocess (const class VBoxResizeEvent *re);
 
+    void viewportResized(QResizeEvent * re)
+    {
+        vboxDoCheckUpdateViewport();
+        mGlCurrent = false;
+    }
+
+    void viewportScrolled(int dx, int dy)
+    {
+        vboxDoCheckUpdateViewport();
+        mGlCurrent = false;
+    }
+
     static bool isAcceleration2DVideoAvailable();
 
@@ -1193 +1207 @@
     void vhwaSaveExec(struct SSMHANDLE * pSSM);
 private:
+    int vhwaSurfaceUnlock(struct _VBOXVHWACMD_SURF_UNLOCK *pCmd);
+
+    void repaintMain();
+    void repaintOverlay()
+    {
+        if(mNeedOverlayRepaint)
+        {
+            mNeedOverlayRepaint = false;
+            performDisplayOverlay();
+        }
+    }
+    void repaint()
+    {
+        repaintOverlay();
+        repaintMain();
+    }
 
     void makeCurrent()
@@ -1217 +1247 @@
     }
 
-    void vboxOpExit()
-    {
-        performDisplayOverlay();
-        mGlCurrent = false;
-    }
+//    void vboxOpExit()
+//    {
+//        performDisplayOverlay();
+//        mGlCurrent = false;
+//    }
 
 
     void vboxSetGlOn(bool on);
     bool vboxGetGlOn() { return mGlOn; }
-    void vboxSynchGl();
+    bool vboxSynchGl();
     void vboxDoVHWACmdExec(void *cmd);
     void vboxShowOverlay(bool show);
     void vboxDoCheckUpdateViewport();
     void vboxDoVHWACmd(void *cmd);
-    void vboxDoUpdateRect(const QRect * pRect);
+    void addMainDirtyRect(const QRect & aRect);
 //    void vboxUpdateOverlayPosition(const QPoint & pos);
     void vboxCheckUpdateOverlay(const QRect & rect);
@@ -1246 +1276 @@
     bool mGlCurrent;
     bool mProcessingCommands;
+    bool mNeedOverlayRepaint;
     QRect mOverlayViewport;
     VBoxVHWADirtyRect mMainDirtyRect;
@@ -1310 +1341 @@
         mOverlay.onResizeEventPostprocess(re);
     }
+
+    void viewportResized(QResizeEvent * re)
+    {
+        mOverlay.viewportResized(re);
+        T::viewportResized(re);
+    }
+
+    void viewportScrolled(int dx, int dy)
+    {
+        mOverlay.viewportScrolled(dx, dy);
+        T::viewportScrolled(dx, dy);
+    }
 private:
     VBoxQGLOverlay mOverlay;

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

@@ -243 +243 @@
      * the event is framebuffer implementation specific */
     virtual void doProcessVHWACommand(QEvent * pEvent);
+
+    virtual void viewportResized(QResizeEvent * re){}
+
+    virtual void viewportScrolled(int dx, int dy){}
 #endif