Changeset 44053 in vbox for trunk/src/VBox/GuestHost

Timestamp:

Dec 6, 2012 3:21:37 PM (12 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

82526

Message:

crOpenGL: fix framebuffer state

File:

• trunk/src/VBox/GuestHost/OpenGL/state_tracker/state_framebuffer.c (modified) (9 diffs)

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

@@ -23 +23 @@
 #include "cr_mem.h"
 
-#define CRSTATE_FBO_CHECKERR(expr, result, message)         \
+#define CRSTATE_FBO_CHECKERR_RET(expr, result, message, ret)         \
     if (expr) {                                             \
         crStateError(__LINE__, __FILE__, result, message);  \
-        return;                                             \
-    }
-    
+        return ret;                                             \
+    }
+
+#define CRSTATE_NO_RETURN
+
+#define CRSTATE_FBO_CHECKERR(expr, result, message) CRSTATE_FBO_CHECKERR_RET(expr, result, message, CRSTATE_NO_RETURN)
+
 DECLEXPORT(void) STATE_APIENTRY
 crStateFramebufferObjectInit(CRContext *ctx)
@@ -381 +385 @@
 }
 
-static void crStateFramebufferTextureCheck(GLenum target, GLenum attachment, GLenum textarget, GLuint texture, GLint level,
-                                           GLboolean *failed, CRFBOAttachmentPoint **ap, CRTextureObj **tobj)
-{
-    CRContext *g = GetCurrentContext();
-    CRFramebufferObjectState *fbo = &g->framebufferobject;
-    CRFramebufferObject *pFBO;
+static GLuint crStateFramebufferTextureCheck(GLenum target, GLenum attachment, GLenum textarget, GLuint texture, GLint level,
+                    CRFBOAttachmentPoint **aap, CRTextureObj **tobj)
+{
+    CRContext *g = GetCurrentContext();
+    CRFramebufferObjectState *fbo = &g->framebufferobject;
+    CRFramebufferObject *apFBOs[2];
+    GLuint cPBOs = 0, i;
     GLuint maxtexsizelog2;
 
-    *failed = GL_TRUE;
-
-    CRSTATE_FBO_CHECKERR(g->current.inBeginEnd, GL_INVALID_OPERATION, "called in begin/end");
-    CRSTATE_FBO_CHECKERR(((target!=GL_FRAMEBUFFER_EXT) && (target!=GL_READ_FRAMEBUFFER) && (target!=GL_DRAW_FRAMEBUFFER)),
-                         GL_INVALID_ENUM, "invalid target");
-    pFBO = GL_READ_FRAMEBUFFER==target ? fbo->readFB : fbo->drawFB;
-    CRSTATE_FBO_CHECKERR(!pFBO, GL_INVALID_OPERATION, "no fbo bound");
-    CRSTATE_FBO_CHECKERR(!crStateGetFBOAttachmentPoint(pFBO, attachment, ap), GL_INVALID_ENUM, "invalid attachment");
+
+    CRSTATE_FBO_CHECKERR_RET(g->current.inBeginEnd, GL_INVALID_OPERATION, "called in begin/end", 0);
+    CRSTATE_FBO_CHECKERR_RET(((target!=GL_FRAMEBUFFER_EXT) && (target!=GL_READ_FRAMEBUFFER) && (target!=GL_DRAW_FRAMEBUFFER)),
+                         GL_INVALID_ENUM, "invalid target", 0);
+    switch (target)
+    {
+        case GL_READ_FRAMEBUFFER:
+            cPBOs = 1;
+            apFBOs[0] = fbo->readFB;
+            break;
+        case GL_DRAW_FRAMEBUFFER:
+            cPBOs = 1;
+            apFBOs[0] = fbo->drawFB;
+            break;
+        case GL_FRAMEBUFFER:
+            if (fbo->readFB == fbo->drawFB)
+            {
+                cPBOs = 1;
+                apFBOs[0] = fbo->readFB;
+            }
+            else
+            {
+                cPBOs = 2;
+                apFBOs[0] = fbo->readFB;
+                apFBOs[1] = fbo->drawFB;
+            }
+            break;
+        default:
+            crWarning("unexpected dtarget value: 0x%x", target);
+            CRSTATE_FBO_CHECKERR_RET(1, GL_INVALID_ENUM, "unexpected target", 0);
+            break;
+    }
+
+    Assert(cPBOs);
+    Assert(cPBOs <= 2);
+
+   for (i = 0; i < cPBOs; ++i)
+    {
+        CRSTATE_FBO_CHECKERR_RET(!apFBOs[i], GL_INVALID_OPERATION, "no fbo bound", 0);
+        CRSTATE_FBO_CHECKERR_RET(!crStateGetFBOAttachmentPoint(apFBOs[i], attachment, &aap[i]), GL_INVALID_ENUM, "invalid attachment", 0);
+    }
 
     if (!texture)
     {
-        *failed = GL_FALSE;
-        return;
+        return cPBOs;
     }
 
@@ -429 +466 @@
             break;
         default:
-            CRSTATE_FBO_CHECKERR(GL_TRUE, GL_INVALID_OPERATION, "invalid textarget");
-    }
-
-    CRSTATE_FBO_CHECKERR(!*tobj, GL_INVALID_OPERATION, "invalid textarget/texture combo");
+            CRSTATE_FBO_CHECKERR_RET(GL_TRUE, GL_INVALID_OPERATION, "invalid textarget", 0);
+    }
+
+    CRSTATE_FBO_CHECKERR_RET(!*tobj, GL_INVALID_OPERATION, "invalid textarget/texture combo", 0);
 
     if (GL_TEXTURE_RECTANGLE_ARB==textarget)
     {
-        CRSTATE_FBO_CHECKERR(level!=0, GL_INVALID_VALUE, "non zero mipmap level");
-    }
-
-    CRSTATE_FBO_CHECKERR(level<0, GL_INVALID_VALUE, "level<0");
-    CRSTATE_FBO_CHECKERR(level>maxtexsizelog2, GL_INVALID_VALUE, "level too big");
-
-    *failed = GL_FALSE;
+        CRSTATE_FBO_CHECKERR_RET(level!=0, GL_INVALID_VALUE, "non zero mipmap level", 0);
+    }
+
+    CRSTATE_FBO_CHECKERR_RET(level<0, GL_INVALID_VALUE, "level<0", 0);
+    CRSTATE_FBO_CHECKERR_RET(level>maxtexsizelog2, GL_INVALID_VALUE, "level too big", 0);
 
 #ifdef IN_GUEST
