vbox的更動 44059 路徑 trunk/src/VBox/GuestHost/OpenGL/state_tracker

時間撮記:

2012-12-7 上午10:34:42 (12 年 以前)

作者:

vboxsync

訊息:

crOpenGL: more gl state fixes

位置:

trunk/src/VBox/GuestHost/OpenGL/state_tracker

檔案:

• state.h (修改) (2 筆差異)
• state_bufferobject.c (修改) (3 筆差異)
• state_framebuffer.c (修改) (21 筆差異)
• state_special (修改) (1 筆差異)
• state_texture.c (修改) (4 筆差異)

trunk/src/VBox/GuestHost/OpenGL/state_tracker/state.h

@@ -9 +9 @@
 
 #include "cr_glstate.h"
+
+#define CRSTATE_CHECKERR_RET(expr, result, message, ret)         \
+    if (expr) {                                             \
+        crStateError(__LINE__, __FILE__, result, message);  \
+        return ret;                                             \
+    }
+
+#define CRSTATE_NO_RETURN
+
+#define CRSTATE_CHECKERR(expr, result, message) CRSTATE_CHECKERR_RET(expr, result, message, CRSTATE_NO_RETURN)
 
 typedef struct _crCheckIDHWID {
@@ -62 +72 @@
 void crStateFreeFBO(void *data);
 void crStateFreeRBO(void *data);
+
+void crStateGenNames(CRContext *g, CRHashTable *table, GLsizei n, GLuint *names);
 #endif

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

@@ -30 +30 @@
 }
 
+void STATE_APIENTRY crStateGenBuffersARB(GLsizei n, GLuint *buffers)
+{
+    CRContext *g = GetCurrentContext();
+    crStateGenNames(g, g->shared->buffersTable, n, buffers);
+}
+
 GLboolean crStateIsBufferBound(GLenum target)
 {
@@ -185 +191 @@
         newObj = (CRBufferObject *) crHashtableSearch(g->shared->buffersTable, buffer);
         if (!newObj) {
+            CRSTATE_CHECKERR(!crHashtableIsKeyUsed(g->shared->buffersTable, buffer), GL_INVALID_OPERATION, "name is not a buffer object");
             newObj = AllocBufferObject(buffer);
-            if (!newObj) {
-                crStateError(__LINE__, __FILE__, GL_OUT_OF_MEMORY, "glBindBuffer");
+            CRSTATE_CHECKERR(!newObj, GL_OUT_OF_MEMORY, "glBindBuffer");
+#ifndef IN_GUEST
+            diff_api.GenBuffersARB(1, &newObj->hwid);
+            if (!newObj->hwid)
+            {
+                crWarning("GenBuffersARB failed!");
+                crFree(newObj);
                 return;
             }
+#endif
             crHashtableAdd( g->shared->buffersTable, buffer, newObj );
         }
@@ -334 +347 @@
 }
 
-
-void STATE_APIENTRY
-crStateGenBuffersARB(GLsizei n, GLuint * buffers)
-{
-    CRContext *g = GetCurrentContext();
-    CRBufferObjectState *b = &(g->bufferobject);
-    GLint start;
-
-    FLUSH();
-
-    if (g->current.inBeginEnd) {
-        crStateError(__LINE__, __FILE__, GL_INVALID_OPERATION,
-                                 "glGenBuffersARB called in Begin/End");
-        return;
-    }
-
-    if (n < 0) {
-        crStateError(__LINE__, __FILE__, GL_INVALID_VALUE,
-                                 "glGenBuffersARB(n < 0)");
-        return;
-    }
-
-    start = crHashtableAllocKeys(g->shared->buffersTable, n);
-    if (start) {
-        GLint i;
-        for (i = 0; i < n; i++)
-            buffers[i] = (GLuint) (start + i);
-    }
-    else {
-        crStateError(__LINE__, __FILE__, GL_OUT_OF_MEMORY, "glGenBuffersARB");
-    }
-}
-
-
 GLboolean STATE_APIENTRY
 crStateIsBufferARB(GLuint buffer)

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

@@ -23 +23 @@
 #include "cr_mem.h"
 
-#define CRSTATE_FBO_CHECKERR_RET(expr, result, message, ret)         \
-    if (expr) {                                             \
-        crStateError(__LINE__, __FILE__, result, message);  \
-        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)
@@ -44 +34 @@
 }
 
