Changeset 43932 in vbox for trunk/src/VBox/GuestHost/OpenGL/include

Timestamp:

Nov 21, 2012 7:28:05 PM (12 years ago)

Author:

vboxsync

Message:

crOpenGL: host offscreen rendering to fix gnome-shell issues, repaint problems and more

File:

• trunk/src/VBox/GuestHost/OpenGL/include/cr_server.h (modified) (14 diffs)

trunk/src/VBox/GuestHost/OpenGL/include/cr_server.h

@@ -79 +79 @@
 struct BucketingInfo;
 
-/**
- * Mural info
- */
-typedef struct {
-    GLuint width, height;
-    GLint gX, gY;            /*guest coordinates*/
-    GLint hX, hY;            /*host coordinates, screenID related*/
-
-    int spuWindow;           /*the SPU's corresponding window ID */
-
-    int screenId;
-
-    GLboolean bVisible;      /*guest window is visible*/
-    GLboolean bUseFBO;       /*redirect to FBO instead of real host window*/
-    GLboolean bFbDraw;       /*GL_FRONT buffer is drawn to directly*/
-
-    GLint       cVisibleRects;    /*count of visible rects*/
-    GLint      *pVisibleRects;    /*visible rects left, top, right, bottom*/
-    GLboolean   bReceivedRects;   /*indicates if guest did any updates for visible regions*/
-
-    GLuint idFBO, idColorTex, idDepthStencilRB;
-    GLuint fboWidth, fboHeight;
-    GLuint idPBO;
-
-    void *pvOutputRedirectInstance;
-} CRMuralInfo;
-
 typedef struct {
     char   *pszDpyName;
@@ -111 +84 @@
     int32_t externalID;
 } CRCreateInfo_t;
+
+/**
+ * Mural info
+ */
+typedef struct {
+    GLuint width, height;
+    GLint gX, gY;            /*guest coordinates*/
+    GLint hX, hY;            /*host coordinates, screenID related*/
+
+    int spuWindow;           /*the SPU's corresponding window ID */
+
+    int screenId;
+
+    GLboolean bVisible;      /*guest window is visible*/
+    GLubyte   fUseFBO;       /*redirect to FBO instead of real host window*/
+    GLboolean bFbDraw;       /*GL_FRONT buffer is drawn to directly*/
+
+    GLint       cVisibleRects;    /*count of visible rects*/
+    GLint      *pVisibleRects;    /*visible rects left, top, right, bottom*/
+    GLboolean   bReceivedRects;   /*indicates if guest did any updates for visible regions*/
+
+    GLuint idFBO, idColorTex, idDepthStencilRB;
+    GLuint fboWidth, fboHeight;
+    GLuint idPBO;
+
+    void *pvOutputRedirectInstance;
+
+    CRCreateInfo_t CreateInfo;
+} CRMuralInfo;
 
 typedef struct {
@@ -225 +227 @@
 } CR_BLITTER, *PCR_BLITTER;
 
-int CrBltInit(PCR_BLITTER pBlitter, CRMuralInfo *pCurrentMural, GLint visualBits);
+int CrBltInit(PCR_BLITTER pBlitter, CRMuralInfo *pCurrentMural);
 void CrBltTerm(PCR_BLITTER pBlitter);
 
@@ -244 +246 @@
 void CrBltBlitTexMural(PCR_BLITTER pBlitter, CR_BLITTER_TEXTURE *pSrc, const RTRECT *paSrcRects, const RTRECT *paDstRects, uint32_t cRects, uint32_t fFlags);
 void CrBltBlitTexTex(PCR_BLITTER pBlitter, CR_BLITTER_TEXTURE *pSrc, const RTRECT *pSrcRect, CR_BLITTER_TEXTURE *pDst, const RTRECT *pDstRect, uint32_t cRects, uint32_t fFlags);
+void CrBltPresent(PCR_BLITTER pBlitter);
 /* */
 