-    if ((*ap)->type!=GL_TEXTURE || (*ap)->name!=texture || (*ap)->level!=level)
-    {
-        pFBO->status = GL_FRAMEBUFFER_UNDEFINED;
-    }
-#endif
+    for (i = 0; i < cPBOs; ++i)
+    {
+        if ((aap[i])->type!=GL_TEXTURE || (aap[i])->name!=texture || (aap[i])->level!=level)
+        {
+            apFBOs[i]->status = GL_FRAMEBUFFER_UNDEFINED;
+        }
+    }
+#endif
+
+    Assert(cPBOs);
+    Assert(cPBOs <= 2);
+
+    return cPBOs;
 }
 
@@ -457 +500 @@
     CRContext *g = GetCurrentContext();
     CRFramebufferObjectState *fbo = &g->framebufferobject;
-    CRFBOAttachmentPoint *ap;
+    CRFBOAttachmentPoint *aap[2];
+    GLuint cap, i;
     CRTextureObj *tobj;
-    GLboolean failed;
-
-    crStateFramebufferTextureCheck(target, attachment, textarget, texture, level, &failed, &ap, &tobj);
-    if (failed) return;
+
+    cap = crStateFramebufferTextureCheck(target, attachment, textarget, texture, level, aap, &tobj);
+    if (!cap) return;
 
     if (!texture)
     {
-        crStateInitFBOAttachmentPoint(ap);
+        for (i = 0; i < cap; ++i)
+        {
+            crStateInitFBOAttachmentPoint(aap[i]);
+        }
         return;
     }
