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

Timestamp:

Aug 20, 2010 9:40:40 AM (14 years ago)

Author:

vboxsync

Message:

crOpenGL: resource sharing between contexts

Location:

trunk/src/VBox/GuestHost/OpenGL/include

Files:

• chromium.h (modified) (1 diff)
• cr_glstate.h (modified) (3 diffs)
• state/cr_bufferobject.h (modified) (4 diffs)
• state/cr_framebuffer.h (modified) (1 diff)
• state/cr_texture.h (modified) (2 diffs)

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

@@ -684 +684 @@
 #define GL_REAL_RENDERER   0x8B25
 #define GL_REAL_EXTENSIONS 0x8B26
+
+/*Global resource ids sharing*/
+#define GL_SHARE_CONTEXT_RESOURCES_CR 0x8B27
 #endif
 

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

@@ -98 +98 @@
     CRHashTable *textureTable;  /* all texture objects */
     CRHashTable *dlistTable;    /* all display lists */
+    CRHashTable *buffersTable;  /* vbo/pbo */
+    CRHashTable *fbTable;       /* frame buffers */
+    CRHashTable *rbTable;       /* render buffers */
+
     GLint refCount;
+    GLint id;                   /*unique shared state id, it's not always matching some existing context id!*/
+    GLint saveCount;
 } CRSharedState;
 
@@ -196 +202 @@
 #ifndef IN_GUEST
 DECLEXPORT(int32_t) crStateSaveContext(CRContext *pContext, PSSMHANDLE pSSM);
-DECLEXPORT(int32_t) crStateLoadContext(CRContext *pContext, PSSMHANDLE pSSM);
+DECLEXPORT(int32_t) crStateLoadContext(CRContext *pContext, CRHashTable * pCtxTable, PSSMHANDLE pSSM);
+DECLEXPORT(void)    crStateFreeShared(CRSharedState *s);
 #endif
 
@@ -219 +226 @@
                    GLenum format, GLenum type, GLvoid *pixels );
 
+DECLEXPORT(void) STATE_APIENTRY crStateShareContext(GLboolean value);
 #ifdef __cplusplus
 }

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

@@ -10 +10 @@
 #include "cr_hash.h"
 #include "state/cr_statetypes.h"
+#include "state/cr_statefuncs.h"
 
 #ifdef __cplusplus
@@ -30 +31 @@
 typedef struct {
         GLuint refCount;
-        GLuint name;
+        GLuint id;
+    GLuint hwid;
         GLenum usage;
         GLenum access;
@@ -51 +53 @@
         CRBufferObject *nullBuffer;  /* name = 0 */
 
-        CRHashTable *buffers;
-
     GLboolean   bResyncNeeded;
 } CRBufferObjectState;
@@ -59 +59 @@
 DECLEXPORT(GLboolean) crStateIsBufferBound(GLenum target);
 
+DECLEXPORT(GLuint) STATE_APIENTRY crStateBufferHWIDtoID(GLuint hwid);
+DECLEXPORT(GLuint) STATE_APIENTRY crStateGetBufferHWID(GLuint id);
+
 #ifdef __cplusplus
 }

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

@@ -62 +62 @@
     CRFramebufferObject     *readFB, *drawFB;
     CRRenderbufferObject    *renderbuffer;
-    CRHashTable             *framebuffers;
-    CRHashTable             *renderbuffers;
 
     /* Indicates that we have to resend FBO data to GPU on first glMakeCurrent call with owning context */

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

@@ -61 +61 @@
 typedef struct {
     GLenum                 target;
-    GLuint                 name;
+    GLuint                 id;
+    GLuint                 hwid;
 
     /* The mipmap levels */
@@ -237 +238 @@
 DECLEXPORT(void) crStateDeleteTextureObject(CRTextureObj *tobj);
 
+DECLEXPORT(GLuint) STATE_APIENTRY crStateTextureHWIDtoID(GLuint hwid);
+DECLEXPORT(GLuint) STATE_APIENTRY crStateGetTextureHWID(GLuint id);
+DECLEXPORT(GLuint) STATE_APIENTRY crStateGetTextureObjHWID(CRTextureObj *tobj);
 
 #ifdef __cplusplus