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

Timestamp:

Mar 31, 2010 12:57:09 PM (15 years ago)

Author:

vboxsync

Message:

crOpenGL: more code for multiscreen support

Location:

trunk/src/VBox/GuestHost/OpenGL/include

Files:

• chromium.h (modified) (1 diff)
• cr_server.h (modified) (5 diffs)
• state/cr_framebuffer.h (modified) (1 diff)

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

@@ -680 +680 @@
 #ifndef GL_CR_real_vendor_strings
 #define GL_CR_real_vendor_strings 1
-#define GL_REAL_VENDOR   0x8B23
-#define GL_REAL_VERSION  0x8B24
-#define GL_REAL_RENDERER 0x8B25
+#define GL_REAL_VENDOR     0x8B23
+#define GL_REAL_VERSION    0x8B24
+#define GL_REAL_RENDERER   0x8B25
+#define GL_REAL_EXTENSIONS 0x8B26
 #endif
 

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

@@ -31 +31 @@
 /*@todo must match MaxGuestMonitors from SchemaDefs.h*/
 #define CR_MAX_GUEST_MONITORS 8
+
+typedef DECLCALLBACKPTR(void, PFNCRSERVERPRESENTFBO) (void *data, int32_t screenId, int32_t x, int32_t y, uint32_t w, uint32_t h);
 
 typedef struct {
@@ -49 +51 @@
  */
 typedef struct {
-    int width, height;
-    CRrecti imagespace;                /**< the whole mural rectangle */
-    int curExtent;
-    int numExtents;                    /**< number of tiles */
-    CRExtent extents[CR_MAX_EXTENTS];  /**< per-tile info */
-    int maxTileHeight;                 /**< the tallest tile's height */
-
-    /** optimized, hash-based tile bucketing */
-    int optimizeBucket;
-    struct BucketingInfo *bucketInfo;
-
-    unsigned int underlyingDisplay[4]; /**< needed for laying out the extents */
-
-    GLboolean viewportValidated;
-
-    int spuWindow;                     /**< the SPU's corresponding window ID */
+    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*/
+
+    GLuint idFBO, idColorTex, idDepthStencilRB;
+    GLuint fboWidth, fboHeight;
 } CRMuralInfo;
 
@@ -83 +80 @@
     GLint contextList[CR_MAX_CONTEXTS];
 } CRClient;
-
 
 typedef struct CRPoly_t {
@@ -215 +211 @@
 
     GLuint currentSerialNo;
+
+    PFNCRSERVERPRESENTFBO pfnPresentFBO;
 } CRServer;
 
@@ -241 +239 @@
 
 extern DECLEXPORT(int32_t) crVBoxServerSetRootVisibleRegion(GLint cRects, GLint *pRects);
+
+extern DECLEXPORT(void) crVBoxServerSetPresentFBOCB(PFNCRSERVERPRESENTFBO pfnPresentFBO);
+
 #ifdef __cplusplus
 }

trunk/src/VBox/GuestHost/OpenGL/include/state/cr_framebuffer.h

@@ -92 +92 @@
 DECLEXPORT(void) STATE_APIENTRY crStateGenerateMipmapEXT(GLenum target);
 
+DECLEXPORT(GLuint) STATE_APIENTRY crStateFBOHWIDtoID(GLuint hwid);
+DECLEXPORT(GLuint) STATE_APIENTRY crStateRBOHWIDtoID(GLuint hwid);
+
 #ifdef IN_GUEST
 DECLEXPORT(GLenum) STATE_APIENTRY crStateCheckFramebufferStatusEXT(GLenum target);