+void STATE_APIENTRY crStateGenFramebuffersEXT(GLsizei n, GLuint *buffers)
+{
+    CRContext *g = GetCurrentContext();
+    crStateGenNames(g, g->shared->fbTable, n, buffers);
+}
+
+void STATE_APIENTRY crStateGenRenderbuffersEXT(GLsizei n, GLuint *buffers)
+{
+    CRContext *g = GetCurrentContext();
+    crStateGenNames(g, g->shared->rbTable, n, buffers);
+}
+
+static void crStateInitFrameBuffer(CRFramebufferObject *fbo);
+
+static CRFramebufferObject *
+crStateFramebufferAllocate(CRContext *ctx, GLuint name)
+{
+    CRFramebufferObject *buffer = (CRFramebufferObject*) crCalloc(sizeof(CRFramebufferObject));
+    CRSTATE_CHECKERR_RET(!buffer, GL_OUT_OF_MEMORY, "crStateFramebufferAllocate", NULL);
+    buffer->id = name;
+#ifndef IN_GUEST
+    diff_api.GenFramebuffersEXT(1, &buffer->hwid);
+    if (!buffer->hwid)
+    {
+        crWarning("GenFramebuffersEXT failed!");
+        crFree(buffer);
+        return NULL;
+    }
+#else
+    buffer->hwid = name;
+#endif
+
+    crStateInitFrameBuffer(buffer);
+    crHashtableAdd(ctx->shared->fbTable, name, buffer);
+#ifndef IN_GUEST
+    CR_STATE_SHAREDOBJ_USAGE_INIT(buffer);
+#endif
+
+    return buffer;
+}
+
+static CRRenderbufferObject *
+crStateRenderbufferAllocate(CRContext *ctx, GLuint name)
+{
+    CRRenderbufferObject *buffer = (CRRenderbufferObject*) crCalloc(sizeof(CRRenderbufferObject));
+    CRSTATE_CHECKERR_RET(!buffer, GL_OUT_OF_MEMORY, "crStateRenderbufferAllocate", NULL);
+    buffer->id = name;
+#ifndef IN_GUEST
+    diff_api.GenRenderbuffersEXT(1, &buffer->hwid);
+    if (!buffer->hwid)
+    {
+        crWarning("GenRenderbuffersEXT failed!");
+        crFree(buffer);
+        return NULL;
+    }
+#else
+    buffer->hwid = name;
+#endif
+
+    buffer->internalformat = GL_RGBA;
+    crHashtableAdd(ctx->shared->rbTable, name, buffer);
+#ifndef IN_GUEST
+    CR_STATE_SHAREDOBJ_USAGE_INIT(buffer);
+#endif
+
+    return buffer;
+}
+
 void crStateFreeFBO(void *data)
 {
@@ -88 +146 @@
     CRFramebufferObjectState *fbo = &g->framebufferobject;
 
-    CRSTATE_FBO_CHECKERR(g->current.inBeginEnd, GL_INVALID_OPERATION, "called in begin/end");
-    CRSTATE_FBO_CHECKERR(target!=GL_RENDERBUFFER_EXT, GL_INVALID_ENUM, "invalid target");
+    CRSTATE_CHECKERR(g->current.inBeginEnd, GL_INVALID_OPERATION, "called in begin/end");
+    CRSTATE_CHECKERR(target!=GL_RENDERBUFFER_EXT, GL_INVALID_ENUM, "invalid target");
 
     if (renderbuffer)
@@ -96 +154 @@
         if (!fbo->renderbuffer)
         {
-            fbo->renderbuffer = (CRRenderbufferObject*) crCalloc(sizeof(CRRenderbufferObject));
-            CRSTATE_FBO_CHECKERR(!fbo->renderbuffer, GL_OUT_OF_MEMORY, "glBindRenderbufferEXT");
-            fbo->renderbuffer->id = renderbuffer;
-            fbo->renderbuffer->hwid = renderbuffer;
-            fbo->renderbuffer->internalformat = GL_RGBA;
-            crHashtableAdd(g->shared->rbTable, renderbuffer, fbo->renderbuffer);
-#ifndef IN_GUEST
-        CR_STATE_SHAREDOBJ_USAGE_INIT(fbo->renderbuffer);
-#endif
+            CRSTATE_CHECKERR(!crHashtableIsKeyUsed(g->shared->rbTable, renderbuffer), GL_INVALID_OPERATION, "name is not a renderbuffer");
+            fbo->renderbuffer = crStateRenderbufferAllocate(g, renderbuffer);
         }
 #ifndef IN_GUEST
@@ -159 +210 @@
     int i;
 
-    CRSTATE_FBO_CHECKERR(g->current.inBeginEnd, GL_INVALID_OPERATION, "called in begin/end");
-    CRSTATE_FBO_CHECKERR(n<0, GL_INVALID_OPERATION, "n<0");
+    CRSTATE_CHECKERR(g->current.inBeginEnd, GL_INVALID_OPERATION, "called in begin/end");
+    CRSTATE_CHECKERR(n<0, GL_INVALID_OPERATION, "n<0");
 
     for (i = 0; i < n; i++)
@@ -192 +243 @@
     CRRenderbufferObject *rb = fbo->renderbuffer;
 
-    CRSTATE_FBO_CHECKERR(g->current.inBeginEnd, GL_INVALID_OPERATION, "called in begin/end");
-    CRSTATE_FBO_CHECKERR(target!=GL_RENDERBUFFER_EXT, GL_INVALID_ENUM, "invalid target");
-    CRSTATE_FBO_CHECKERR(!rb, GL_INVALID_OPERATION, "no bound renderbuffer");
+    CRSTATE_CHECKERR(g->current.inBeginEnd, GL_INVALID_OPERATION, "called in begin/end");
+    CRSTATE_CHECKERR(target!=GL_RENDERBUFFER_EXT, GL_INVALID_ENUM, "invalid target");
+    CRSTATE_CHECKERR(!rb, GL_INVALID_OPERATION, "no bound renderbuffer");
 
     rb->width = width;
@@ -208 +259 @@
     CRRenderbufferObject *rb = fbo->renderbuffer;
 
-    CRSTATE_FBO_CHECKERR(g->current.inBeginEnd, GL_INVALID_OPERATION, "called in begin/end");
-    CRSTATE_FBO_CHECKERR(target!=GL_RENDERBUFFER_EXT, GL_INVALID_ENUM, "invalid target");
-    CRSTATE_FBO_CHECKERR(!rb, GL_INVALID_OPERATION, "no bound renderbuffer");
+    CRSTATE_CHECKERR(g->current.inBeginEnd, GL_INVALID_OPERATION, "called in begin/end");
+    CRSTATE_CHECKERR(target!=GL_RENDERBUFFER_EXT, GL_INVALID_ENUM, "invalid target");
+    CRSTATE_CHECKERR(!rb, GL_INVALID_OPERATION, "no bound renderbuffer");
 
     switch (pname)
@@ -229 +280 @@
         case GL_RENDERBUFFER_DEPTH_SIZE_EXT:
         case GL_RENDERBUFFER_STENCIL_SIZE_EXT:
-            CRSTATE_FBO_CHECKERR(GL_TRUE, GL_INVALID_OPERATION, "unimplemented");
+            CRSTATE_CHECKERR(GL_TRUE, GL_INVALID_OPERATION, "unimplemented");
             break;
         default:
-            CRSTATE_FBO_CHECKERR(GL_TRUE, GL_INVALID_ENUM, "invalid pname");
+            CRSTATE_CHECKERR(GL_TRUE, GL_INVALID_ENUM, "invalid pname");
     }
 }
