Changeset 29930 in vbox for trunk

Timestamp:

May 31, 2010 11:47:29 PM (15 years ago)

Author:

vboxsync

Message:

crOpenGL: properly cleanup host opengl parts (#2954, #6443)

Location:

trunk/src/VBox

Files:

• GuestHost/OpenGL/include/cr_glstate.h (modified) (1 diff)
• GuestHost/OpenGL/include/state/cr_client.h (modified) (1 diff)
• GuestHost/OpenGL/include/state/cr_lighting.h (modified) (1 diff)
• GuestHost/OpenGL/state_tracker/state_client.c (modified) (1 diff)
• GuestHost/OpenGL/state_tracker/state_init.c (modified) (1 diff)
• GuestHost/OpenGL/state_tracker/state_lighting.c (modified) (1 diff)
• HostServices/SharedOpenGL/crserverlib/server_main.c (modified) (1 diff)
• HostServices/SharedOpenGL/render/renderspu_init.c (modified) (1 diff)

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

@@ -172 +172 @@
 
 DECLEXPORT(void) crStateInit(void);
+DECLEXPORT(void) crStateDestroy(void);
 DECLEXPORT(CRContext *) crStateCreateContext(const CRLimitsState *limits, GLint visBits, CRContext *share);
 DECLEXPORT(CRContext *) crStateCreateContextEx(const CRLimitsState *limits, GLint visBits, CRContext *share, GLint presetID);

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

@@ -127 +127 @@
 
 DECLEXPORT(void) crStateClientInitBits(CRClientBits *c);
+DECLEXPORT(void) crStateClientDestroyBits(CRClientBits *c);
 DECLEXPORT(void) crStateClientInit(CRClientState *c);
 DECLEXPORT(void) crStateClientDestroy(CRClientState *c);

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

@@ -75 +75 @@
 
 DECLEXPORT(void) crStateLightingInitBits (CRLightingBits *l);
+DECLEXPORT(void) crStateLightingDestroyBits (CRLightingBits *l);
 DECLEXPORT(void) crStateLightingInit (CRContext *ctx);
 DECLEXPORT(void) crStateLightingDestroy (CRContext *ctx);

trunk/src/VBox/GuestHost/OpenGL/state_tracker/state_client.c

@@ -48 +48 @@
     for ( i = 0; i < CR_MAX_VERTEX_ATTRIBS; i++ )
         c->a[i] = (CRbitvalue *) crCalloc(GLCLIENT_BIT_ALLOC*sizeof(CRbitvalue));
+#endif
+}
+
+void crStateClientDestroyBits (CRClientBits *c) 
+{
+    int i;
+
+    crFree(c->v);
+    crFree(c->n);
+    crFree(c->c);
+    crFree(c->s);
+    crFree(c->i);
+
+    for ( i = 0; i < CR_MAX_TEXTURE_UNITS; i++ )
+        crFree(c->t[i]);
+
+    crFree(c->e);
+    crFree(c->f);
+
+#ifdef CR_NV_vertex_program
+    for ( i = 0; i < CR_MAX_VERTEX_ATTRIBS; i++ )
+        crFree(c->a[i]);
 #endif
 }

trunk/src/VBox/GuestHost/OpenGL/state_tracker/state_init.c

@@ -249 +249 @@
 }
 
-
+void crStateDestroy(void)
+{
+    if (__currentBits)
+    {
+        crStateClientDestroyBits(&(__currentBits->client));
+        crStateLightingDestroyBits(&(__currentBits->lighting));
+        crFree(__currentBits);
+        __currentBits = NULL;
+    }
+
+#ifdef CHROMIUM_THREADSAFE
+    crFreeTSD(&__contextTSD);
+#endif
+}
 
 /*

trunk/src/VBox/GuestHost/OpenGL/state_tracker/state_lighting.c

@@ -14 +14 @@
 {
         l->light = (CRLightBits *) crCalloc (sizeof(*(l->light)) * CR_MAX_LIGHTS );
+}
+
+void crStateLightingDestroyBits (CRLightingBits *l)
+{
+        crFree(l->light);
 }
 

trunk/src/VBox/HostServices/SharedOpenGL/crserverlib/server_main.c

@@ -120 +120 @@
     cr_server.head_spu = NULL;
 #endif
+
+    crStateDestroy();
+
+    crNetTearDown();
 }
 

trunk/src/VBox/HostServices/SharedOpenGL/render/renderspu_init.c

@@ -416 +416 @@
     crUnloadOpenGL();
 
+#ifdef CHROMIUM_THREADSAFE
+    crFreeTSD(&_RenderTSD);
+#endif
+
     return 1;
 }