@@ -476 +522 @@
 #endif
 
-    crStateInitFBOAttachmentPoint(ap);
-    ap->type = GL_TEXTURE;
-    ap->name = texture;
-    ap->level = level;
+    for (i = 0; i < cap; ++i)
+    {
+        crStateInitFBOAttachmentPoint(aap[i]);
+        aap[i]->type = GL_TEXTURE;
+        aap[i]->name = texture;
+        aap[i]->level = level;
+    }
 }
 
@@ -487 +536 @@
     CRContext *g = GetCurrentContext();
     CRFramebufferObjectState *fbo = &g->framebufferobject;
-    CRFBOAttachmentPoint *ap;
+    CRFBOAttachmentPoint *aap[2];
+    GLuint cap, i;
     CRTextureObj *tobj;
-    GLboolean failed;
-
-    crStateFramebufferTextureCheck(target, attachment, textarget, texture, level, &failed, &ap, &tobj);
-    if (failed) return;
+
+    cap = crStateFramebufferTextureCheck(target, attachment, textarget, texture, level, aap, &tobj);
+    if (!cap) return;
 
     if (!texture)
     {
-        crStateInitFBOAttachmentPoint(ap);
+        for (i = 0; i < cap; ++i)
+        {
+            crStateInitFBOAttachmentPoint(aap[i]);
+        }
         return;
     }
@@ -506 +558 @@
 #endif
 
-    crStateInitFBOAttachmentPoint(ap);
-    ap->type = GL_TEXTURE;
-    ap->name = texture;
-    ap->level = level;
-    if (textarget!=GL_TEXTURE_2D && textarget!=GL_TEXTURE_RECTANGLE_ARB)
-    {
-        ap->face = textarget;
+    for (i = 0; i < cap; ++i)
+    {
+        crStateInitFBOAttachmentPoint(aap[i]);
+        aap[i]->type = GL_TEXTURE;
+        aap[i]->name = texture;
+        aap[i]->level = level;
+        if (textarget!=GL_TEXTURE_2D && textarget!=GL_TEXTURE_RECTANGLE_ARB)
+        {
+            aap[i]->face = textarget;
+        }
     }
 }
@@ -521 +576 @@
     CRContext *g = GetCurrentContext();
     CRFramebufferObjectState *fbo = &g->framebufferobject;
-    CRFBOAttachmentPoint *ap;
+    CRFBOAttachmentPoint *aap[2];
+    GLuint cap, i;
     CRTextureObj *tobj;
-    GLboolean failed;
-
-    crStateFramebufferTextureCheck(target, attachment, textarget, texture, level, &failed, &ap, &tobj);
-    if (failed) return;
+
+    cap = crStateFramebufferTextureCheck(target, attachment, textarget, texture, level, aap, &tobj);
+    if (!cap) return;
 
     if (!texture)
     {
-        crStateInitFBOAttachmentPoint(ap);
+        for (i = 0; i < cap; ++i)
+        {
+            crStateInitFBOAttachmentPoint(aap[i]);
+        }
         return;
     }
@@ -541 +599 @@
 #endif
 
-    crStateInitFBOAttachmentPoint(ap);
-    ap->type = GL_TEXTURE;
-    ap->name = texture;
-    ap->level = level;
-    ap->zoffset = zoffset;
+    for (i = 0; i < cap; ++i)
+    {
+        crStateInitFBOAttachmentPoint(aap[i]);
+        aap[i]->type = GL_TEXTURE;
+        aap[i]->name = texture;
+        aap[i]->level = level;
+        aap[i]->zoffset = zoffset;
+    }
 }