@@ -291 +342 @@
     CRFramebufferObject *pFBO=NULL;
 
-    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)),
+    CRSTATE_CHECKERR(g->current.inBeginEnd, GL_INVALID_OPERATION, "called in begin/end");
+    CRSTATE_CHECKERR(((target!=GL_FRAMEBUFFER_EXT) && (target!=GL_READ_FRAMEBUFFER) && (target!=GL_DRAW_FRAMEBUFFER)),
                          GL_INVALID_ENUM, "invalid target");
 
@@ -300 +351 @@
         if (!pFBO)
         {
-            pFBO = (CRFramebufferObject*) crCalloc(sizeof(CRFramebufferObject));
-            CRSTATE_FBO_CHECKERR(!pFBO, GL_OUT_OF_MEMORY, "glBindFramebufferEXT");
-            pFBO->id = framebuffer;
-            pFBO->hwid = framebuffer;
-            crStateInitFrameBuffer(pFBO);
-            crHashtableAdd(g->shared->fbTable, framebuffer, pFBO);
-#ifndef IN_GUEST
-            CR_STATE_SHAREDOBJ_USAGE_INIT(pFBO);
-#endif
+            CRSTATE_CHECKERR(!crHashtableIsKeyUsed(g->shared->fbTable, framebuffer), GL_INVALID_OPERATION, "name is not a framebuffer");
+            pFBO = crStateFramebufferAllocate(g, framebuffer);
         }
 
