Changeset 37333 in vbox for trunk/src/VBox/HostServices/SharedOpenGL/render

Timestamp:

Jun 6, 2011 6:15:15 PM (14 years ago)

Author:

vboxsync

Message:

OpenGl-OSX: debug left over; remove compiler warnings; use GL_LINEAR for thumbnail creation

Location:

trunk/src/VBox/HostServices/SharedOpenGL/render

Files:

• renderspu.c (modified) (1 diff)
• renderspu_cocoa_helper.m (modified) (10 diffs)

trunk/src/VBox/HostServices/SharedOpenGL/render/renderspu.c

@@ -1095 +1095 @@
 void renderspuReadBuffer(GLenum mode)
 {
-    printf("read win id: %d\n", render_spu.window_id);
     renderspu_SystemReadBuffer(mode);
 }

trunk/src/VBox/HostServices/SharedOpenGL/render/renderspu_cocoa_helper.m

@@ -73 +73 @@
 /* Debug macros */
 #define FBO 1 /* Disable this to see how the output is without the FBO in the middle of the processing chain. */
-//#define SHOW_WINDOW_BACKGROUND 1 /* Define this to see the window background even if the window is clipped */
-//#define DEBUG_VERBOSE /* Define this to get some debug info about the messages flow. */
+#if 0
+#define SHOW_WINDOW_BACKGROUND 1 /* Define this to see the window background even if the window is clipped */
+#define DEBUG_VERBOSE /* Define this to get some debug info about the messages flow. */
+#endif
 
 #ifdef DEBUG_poetzsch
@@ -1223 +1225 @@
         /* Only reset if we aren't currently front. */
         glGetIntegerv(GL_DRAW_BUFFER, &drawId);
-        if (drawId != m_FBOAttFrontId)
+        if ((GLuint)drawId != m_FBOAttFrontId)
             m_fFrontDrawing = false;
         [self tryDraw];
@@ -1254 +1256 @@
         case GL_DRAW_FRAMEBUFFER_EXT:
         {
-//            DEBUG_MSG_1(("StateInfo current Framebuffer: %d\n", *params));
             if ((GLuint)*params == m_FBOId)
                 *params = 0;
@@ -1262 +1263 @@
         case GL_DRAW_BUFFER:
         {
-//            DEBUG_MSG_1(("StateInfo current read/draw buffer: %d\n", *params));
             if ((GLuint)*params == m_FBOAttFrontId)
                 *params = GL_FRONT;
@@ -1406 +1406 @@
             }
 #endif
-//            glFinish();
+            /*
+            glFinish();
+            */
             [m_pSharedGLCtx flushBuffer];
 
@@ -1417 +1419 @@
             if (   (GLuint)oldDrawId == m_FBOAttBackId
                 || (GLuint)oldDrawId == m_FBOAttFrontId)
-//                glBindFramebufferEXT(GL_DRAW_FRAMEBUFFER_EXT, oldDrawFBOId);
                 glBindFramebufferEXT(GL_DRAW_FRAMEBUFFER_EXT, m_FBOId);
             glDrawBuffer(oldDrawId);
@@ -1473 +1474 @@
                 glBlitFramebufferEXT(x1, y1 + m_RootShift.y, x2, y2 + m_RootShift.y,
                                      x1 * m_FBOThumbScaleX, y1 * m_FBOThumbScaleY, x2 * m_FBOThumbScaleX, y2 * m_FBOThumbScaleY,
-                                     GL_COLOR_BUFFER_BIT, GL_NEAREST);
+                                     GL_COLOR_BUFFER_BIT, GL_LINEAR);
             }
             glFinish();
@@ -1595 +1596 @@
         attribs[i++] = NSOpenGLPFADepthSize;
         attribs[i++] = 24;
-//        attribs[i++] = 32;
     }
     if (fVisParams & CR_STENCIL_BIT)
@@ -1661 +1661 @@
     NSAutoreleasePool *pPool = [[NSAutoreleasePool alloc] init];
 
-//    [pCtx release];
+    /*
+    [pCtx release];
+    */
 
     [pPool release];
@@ -1916 +1918 @@
 {
     NSAutoreleasePool *pPool = [[NSAutoreleasePool alloc] init];
+    GLbitfield mask = GL_COLOR_BUFFER_BIT;
 
     DEBUG_MSG_1(("glCopyPixels called: %d,%d-%dx%d type: %d\n", x, y, width, height, type));
 
 #ifdef FBO
-    GLbitfield mask = GL_COLOR_BUFFER_BIT;
     if (type == GL_DEPTH)
         mask = GL_DEPTH_BUFFER_BIT;