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

Timestamp:

May 20, 2013 12:15:50 PM (12 years ago)

Author:

vboxsync

Message:

crOpenGL: proper support for GL_NONE,AUX,etc. for offscreen rendering

Location:

trunk/src/VBox/GuestHost/OpenGL

Files:

• include/cr_glstate.h (modified) (1 diff)
• include/cr_server.h (modified) (1 diff)
• state_tracker/state_diff.c (modified) (2 diffs)

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

@@ -265 +265 @@
 {
     /* override default draw and read buffers to be used for offscreen rendering */
-    GLint idFBO;
+    GLint idOverrrideFBO;
     uint32_t cElements;
     CRFBDataElement aElements[1];

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

@@ -236 +236 @@
      * this is why we place some FBO stuff to the tail
      * @todo: once we need to increment a saved state version, we could refactor this structure */
-    GLuint iCurDrawBuffer;
-    GLuint iCurReadBuffer;
+    GLint iCurDrawBuffer;
+    GLint iCurReadBuffer;
 
     GLuint idDepthStencilRB;

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

@@ -255 +255 @@
 
     }
-    else if (data->idFBO)
-    {
-        diff_api.BindFramebufferEXT(GL_READ_FRAMEBUFFER, data->idFBO);
+    else if (data->idOverrrideFBO)
+    {
+        diff_api.BindFramebufferEXT(GL_READ_FRAMEBUFFER, data->idOverrrideFBO);
         diff_api.ReadBuffer(GL_COLOR_ATTACHMENT0);
     }
@@ -393 +393 @@
             diff_api.DrawBuffer(to->framebufferobject.drawFB->drawbuffer[0]);
         }
-        else if (data->idFBO)
-        {
-            diff_api.BindFramebufferEXT(GL_DRAW_FRAMEBUFFER, data->idFBO);
+        else if (data->idOverrrideFBO)
+        {
+            diff_api.BindFramebufferEXT(GL_DRAW_FRAMEBUFFER, data->idOverrrideFBO);
             diff_api.DrawBuffer(GL_COLOR_ATTACHMENT0);
         }