Changeset 27994 in vbox

Timestamp:

Apr 6, 2010 9:26:00 AM (15 years ago)

Author:

vboxsync

Message:

crOpenGL: fix textures cleanup

Location:

trunk/src/VBox/GuestHost/OpenGL/state_tracker

Files:

• state_error.c (modified) (1 diff)
• state_texture.c (modified) (5 diffs)

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

@@ -21 +21 @@
         g->error = error;
 
-        if (crGetenv("CR_DEBUG"))
+        if (1||crGetenv("CR_DEBUG"))
         {
                 char *glerr;

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

@@ -641 +641 @@
 }
 
-static void crStateTextureCheckFBOAPs(CRFramebufferObject *pFBO, GLuint texture)
+static void crStateTextureCheckFBOAPs(GLenum target, GLuint texture)
 {
     GLuint u;
     CRFBOAttachmentPoint *ap;
-
+    CRContext *g = GetCurrentContext();
+    CRFramebufferObjectState *fbo = &g->framebufferobject;
+    CRFramebufferObject *pFBO;
+
+    pFBO = GL_READ_FRAMEBUFFER==target ? fbo->readFB : fbo->drawFB;
     if (!pFBO) return;
 
@@ -653 +657 @@
         if (ap->type==GL_TEXTURE && ap->name==texture)
         {
-            crStateFramebufferTexture1DEXT(GL_FRAMEBUFFER_EXT, u+GL_COLOR_ATTACHMENT0_EXT, 0, 0, 0);
+            crStateFramebufferTexture1DEXT(target, u+GL_COLOR_ATTACHMENT0_EXT, 0, 0, 0);
         }
     }
@@ -660 +664 @@
     if (ap->type==GL_TEXTURE && ap->name==texture)
     {
-        crStateFramebufferTexture1DEXT(GL_FRAMEBUFFER_EXT, GL_DEPTH_ATTACHMENT_EXT, 0, 0, 0);
+        crStateFramebufferTexture1DEXT(target, GL_DEPTH_ATTACHMENT_EXT, 0, 0, 0);
     }
 
@@ -666 +670 @@
     if (ap->type==GL_TEXTURE && ap->name==texture)
     {
-        crStateFramebufferTexture1DEXT(GL_FRAMEBUFFER_EXT, GL_STENCIL_ATTACHMENT_EXT, 0, 0, 0);
+        crStateFramebufferTexture1DEXT(target, GL_STENCIL_ATTACHMENT_EXT, 0, 0, 0);
     }
 }
@@ -739 +743 @@
 
 #ifdef CR_EXT_framebuffer_object
-            crStateTextureCheckFBOAPs(g->framebufferobject.drawFB, name);
-            crStateTextureCheckFBOAPs(g->framebufferobject.readFB, name);
+            crStateTextureCheckFBOAPs(GL_DRAW_FRAMEBUFFER, name);
+            crStateTextureCheckFBOAPs(GL_READ_FRAMEBUFFER, name);
 #endif
                         crStateDeleteTextureObject(tObj);