Changeset 44083 in vbox for trunk/src/VBox/GuestHost/OpenGL

Timestamp:

Dec 10, 2012 4:24:45 PM (12 years ago)

Author:

vboxsync

Message:

crOpenGL: more state fixes

Location:

trunk/src/VBox/GuestHost/OpenGL/state_tracker

Files:

• state_bufferobject.c (modified) (2 diffs)
• state_framebuffer.c (modified) (2 diffs)
• state_special (modified) (1 diff)

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

@@ -75 +75 @@
             return NULL;
     }
+}
+
+DECLEXPORT(GLboolean) STATE_APIENTRY crStateIsBufferARB( GLuint buffer )
+{
+    CRContext *g = GetCurrentContext();
+
+    FLUSH();
+
+    if (g->current.inBeginEnd) {
+        crStateError(__LINE__, __FILE__, GL_INVALID_OPERATION,
+                                 "glIsBufferARB called in begin/end");
+        return GL_FALSE;
+    }
+
+    return buffer ? crHashtableIsKeyUsed(g->shared->buffersTable, buffer) : GL_FALSE;
 }
 
@@ -347 +362 @@
 }
 
-GLboolean STATE_APIENTRY
-crStateIsBufferARB(GLuint buffer)
-{
-    CRContext *g = GetCurrentContext();
-    CRBufferObjectState *b = &g->bufferobject;
-
-    FLUSH();
-
-    if (g->current.inBeginEnd) {
-        crStateError(__LINE__, __FILE__, GL_INVALID_OPERATION,
-                                 "glIsBufferARB called in begin/end");
-        return GL_FALSE;
-    }
-
-    if (buffer && crHashtableSearch(g->shared->buffersTable, buffer))
-        return GL_TRUE;
-    else
-        return GL_FALSE;
-}
-
-
 void STATE_APIENTRY
 crStateBufferDataARB(GLenum target, GLsizeiptrARB size, const GLvoid * data, GLenum usage)

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

@@ -760 +760 @@
 {
     CRContext *g = GetCurrentContext();
-    return crHashtableIsKeyUsed(g->shared->fbTable, framebuffer);
+
+    FLUSH();
+
+    if (g->current.inBeginEnd) {
+        crStateError(__LINE__, __FILE__, GL_INVALID_OPERATION,
+                                 "glIsFramebufferEXT called in begin/end");
+        return GL_FALSE;
+    }
+
+    return framebuffer ? crHashtableIsKeyUsed(g->shared->fbTable, framebuffer) : GL_FALSE;
 }
 
@@ -766 +775 @@
 {
     CRContext *g = GetCurrentContext();
-    return crHashtableIsKeyUsed(g->shared->rbTable, renderbuffer);
+
+
+    FLUSH();
+
+    if (g->current.inBeginEnd) {
+        crStateError(__LINE__, __FILE__, GL_INVALID_OPERATION,
+                                 "glIsRenderbufferEXT called in begin/end");
+        return GL_FALSE;
+    }
+
+    return renderbuffer ? crHashtableIsKeyUsed(g->shared->rbTable, renderbuffer) : GL_FALSE;
 }
 

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

@@ -378 +378 @@
 GenFramebuffersEXT
 GenRenderbuffersEXT
-GenBuffersARB
 IsRenderbufferEXT
 IsFramebufferEXT