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

Timestamp:

Jun 17, 2009 9:26:02 AM (16 years ago)

Author:

vboxsync

Message:

video hw accel: fixes for basic ddraw op hanlding

File:

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

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

@@ -327 +327 @@
 public:
     VBoxVHWADirtyRect() :
-        mIsClear(false)
+        mIsClear(true)
     {}
 
@@ -343 +343 @@
     }
 
-    bool isClear() { return mIsClear; }
+    bool isClear() const { return mIsClear; }
 
     void add(const QRect & aRect)
@@ -363 +363 @@
         {
             mRect = aRect;
+            mIsClear = false;
         }
     }
@@ -368 +369 @@
     void clear() { mIsClear = true; }
 
-    const QRect & rect() {return mRect;}
-
-    bool intersects(const QRect & aRect) {return mIsClear ? false : mRect.intersects(aRect);}
+    const QRect & rect() const {return mRect;}
+
+    bool intersects(const QRect & aRect) const {return mIsClear ? false : mRect.intersects(aRect);}
+
+    bool intersects(const VBoxVHWADirtyRect & aRect) const {return mIsClear ? false : aRect.intersects(mRect);}
+
+    QRect united(const QRect & aRect) const {return mIsClear ? aRect : aRect.united(mRect);}
+
+    bool contains(const QRect & aRect) const {return mIsClear ? false : aRect.contains(mRect);}
+
+    void subst(const VBoxVHWADirtyRect & aRect) { if(!mIsClear && aRect.contains(mRect)) clear(); }
 
 private:
@@ -391 +400 @@
     static void globalInit();
 
-    int blt(const QRect * pDstRect, VBoxVHWASurfaceBase * pSrtSurface, const QRect * pSrcRect);
-
-    int lock(const QRect * pRect);
+    int blt(const QRect * aDstRect, VBoxVHWASurfaceBase * aSrtSurface, const QRect * aSrcRect);
+
+    int lock(const QRect * pRect, uint32_t flags);
 
     int unlock();
@@ -399 +408 @@
     virtual void makeCurrent() = 0;
 
-    void paint(const QRect * pRect);
+    void paint(const QRect * aRect);
 
     void performDisplay() { Assert(mDisplayInitialized); glCallList(mDisplay); }
@@ -407 +416 @@
     static GLsizei makePowerOf2(GLsizei val);
 
+    bool    addressAlocated() const { return mFreeAddress; }
     uchar * address(){ return mAddress; }
     uchar * pointAddress(int x, int y) { return mAddress + y*mBytesPerLine + x*mBytesPerPixel; }
-    ulong   memSize(){ return mBytesPerLine * mDisplayHeight; }
-
-    ulong width()  { return mDisplayWidth;  }
-    ulong height() { return mDisplayHeight; }
+    ulong   memSize(){ return mBytesPerLine * mRect.height(); }
+
+    ulong width()  { return mRect.width();  }
+    ulong height() { return mRect.height(); }
 
     GLenum format() {return mFormat; }
@@ -420 +430 @@
     ulong  bytesPerLine() { return mBytesPerLine; }
 
-    /* clients should treat the rerurned texture as read-only */
+    /* clients should treat the returned texture as read-only */
     GLuint textureSynched(const QRect * aRect) { synchTexture(aRect); return mTexture; }
 
+    void setAddress(uchar * addr);
+
+    const QRect& rect() {return mRect;}
+
+    virtual bool isPrimary() = 0;
 private:
     void initDisplay();
     void deleteDisplay();
-    void updateTexture(const QRect * pRect);
-    void synchTexture(const QRect * pRect);
-    void synchMem(const QRect * pRect);
+    void updateTexture(const QRect * aRect);
+    void synchTexture(const QRect * aRect);
+    void synchMem(const QRect * aRect);
+
+    QRect mRect;
 
     GLuint mDisplay;
@@ -439 +456 @@
     GLint  mInternalFormat;
     GLenum mType;
-    ulong  mDisplayWidth;
-    ulong  mDisplayHeight;
+//    ulong  mDisplayWidth;
+//    ulong  mDisplayHeight;
     ulong  mBytesPerPixel;
     ulong  mBytesPerLine;
 
-    VBoxVHWADirtyRect mLockedRect;
+    int mLockCount;
+    /* memory buffer not reflected in fm and texture, e.g if memory buffer is replaced or in case of lock/unlock  */
+    VBoxVHWADirtyRect mUpdateMemRect;
     /*in case of blit we blit from another surface's texture, so our current texture gets durty  */
     VBoxVHWADirtyRect mUpdateFB2TexRect;
-    /*in case of blit the memory buffer does not get updated until we need it, e.g. for pain or lock operations */
+    /*in case of blit the memory buffer does not get updated until we need it, e.g. for paint or lock operations */
     VBoxVHWADirtyRect mUpdateFB2MemRect;
 
@@ -464 +483 @@
     {}
 
+    bool isPrimary() {return true;}
     void makeCurrent();
 private:
@@ -536 +556 @@
     bool usesGuestVRAM() { return vboxWidget()->vboxUsesGuestVRAM(); }
 
-    uchar *address() { /*Assert(0); */return vboxWidget()->vboxAddress(); }
+    uchar *address() { return vboxWidget()->vboxAddress(); }
     ulong bitsPerPixel() { return vboxWidget()->vboxBitsPerPixel(); }
     ulong bytesPerLine() { return vboxWidget()->vboxBytesPerLine(); }
+
+    uchar *vramAddressFromOffset(uint64_t offset);
 
     void paintEvent (QPaintEvent *pe);
@@ -548 +570 @@
 private:
 #ifdef VBOX_WITH_VIDEOHWACCEL
+    void checkUpdateAddress (VBoxVHWASurfaceBase * pSurface, uint64_t offset)
+    {
+        if (pSurface->addressAlocated())
+        {
+            uchar * addr = vramAddressFromOffset(offset);
+            if(addr)
+            {
+                pSurface->setAddress(addr);
+            }
+        }
+    }
     int vhwaSurfaceCanCreate(struct _VBOXVHWACMD_SURF_CANCREATE *pCmd);
     int vhwaSurfaceCreate(struct _VBOXVHWACMD_SURF_CREATE *pCmd);