@@ -343 +387 @@
     int i;
 
-    CRSTATE_FBO_CHECKERR(g->current.inBeginEnd, GL_INVALID_OPERATION, "called in begin/end");
-    CRSTATE_FBO_CHECKERR(n<0, GL_INVALID_OPERATION, "n<0");
+    CRSTATE_CHECKERR(g->current.inBeginEnd, GL_INVALID_OPERATION, "called in begin/end");
+    CRSTATE_CHECKERR(n<0, GL_INVALID_OPERATION, "n<0");
 
     for (i = 0; i < n; i++)
@@ -385 +429 @@
 }
 
-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;
-
-
-    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);
+static GLuint crStateFramebufferGet(CRFramebufferObjectState *fbo, GLenum target, CRFramebufferObject **apFBOs)
+{
+    GLuint cPBOs = 0;
     switch (target)
     {
@@ -422 +456 @@
             break;
         default:
-            crWarning("unexpected dtarget value: 0x%x", target);
-            CRSTATE_FBO_CHECKERR_RET(1, GL_INVALID_ENUM, "unexpected target", 0);
-            break;
-    }
+            crWarning("unexpected target value: 0x%x", target);
+            cPBOs = 0;
+            break;
+    }
+
+    return cPBOs;
+}
+
+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;
+
+
+    CRSTATE_CHECKERR_RET(g->current.inBeginEnd, GL_INVALID_OPERATION, "called in begin/end", 0);
+    CRSTATE_CHECKERR_RET(((target!=GL_FRAMEBUFFER_EXT) && (target!=GL_READ_FRAMEBUFFER) && (target!=GL_DRAW_FRAMEBUFFER)),
+                         GL_INVALID_ENUM, "invalid target", 0);
+
+    cPBOs = crStateFramebufferGet(fbo, target, apFBOs);
+    CRSTATE_CHECKERR_RET(!cPBOs, GL_INVALID_ENUM, "unexpected target", 0);
 
     Assert(cPBOs);
@@ -432 +486 @@
    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);
+        CRSTATE_CHECKERR_RET(!apFBOs[i], GL_INVALID_OPERATION, "no fbo bound", 0);
+        CRSTATE_CHECKERR_RET(!crStateGetFBOAttachmentPoint(apFBOs[i], attachment, &aap[i]), GL_INVALID_ENUM, "invalid attachment", 0);
     }
 
@@ -466 +520 @@
             break;
         default:
-            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);
+            CRSTATE_CHECKERR_RET(GL_TRUE, GL_INVALID_OPERATION, "invalid textarget", 0);
+    }
+
+    CRSTATE_CHECKERR_RET(!*tobj, GL_INVALID_OPERATION, "invalid textarget/texture combo", 0);
 
     if (GL_TEXTURE_RECTANGLE_ARB==textarget)
     {
-        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);
+        CRSTATE_CHECKERR_RET(level!=0, GL_INVALID_VALUE, "non zero mipmap level", 0);
+    }
+
+    CRSTATE_CHECKERR_RET(level<0, GL_INVALID_VALUE, "level<0", 0);
+    CRSTATE_CHECKERR_RET(level>maxtexsizelog2, GL_INVALID_VALUE, "level too big", 0);
 
 #ifdef IN_GUEST
@@ -516 +570 @@
     }
 
-    CRSTATE_FBO_CHECKERR(textarget!=GL_TEXTURE_1D, GL_INVALID_OPERATION, "textarget");
+    CRSTATE_CHECKERR(textarget!=GL_TEXTURE_1D, GL_INVALID_OPERATION, "textarget");
 
 #ifndef IN_GUEST