@@ -253 +256 @@
 typedef FNCRDISPLAY_REGIONS_CHANGED *PFNCRDISPLAY_REGIONS_CHANGED;
 
-typedef DECLCALLBACK(int) FNCRDISPLAY_DRAW_ENTRY(struct CR_PRESENTER *pPresenter, struct CR_PRESENTER_ENTRY *pEntry, PCR_BLITTER pBlitter);
+typedef DECLCALLBACK(int) FNCRDISPLAY_DRAW_ENTRY(struct CR_PRESENTER *pPresenter, struct CR_PRESENTER_ENTRY *pEntry, PCR_BLITTER pBlitter, bool *pfAllEntriesDrawn);
 typedef FNCRDISPLAY_DRAW_ENTRY *PFNCRDISPLAY_DRAW_ENTRY;
 
@@ -265 +268 @@
     CR_BLITTER_TEXTURE Texture;
     RTPOINT Pos;
+    uint32_t cRects;
     PRTRECT paSrcRects;
     PRTRECT paDstRects;
-    uint32_t cRects;
 } CR_PRESENTER_ENTRY, *PCR_PRESENTER_ENTRY;
 
@@ -285 +288 @@
 
 
-DECLCALLBACK(int) CrPtCbDrawEntrySingle(struct CR_PRESENTER *pPresenter, struct CR_PRESENTER_ENTRY *pEntry, PCR_BLITTER pBlitter);
-DECLCALLBACK(int) CrPtCbDrawEntryAll(struct CR_PRESENTER *pPresenter, struct CR_PRESENTER_ENTRY *pEntry, PCR_BLITTER pBlitter);
+DECLCALLBACK(int) CrPtCbDrawEntrySingle(struct CR_PRESENTER *pPresenter, struct CR_PRESENTER_ENTRY *pEntry, PCR_BLITTER pBlitter, bool *pfAllEntriesDrawn);
+DECLCALLBACK(int) CrPtCbDrawEntryAll(struct CR_PRESENTER *pPresenter, struct CR_PRESENTER_ENTRY *pEntry, PCR_BLITTER pBlitter, bool *pfAllEntriesDrawn);
 
 DECLINLINE(void) CrPtEntryInit(PCR_PRESENTER_ENTRY pEntry, PCR_BLITTER_TEXTURE pTextureData)
@@ -298 +301 @@
     return VBoxVrCompositorEntryIsInList(&pEntry->Ce);
 }
-int CrPtEntryPresent(PCR_PRESENTER pPresenter, PCR_PRESENTER_ENTRY pEntry, const RTPOINT *pPos, uint32_t cRegions, const RTRECT *paRegions, PCR_BLITTER pBlitter);
+int CrPtPresent(PCR_PRESENTER pPresenter, PCR_BLITTER pBlitter);
+int CrPtPresentEntry(PCR_PRESENTER pPresenter, PCR_PRESENTER_ENTRY pEntry, PCR_BLITTER pBlitter);
+int CrPtEntryRegionsAdd(PCR_PRESENTER pPresenter, PCR_PRESENTER_ENTRY pEntry, const RTPOINT *pPos, uint32_t cRegions, const RTRECT *paRegions);
+int CrPtEntryRegionsSet(PCR_PRESENTER pPresenter, PCR_PRESENTER_ENTRY pEntry, const RTPOINT *pPos, uint32_t cRegions, const RTRECT *paRegions);
 int CrPtEntryRemove(PCR_PRESENTER pPresenter, PCR_PRESENTER_ENTRY pEntry);
 int CrPtInit(PCR_PRESENTER pPresenter, PFNCRDISPLAY_REGIONS_CHANGED pfnRegionsChanged, PFNCRDISPLAY_DRAW_ENTRY pfnDrawEntry, PFNCRDISPLAY_DRAW_TEXTURE pfnDrawTexture);
