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

Timestamp:

Jun 19, 2009 8:49:25 AM (16 years ago)

Author:

vboxsync

Message:

video hw accel: DdBlt fixes

File:

• trunk/src/VBox/Frontends/VirtualBox/include/VBoxFrameBuffer.h (modified) (6 diffs)

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

@@ -489 +489 @@
 };
 
-typedef enum
-{
-    VBOXQGL_OP_PAINT = 1,
-    VBOXQGL_OP_RESIZE,
-    VBOXQGL_OP_VHWACMD,
-} VBOXQGL_OP_TYPE;
-
 class VBoxGLWidget : public QGLWidget
 {
@@ -502 +495 @@
         : QGLWidget (aParent),
         pDisplay(NULL),
-        mRe(NULL),
-        mpIntersectionRect(NULL),
         mBitsPerPixel(0),
         mPixelFormat(0),
@@ -516 +507 @@
 
     uchar *vboxAddress() { return pDisplay ? pDisplay->address() : NULL; }
+    uchar *vboxVRAMAddressFromOffset(uint64_t offset);
     ulong vboxBitsPerPixel() { return mBitsPerPixel; }
     ulong vboxBytesPerLine() { return pDisplay ? pDisplay->bytesPerLine() : NULL; }
 
-    void vboxPaintEvent (QPaintEvent *pe);
-    void vboxResizeEvent (VBoxResizeEvent *re);
+typedef void (VBoxGLWidget::*PFNVBOXQGLOP)(void* );
+//typedef FNVBOXQGLOP *PFNVBOXQGLOP;
+
+    void vboxPaintEvent (QPaintEvent *pe) {vboxPerformGLOp(&VBoxGLWidget::vboxDoPaint, pe);}
+    void vboxResizeEvent (VBoxResizeEvent *re) {vboxPerformGLOp(&VBoxGLWidget::vboxDoResize, re);}
+#ifdef VBOX_WITH_VIDEOHWACCEL
+    void vboxVHWACmd (struct _VBOXVHWACMD * pCmd) {vboxPerformGLOp(&VBoxGLWidget::vboxDoVHWACmd, pCmd);}
+#endif
 
     VBoxVHWASurfacePrimary * vboxGetSurface() { return pDisplay; }
@@ -526 +524 @@
 //    void resizeGL (int height, int width);
 
-    void paintGL();
+    void paintGL() { (this->*mpfnOp)(mOpContext);}
 
     void initializeGL();
@@ -534 +532 @@
 //    void vboxDoDeleteDisplay();
 //    void vboxDoPerformDisplay() { Assert(mDisplayInitialized); glCallList(mDisplay); }
-
-    void vboxDoResize(VBoxResizeEvent *re);
-    void vboxDoPaint(const QRect *rec);
-    VBoxVHWASurfacePrimary * pDisplay;
-
-    VBoxResizeEvent *mRe;
-    const QRect *mpIntersectionRect;
-    ulong  mBitsPerPixel;
-    ulong  mPixelFormat;
-    bool   mUsesGuestVRAM;
-};
-
-
-class VBoxQGLFrameBuffer : public VBoxFrameBuffer
-{
-public:
-
-    VBoxQGLFrameBuffer (VBoxConsoleView *aView);
-
-    STDMETHOD(NotifyUpdate) (ULONG aX, ULONG aY,
-                             ULONG aW, ULONG aH);
-
+    void vboxDoResize(void *re);
+    void vboxDoPaint(void *rec);
 #ifdef VBOX_WITH_VIDEOHWACCEL
-    STDMETHOD(ProcessVHWACommand)(BYTE *pCommand);
-#endif
-
-    ulong pixelFormat() { return vboxWidget()->vboxPixelFormat(); }
-    bool usesGuestVRAM() { return vboxWidget()->vboxUsesGuestVRAM(); }
-
-    uchar *address() { return vboxWidget()->vboxAddress(); }
-    ulong bitsPerPixel() { return vboxWidget()->vboxBitsPerPixel(); }
-    ulong bytesPerLine() { return vboxWidget()->vboxBytesPerLine(); }
-
-    uchar *vramAddressFromOffset(uint64_t offset);
-
-    void paintEvent (QPaintEvent *pe);
-    void resizeEvent (VBoxResizeEvent *re);
-#ifdef VBOX_WITH_VIDEOHWACCEL
-    void doProcessVHWACommand(struct _VBOXVHWACMD * pCommand);
-#endif
-
-private:
-#ifdef VBOX_WITH_VIDEOHWACCEL
-    void checkUpdateAddress (VBoxVHWASurfaceBase * pSurface, uint64_t offset)
+    void vboxDoVHWACmd(void *cmd);
+    void vboxCheckUpdateAddress (VBoxVHWASurfaceBase * pSurface, uint64_t offset)
     {
         if (pSurface->addressAlocated())
         {
-            uchar * addr = vramAddressFromOffset(offset);
+            uchar * addr = vboxVRAMAddressFromOffset(offset);
             if(addr)
             {
@@ -597 +556 @@
     int vhwaQueryInfo2(struct _VBOXVHWACMD_QUERYINFO2 *pCmd);
 #endif
+
+    VBoxVHWASurfacePrimary * pDisplay;
+    /* we need to do all opengl stuff in the paintGL context,
+     * submit the operation to be performed */
+    void vboxPerformGLOp(PFNVBOXQGLOP pfn, void* pContext) {mpfnOp = pfn; mOpContext = pContext; updateGL();}
+
+    PFNVBOXQGLOP mpfnOp;
+    void *mOpContext;
+
+    ulong  mBitsPerPixel;
+    ulong  mPixelFormat;
+    bool   mUsesGuestVRAM;
+};
+
+
+class VBoxQGLFrameBuffer : public VBoxFrameBuffer
+{
+public:
+
+    VBoxQGLFrameBuffer (VBoxConsoleView *aView);
+
+    STDMETHOD(NotifyUpdate) (ULONG aX, ULONG aY,
+                             ULONG aW, ULONG aH);
+
+#ifdef VBOX_WITH_VIDEOHWACCEL
+    STDMETHOD(ProcessVHWACommand)(BYTE *pCommand);
+#endif
+
+    ulong pixelFormat() { return vboxWidget()->vboxPixelFormat(); }
+    bool usesGuestVRAM() { return vboxWidget()->vboxUsesGuestVRAM(); }
+
+    uchar *address() { return vboxWidget()->vboxAddress(); }
+    ulong bitsPerPixel() { return vboxWidget()->vboxBitsPerPixel(); }
+    ulong bytesPerLine() { return vboxWidget()->vboxBytesPerLine(); }
+
+    void paintEvent (QPaintEvent *pe);
+    void resizeEvent (VBoxResizeEvent *re);
+#ifdef VBOX_WITH_VIDEOHWACCEL
+    void doProcessVHWACommand(struct _VBOXVHWACMD * pCommand);
+#endif
+
+private:
     void vboxMakeCurrent();
     VBoxGLWidget * vboxWidget();