@@ -552 +606 @@
     }
 
-    CRSTATE_FBO_CHECKERR(GL_TEXTURE_1D==textarget || GL_TEXTURE_3D==textarget, GL_INVALID_OPERATION, "textarget");
+    CRSTATE_CHECKERR(GL_TEXTURE_1D==textarget || GL_TEXTURE_3D==textarget, GL_INVALID_OPERATION, "textarget");
 
 #ifndef IN_GUEST
@@ -592 +646 @@
     }
 
-    CRSTATE_FBO_CHECKERR(zoffset>(g->limits.max3DTextureSize-1), GL_INVALID_VALUE, "zoffset too big");
-    CRSTATE_FBO_CHECKERR(textarget!=GL_TEXTURE_3D, GL_INVALID_OPERATION, "textarget");
+    CRSTATE_CHECKERR(zoffset>(g->limits.max3DTextureSize-1), GL_INVALID_VALUE, "zoffset too big");
+    CRSTATE_CHECKERR(textarget!=GL_TEXTURE_3D, GL_INVALID_OPERATION, "textarget");
 
 #ifndef IN_GUEST
@@ -618 +672 @@
     CRRenderbufferObject *rb;
 
-    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)),
+    CRSTATE_CHECKERR(g->current.inBeginEnd, GL_INVALID_OPERATION, "called in begin/end");
+    CRSTATE_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_CHECKERR(!pFBO, GL_INVALID_OPERATION, "no fbo bound");
+    CRSTATE_CHECKERR(!crStateGetFBOAttachmentPoint(pFBO, attachment, &ap), GL_INVALID_ENUM, "invalid attachment");
 
     if (!renderbuffer)
@@ -638 +692 @@
 
     rb = (CRRenderbufferObject*) crHashtableSearch(g->shared->rbTable, renderbuffer);
-    CRSTATE_FBO_CHECKERR(!rb, GL_INVALID_OPERATION, "rb doesn't exist");
+    if (!rb)
+    {
+        CRSTATE_CHECKERR(!crHashtableIsKeyUsed(g->shared->rbTable, renderbuffer), GL_INVALID_OPERATION, "rb doesn't exist");
+        rb = crStateRenderbufferAllocate(g, renderbuffer);
+    }
 
 #ifdef IN_GUEST
@@ -656 +714 @@
     CRContext *g = GetCurrentContext();
     CRFramebufferObjectState *fbo = &g->framebufferobject;
-    CRFramebufferObject *pFBO;
+    CRFramebufferObject *apFBOs[2];
+    GLint cFBOs = 0, i;
     CRFBOAttachmentPoint *ap;
 