@@ -318 +324 @@
     CR_PRESENTER Presenter;
     CRMuralInfo Mural;
-    CRCreateInfo_t MuralCreateInfo;
     PCR_BLITTER pBlitter;
 } CR_DISPLAY, *PCR_DISPLAY;
@@ -328 +333 @@
     pDisplay->pBlitter = pBlitter;
 }
-bool CrDpBlitterTest(PCR_DISPLAY pDisplay, PCR_BLITTER pBlitter);
+int CrDpBlitterTestWithMural(PCR_BLITTER pBlitter, CRMuralInfo *pMural);
+int CrDpBlitterTest(PCR_DISPLAY pDisplay, PCR_BLITTER pBlitter);
 void CrDpResize(PCR_DISPLAY pDisplay, uint32_t width, uint32_t height,
         uint32_t stretchedWidth, uint32_t stretchedHeight);
 void CrDpEntryInit(PCR_DISPLAY_ENTRY pEntry, PCR_BLITTER_TEXTURE pTextureData);
 void CrDpEntryCleanup(PCR_DISPLAY pDisplay, PCR_DISPLAY_ENTRY pEntry);
-int CrDpPresentTexture(PCR_DISPLAY pDisplay, PCR_DISPLAY_ENTRY pEntry, const RTPOINT *pPos, uint32_t cRegions, const RTRECT *paRegions);
+int CrDpEntryRegionsSet(PCR_DISPLAY pDisplay, PCR_DISPLAY_ENTRY pEntry, const RTPOINT *pPos, uint32_t cRegions, const RTRECT *paRegions);
+int CrDpEntryRegionsAdd(PCR_DISPLAY pDisplay, PCR_DISPLAY_ENTRY pEntry, const RTPOINT *pPos, uint32_t cRegions, const RTRECT *paRegions);
+int CrDpPresentEntry(PCR_DISPLAY pDisplay, PCR_DISPLAY_ENTRY pEntry);
 DECLINLINE(bool) CrDpEntryIsUsed(PCR_DISPLAY_ENTRY pEntry)
 {
@@ -343 +351 @@
     return &pDisplay->Mural;
 }
-
-DECLINLINE(CRCreateInfo_t*) CrDpGetMuralCreateInfo(PCR_DISPLAY pDisplay)
-{
-    return &pDisplay->MuralCreateInfo;
-}
-
 
 typedef struct CR_DISPLAY_ENTRY_MAP
@@ -387 +389 @@
 
     CRHashTable *muralTable;  /**< hash table where all murals are stored */
-    CRHashTable *pWindowCreateInfoTable; /**< hash table with windows creation info */
 
     int client_spu_id;
@@ -467 +468 @@
 
     PFNCRSERVERPRESENTFBO pfnPresentFBO;
-    GLboolean             bForceOffscreenRendering; /*Force server to render 3d data offscreen
+    GLubyte               bForceOffscreenRendering; /*Force server to render 3d data offscreen
                                                      *using callback above to update vbox framebuffers*/
+    GLubyte               bOffscreenRenderingDefault; /*can be set with CR_SERVER_DEFAULT_RENDER_TYPE*/
     GLboolean             bUsePBOForReadback;       /*Use PBO's for data readback*/
 
@@ -476 +478 @@
     GLboolean             bUseMultipleContexts;
 
-    uint8_t               fPresentBlitterInited;
+    /* @todo: should we use just one blitter?
+     * we use two currently because the drawable attribs can differ*/
+    int8_t                fPresentBlitterInited;
+    int8_t                fFBOModeBlitterInited;
     CR_DISPLAY_ENTRY_MAP  PresentTexturepMap;
     CR_BLITTER            PresentBlitter;
+    CR_BLITTER            FBOModeBlitter;
     uint32_t              DisplaysInitMap[(CR_MAX_GUEST_MONITORS + 31)/32];
     CR_DISPLAY            aDispplays[CR_MAX_GUEST_MONITORS];