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

Timestamp:

Nov 4, 2011 3:16:16 PM (13 years ago)

Author:

vboxsync

Message:

Made OpenGL build against the Mac OS X 10.7 SDK. Some cleanups.

Location:

trunk/src/VBox/HostServices/SharedOpenGL/render

Files:

• renderspu_cocoa.c (modified) (1 diff)
• renderspu_cocoa_helper.h (modified) (3 diffs)
• renderspu_cocoa_helper.m (modified) (9 diffs)

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

@@ -1 +1 @@
 /** @file
- *
  * VirtualBox OpenGL Cocoa Window System implementation
  */

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

@@ +1 @@
+/* $Id$ */
 /** @file
- *
  * VirtualBox OpenGL Cocoa Window System Helper definition
  */
 
 /*
- * Copyright (C) 2009 Oracle Corporation
+ * Copyright (C) 2009-2011 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
@@ -16 +16 @@
  */
 
-#ifndef __renderspu_cocoa_helper_h
-#define __renderspu_cocoa_helper_h
+#ifndef ___renderspu_cocoa_helper_h
+#define ___renderspu_cocoa_helper_h
 
+#include <iprt/cdefs.h>
 #include <VBox/VBoxCocoa.h>
-#include <iprt/cdefs.h>
 #include <OpenGL/OpenGL.h>
 
@@ -56 +56 @@
 RT_C_DECLS_END
 
-#endif /* __renderspu_cocoa_helper_h */
+#endif /* !___renderspu_cocoa_helper_h */
 

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

@@ +1 @@
+/* $Id$ */
 /** @file
- *
- * VirtualBox OpenGL Cocoa Window System Helper implementation
+ * VirtualBox OpenGL Cocoa Window System Helper Implementation.
  */
 
 /*
- * Copyright (C) 2009 Oracle Corporation
+ * Copyright (C) 2009-2011 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
@@ -27 +27 @@
 #include <iprt/time.h>
 
-/*
+/** @page pg_opengl_cocoa  OpenGL - Cocoa Window System Helper
+ *
  * How this works:
  * In general it is not so easy like on the other platforms, cause Cocoa
@@ -74 +75 @@
 #define FBO 1 /* Disable this to see how the output is without the FBO in the middle of the processing chain. */
 #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. */
+# 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
-#define DEBUG_MSG(text) \
+# define DEBUG_MSG(text) \
     printf text
 #else
-#define DEBUG_MSG(text) \
+# define DEBUG_MSG(text) \
     do {} while (0)
 #endif
 
 #ifdef DEBUG_VERBOSE
-#define DEBUG_MSG_1(text) \
+# define DEBUG_MSG_1(text) \
     DEBUG_MSG(text)
 #else
-#define DEBUG_MSG_1(text) \
+# define DEBUG_MSG_1(text) \
     do {} while (0)
 #endif
 
 #ifdef DEBUG_poetzsch
-#define CHECK_GL_ERROR()\
+# define CHECK_GL_ERROR()\
     do \
     { \
@@ -123 +124 @@
     }
 #else
-#define CHECK_GL_ERROR()\
+# define CHECK_GL_ERROR()\
     do {} while (0)
 #endif
 
 #define GL_SAVE_STATE \
-do \
-{ \
-    glPushAttrib(GL_ALL_ATTRIB_BITS); \
-    glPushClientAttrib(GL_CLIENT_ALL_ATTRIB_BITS); \
-    glMatrixMode(GL_PROJECTION); \
-    glPushMatrix(); \
-    glMatrixMode(GL_TEXTURE); \
-    glPushMatrix(); \
-    glMatrixMode(GL_COLOR); \
-    glPushMatrix(); \
-    glMatrixMode(GL_MODELVIEW); \
-    glPushMatrix(); \
-} \
-while(0);
+    do \
+    { \
+        glPushAttrib(GL_ALL_ATTRIB_BITS); \
+        glPushClientAttrib(GL_CLIENT_ALL_ATTRIB_BITS); \
+        glMatrixMode(GL_PROJECTION); \
+        glPushMatrix(); \
+        glMatrixMode(GL_TEXTURE); \
+        glPushMatrix(); \
+        glMatrixMode(GL_COLOR); \
+        glPushMatrix(); \
+        glMatrixMode(GL_MODELVIEW); \
+        glPushMatrix(); \
+    } \
+    while(0);
 
 #define GL_RESTORE_STATE \