-    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)),
+    CRSTATE_CHECKERR(g->current.inBeginEnd, GL_INVALID_OPERATION, "called in begin/end");
+    CRSTATE_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");
-
-    switch (pname)
-    {
-        case GL_FRAMEBUFFER_ATTACHMENT_OBJECT_TYPE_EXT:
-            *params = ap->type;
-            break;
-        case GL_FRAMEBUFFER_ATTACHMENT_OBJECT_NAME_EXT:
-            CRSTATE_FBO_CHECKERR(ap->type!=GL_RENDERBUFFER_EXT && ap->type!=GL_TEXTURE, GL_INVALID_ENUM, "can't query object name when it's not bound")
-            *params = ap->name;
-            break;
-        case GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_LEVEL_EXT:
-            CRSTATE_FBO_CHECKERR(ap->type!=GL_TEXTURE, GL_INVALID_ENUM, "not a texture");
-            *params = ap->level;
-            break;
-        case GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_CUBE_MAP_FACE_EXT:
-            CRSTATE_FBO_CHECKERR(ap->type!=GL_TEXTURE, GL_INVALID_ENUM, "not a texture");
-            *params = ap->face;
-            break;
-        case GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_3D_ZOFFSET_EXT:
-            CRSTATE_FBO_CHECKERR(ap->type!=GL_TEXTURE, GL_INVALID_ENUM, "not a texture");
-            *params = ap->zoffset;
-            break;
-        default:
-            CRSTATE_FBO_CHECKERR(GL_TRUE, GL_INVALID_ENUM, "invalid pname");
-    }
+
+    cFBOs = crStateFramebufferGet(fbo, target, apFBOs);
+
+    CRSTATE_CHECKERR(!cFBOs, GL_INVALID_OPERATION, "no fbo bound");
+
+    for (i = 0; i < cFBOs; ++i)
+    {
+        CRSTATE_CHECKERR(!crStateGetFBOAttachmentPoint(apFBOs[i], attachment, &ap), GL_INVALID_ENUM, "invalid attachment");
+
+        switch (pname)
+        {
+            case GL_FRAMEBUFFER_ATTACHMENT_OBJECT_TYPE_EXT:
+                *params = ap->type;
+                break;
+            case GL_FRAMEBUFFER_ATTACHMENT_OBJECT_NAME_EXT:
+                CRSTATE_CHECKERR(ap->type!=GL_RENDERBUFFER_EXT && ap->type!=GL_TEXTURE, GL_INVALID_ENUM, "can't query object name when it's not bound")
+                *params = ap->name;
+                break;
+            case GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_LEVEL_EXT:
+                CRSTATE_CHECKERR(ap->type!=GL_TEXTURE, GL_INVALID_ENUM, "not a texture");
+                *params = ap->level;
+                break;
+            case GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_CUBE_MAP_FACE_EXT:
+                CRSTATE_CHECKERR(ap->type!=GL_TEXTURE, GL_INVALID_ENUM, "not a texture");
+                *params = ap->face;
+                break;
+            case GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_3D_ZOFFSET_EXT:
+                CRSTATE_CHECKERR(ap->type!=GL_TEXTURE, GL_INVALID_ENUM, "not a texture");
+                *params = ap->zoffset;
+                break;
+            default:
+                CRSTATE_CHECKERR(GL_TRUE, GL_INVALID_ENUM, "invalid pname");
+        }
+    }
+}
+
+DECLEXPORT(GLboolean) STATE_APIENTRY crStateIsFramebufferEXT( GLuint framebuffer )
+{
+    CRContext *g = GetCurrentContext();
+    return crHashtableIsKeyUsed(g->shared->fbTable, framebuffer);
+}
+
+DECLEXPORT(GLboolean)  STATE_APIENTRY crStateIsRenderbufferEXT( GLuint renderbuffer )
+{
+    CRContext *g = GetCurrentContext();
+    return crHashtableIsKeyUsed(g->shared->rbTable, renderbuffer);
 }
 

trunk/src/VBox/GuestHost/OpenGL/state_tracker/state_special

@@ -376 +376 @@
 GetUniformLocation
 CopyTexImage2D
+GenFramebuffersEXT
+GenRenderbuffersEXT
+GenBuffersARB
+IsRenderbufferEXT
+IsFramebufferEXT

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

@@ -621 +621 @@
 }
 
-void STATE_APIENTRY crStateGenTextures(GLsizei n, GLuint *textures) 
-{
-    CRContext *g = GetCurrentContext();
+void crStateGenNames(CRContext *g, CRHashTable *table, GLsizei n, GLuint *names)
+{
     GLint start;
 
@@ -631 +630 @@
     {
         crStateError(__LINE__, __FILE__, GL_INVALID_OPERATION,
-                                 "glGenTextures called in Begin/End");
+                                 "crStateGenNames called in Begin/End");
         return;
     }
@@ -638 +637 @@
     {
         crStateError(__LINE__, __FILE__, GL_INVALID_VALUE,
-                                 "Negative n passed to glGenTextures: %d", n);
-        return;
-    }
-
-    start = crHashtableAllocKeys(g->shared->textureTable, n);
+                                 "Negative n passed to crStateGenNames: %d", n);
+        return;
+    }
+
+    start = crHashtableAllocKeys(table, n);
     if (start)
     {
         GLint i;
         for (i = 0; i < n; i++)
-            textures[i] = (GLuint) (start + i);
+            names[i] = (GLuint) (start + i);
     }
     else
@@ -653 +652 @@
         crStateError(__LINE__, __FILE__, GL_OUT_OF_MEMORY, "glGenTextures");
     }
+}
+
+void STATE_APIENTRY crStateGenTextures(GLsizei n, GLuint *textures) 
+{
+    CRContext *g = GetCurrentContext();
+    crStateGenNames(g, g->shared->textureTable, n, textures);
 }