-do \
-{ \
-    glMatrixMode(GL_MODELVIEW); \
-    glPopMatrix(); \
-    glMatrixMode(GL_COLOR); \
-    glPopMatrix(); \
-    glMatrixMode(GL_TEXTURE); \
-    glPopMatrix(); \
-    glMatrixMode(GL_PROJECTION); \
-    glPopMatrix(); \
-    glPopClientAttrib(); \
-    glPopAttrib(); \
-} \
-while(0);
-
-/* Custom OpenGL context class. This implementation doesn't allow to set a view
- * to the context, but save the view for later use. Also it saves a copy of the
+    do \
+    { \
+        glMatrixMode(GL_MODELVIEW); \
+        glPopMatrix(); \
+        glMatrixMode(GL_COLOR); \
+        glPopMatrix(); \
+        glMatrixMode(GL_TEXTURE); \
+        glPopMatrix(); \
+        glMatrixMode(GL_PROJECTION); \
+        glPopMatrix(); \
+        glPopClientAttrib(); \
+        glPopAttrib(); \
+    } \
+    while(0);
+
+/** Custom OpenGL context class.
+ *
+ * This implementation doesn't allow to set a view to the
+ * context, but save the view for later use. Also it saves a copy of the
  * pixel format used to create that context for later use. */
 @interface OverlayOpenGLContext: NSOpenGLContext
@@ -173 +176 @@
 @class DockOverlayView;
 
-/* The custom view class. This is the main class of the cocoa OpenGL
- * implementation. It manages an frame buffer object for the rendering of the
- * guest applications. The guest applications render in this frame buffer which
+/** The custom view class.
+ * This is the main class of the cocoa OpenGL implementation. It
+ * manages an frame buffer object for the rendering of the guest
+ * applications. The guest applications render in this frame buffer which
  * is bind to an OpenGL texture. To display the guest content, an secondary
  * shared OpenGL context of the main OpenGL context is created. The secondary
@@ -203 +207 @@
 #endif
 
-    /* The corresponding dock tile view of this OpenGL view & all helper
+    /** The corresponding dock tile view of this OpenGL view & all helper
      * members. */
     DockOverlayView *m_DockTileView;
@@ -221 +225 @@
     NSSize           m_Size;
 
-    /* This is necessary for clipping on the root window */
+    /** This is necessary for clipping on the root window */
     NSPoint          m_RootShift;
 }
@@ -262 +266 @@
 @end
 
-/* Helper view. This view is added as a sub view of the parent view to track
- * main window changes. Whenever the main window is changed (which happens on
- * fullscreen/seamless entry/exit) the overlay window is informed & can add
- * them self as a child window again. */
+/** Helper view.
+ *
+ * This view is added as a sub view of the parent view to track
+ * main window changes. Whenever the main window is changed
+ * (which happens on fullscreen/seamless entry/exit) the overlay
+ * window is informed & can add them self as a child window
+ * again. */
 @class OverlayWindow;
 @interface OverlayHelperView: NSView
@@ -275 +282 @@
 @end
 
-/* Custom window class. This is the overlay window which contains our custom
- * NSView. Its a direct child of the Qt Main window. It marks its background
+/** Custom window class.
+ *
+ * This is the overlay window which contains our custom NSView.
+ * Its a direct child of the Qt Main window. It marks its background
  * transparent & non opaque to make clipping possible. It also disable mouse
  * events and handle frame change events of the parent view. */