Changeset 69310 in vbox for trunk/src

Timestamp:

Oct 25, 2017 2:24:45 PM (7 years ago)

Author:

vboxsync

Message:

common/crOpenGL: scm updates

Location:

trunk/src/VBox/Additions/common/crOpenGL

Files:

• .scm-settings (added)
• AIX_exports.py (modified) (1 prop)
• DD_glc.py (modified) (1 diff, 1 prop)
• DD_glh.py (modified) (1 diff, 1 prop)
• Darwin_exports.py (modified) (1 prop)
• FreeBSD_exports.py (modified) (1 prop)
• IRIX64_exports.py (modified) (1 prop)
• Linux_exports.py (modified) (1 prop)
• Linux_i386_exports.py (modified) (1 prop)
• Linux_i386_exports_dri.py (modified) (1 prop)
• Linux_i386_glxapi_exports.py (modified) (2 diffs)
• NULLfuncs.py (modified) (1 prop)
• OSF1_exports.py (modified) (1 prop)
• SunOS_exports.py (modified) (1 prop)
• SunOS_i386_exports.py (modified) (1 prop)
• SunOS_i386_exports_dri.py (modified) (1 prop)
• SunOS_i386_glxapi_exports.py (modified) (1 prop)
• VBoxICDList.h (modified) (1 diff)
• alias_exports.py (modified) (1 prop)
• array/arrayspu.c (modified) (4 diffs, 1 prop)
• array/arrayspu.def (modified) (1 prop)
• array/arrayspu_config.c (modified) (1 prop)
• array/arrayspu_init.c (modified) (2 diffs, 1 prop)
• context.c (modified) (14 diffs, 1 prop)
• cr_gl.py (modified) (1 diff, 1 prop)
• defs.py (modified) (2 diffs, 1 prop)
• defs64.py (modified) (2 diffs)
• dri_drv.c (modified) (15 diffs)
• dri_glx.h (modified) (1 diff)
• dri_util.c (modified) (22 diffs)
• egl.c (modified) (4 diffs)
• entrypoints.py (modified) (1 diff, 1 prop)
• fakedri_drv.c (modified) (21 diffs)
• fakedri_drv.h (modified) (2 diffs)
• fakedri_glfuncsList.h (modified) (1 diff)
• fakedri_glxfuncsList.h (modified) (1 diff)
• feedback/feedback_context.c (modified) (2 diffs)
• feedback/feedbackspu_init.c (modified) (1 diff)
• getprocaddress.py (modified) (1 prop)
• glx.c (modified) (37 diffs, 1 prop)
• glx_c_exports.c (modified) (1 diff, 1 prop)
• glx_proto.h (modified) (1 diff)
• icd_drv.c (modified) (5 diffs, 1 prop)
• load.c (modified) (5 diffs, 1 prop)
• pack/pack.def (modified) (1 prop)
• pack/pack.py (modified) (1 diff, 1 prop)
• pack/packspu_beginend.py (modified) (1 prop)
• pack/packspu_bufferobject.c (modified) (2 diffs, 1 prop)
• pack/packspu_client.c (modified) (3 diffs, 1 prop)
• pack/packspu_config.c (modified) (1 diff, 1 prop)
• pack/packspu_context.c (modified) (1 diff, 1 prop)
• pack/packspu_flush.py (modified) (1 prop)
• pack/packspu_framebuffer.c (modified) (6 diffs)
• pack/packspu_get.py (modified) (4 diffs, 1 prop)
• pack/packspu_getshaders.c (modified) (1 diff, 1 prop)
• pack/packspu_getstring.c (modified) (2 diffs, 1 prop)
• pack/packspu_glsl.c (modified) (1 diff)
• pack/packspu_init.c (modified) (1 prop)
• pack/packspu_misc.c (modified) (3 diffs, 1 prop)
• pack/packspu_net.c (modified) (2 diffs, 1 prop)
• pack/packspu_pixel.c (modified) (4 diffs, 1 prop)
• pack/packspu_proto.py (modified) (1 diff, 1 prop)
• pack/packspu_swapbuf.c (modified) (1 diff, 1 prop)
• pack/packspu_texture.c (modified) (1 prop)
• passthrough/passthrough.def (modified) (1 prop)
• passthrough/passthrough.py (modified) (1 prop)
• passthrough/passthroughspu_init.c (modified) (1 diff, 1 prop)
• stub.c (modified) (12 diffs, 1 prop)
• stub_common.py (modified) (10 diffs, 1 prop)
• tsfuncs.py (modified) (1 prop)
• utils.c (modified) (16 diffs)
• vboxdri_drv.c (modified) (11 diffs)
• wgl.c (modified) (15 diffs, 1 prop)
• windows_exports.py (modified) (1 diff, 1 prop)
• windows_getprocaddress.py (modified) (1 diff, 1 prop)
• windows_i386_exports.py (modified) (1 prop)
• xfont.c (modified) (1 prop)

trunk/src/VBox/Additions/common/crOpenGL/DD_glc.py

@@ -6 +6 @@
 
 /*
- * Copyright (C) 2009-2016 Oracle Corporation
+ * Copyright (C) 2009-2016 """ """Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as

trunk/src/VBox/Additions/common/crOpenGL/DD_glh.py

@@ -6 +6 @@
 
 /*
- * Copyright (C) 2009-2016 Oracle Corporation
+ * Copyright (C) 2009-2016 """ """Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as

trunk/src/VBox/Additions/common/crOpenGL/Linux_i386_glxapi_exports.py

@@ +1 @@
+from __future__ import print_function
+
+__copyright__ = \
 """
 Copyright (C) 2009-2016 Oracle Corporation
@@ -9 +12 @@
 VirtualBox OSE distribution. VirtualBox OSE is distributed in the
 hope that it will be useful, but WITHOUT ANY WARRANTY of any kind.
-"""
+""";
 
-from __future__ import print_function
 import sys
 

trunk/src/VBox/Additions/common/crOpenGL/VBoxICDList.h

@@ +1 @@
+/* $Id$ */
 /** @file
- *
  * VirtualBox Windows NT/2000/XP guest OpenGL ICD
- *
+ */
+
+/*
  * Copyright (C) 2006-2016 Oracle Corporation
  *

trunk/src/VBox/Additions/common/crOpenGL/array/arrayspu.c

@@ -479 +479 @@
 #endif
     //crDebug("arrayspu_DrawElements mode:0x%x, count:%d, type:0x%x", mode, count, type);
-    
+
 
     array_spu.self.Begin(mode);
@@ -664 +664 @@
 }
 
-/*@todo: it's a hack, as GLSL shouldn't blindly reuse this bit from nv_vertex_program*/
+/** @todo it's a hack, as GLSL shouldn't blindly reuse this bit from nv_vertex_program*/
 static void ARRAYSPU_APIENTRY arrayspu_UseProgram(GLuint program)
 {
@@ -672 +672 @@
 
 static void ARRAYSPU_APIENTRY
-arrayspu_VertexAttribPointerARB(GLuint index, GLint size, GLenum type, 
+arrayspu_VertexAttribPointerARB(GLuint index, GLint size, GLenum type,
                                 GLboolean normalized, GLsizei stride,
                                 const GLvoid *pointer)
@@ -845 +845 @@
         crStateMakeCurrent(array_spu.context[slot].clientState);
     }
-    else 
+    else
     {
         crStateMakeCurrent(NULL);

trunk/src/VBox/Additions/common/crOpenGL/array/arrayspu_init.c

@@ -45 +45 @@
 
     crStateInit();
-/*@todo seems default context ain't needed at all*/
+/** @todo seems default context ain't needed at all*/
     array_spu.defaultctx = crStateCreateContext( NULL, 0, NULL );
 #ifdef CR_ARB_vertex_buffer_object
@@ -82 +82 @@
     *options = arraySPUOptions;
     *flags = (SPU_NO_PACKER|SPU_NOT_TERMINAL|SPU_MAX_SERVERS_ZERO);
-    
+
     return 1;
 }

trunk/src/VBox/Additions/common/crOpenGL/context.c

@@ -6 +6 @@
 
 /**
- * \mainpage OpenGL_stub 
+ * \mainpage OpenGL_stub
  *
  * \section OpenGL_stubIntroduction Introduction
@@ -75 +75 @@
      */
     }
-    else 
+    else
 #endif
     {
@@ -257 +257 @@
 static unsigned char lastXError = Success;
 
-static int 
+static int
 errorHandler (Display *dpy, XErrorEvent *e)
 {
@@ -281 +281 @@
 #elif defined(GLX)
     Display *dpy = stubGetWindowDisplay(win);
-    if (dpy) 
+    if (dpy)
     {
         XWindowAttributes attr;
@@ -318 +318 @@
             XSync(dpy, false);
             oldErrorHandler = XSetErrorHandler(errorHandler);
-            /*@todo this will create new pixmap for window every call*/
+            /** @todo this will create new pixmap for window every call*/
             p = XCompositeNameWindowPixmap(dpy, win->drawable);
             XSync(dpy, false);
@@ -752 +752 @@
     float WidthRatio, HeightRatio;
     static int DebugFlag = 0;
-    
-    // apparently the "window" parameter passed to this 
+
+    // apparently the "window" parameter passed to this
     // function contains the native window information
     HWND NATIVEhwnd = window->hWnd;
@@ -774 +774 @@
     WidthRatio = (float)ChromiumWidth / (float)NativeWidth;
     HeightRatio = (float)ChromiumHeight / (float)NativeHeight;
-    
+
     // output some debug information at the beginning
     if(DebugFlag)
@@ -785 +785 @@
         crDebug("Chromium Height = %i", ChromiumHeight);
     }
-        
-    if (NATIVEhwnd) 
-    { 
+
+    if (NATIVEhwnd)
+    {
         GetClientRect( NATIVEhwnd, &rect );
         GetCursorPos (&point);
-        
+
         // make sure these coordinates are relative to the native window,
         // not the whole desktop
@@ -799 +799 @@
         pos[1] = (int)((NativeHeight - point.y) * HeightRatio);
     }
-    else 
+    else
     {
         pos[0] = 0;
@@ -866 +866 @@
     dpy = stubGetWindowDisplay(window);
 
-    //@todo: Performing those checks is expensive operation, especially for simple apps with high FPS.
+    /// @todo Performing those checks is expensive operation, especially for simple apps with high FPS.
     //       Disabling those triples glxgears fps, thus using xevents instead of per frame polling is much more preferred.
-    //@todo: Check similar on windows guests, though doubtful as there're no XSync like calls on windows.
+    /// @todo Check similar on windows guests, though doubtful as there're no XSync like calls on windows.
     if (window && dpy)
     {
@@ -878 +878 @@
         || !window->drawable
         || !XGetGeometry(dpy, window->drawable, &root, x, y, w, h, &border, &depth)
-        || !XTranslateCoordinates(dpy, window->drawable, root, 0, 0, x, y, &child)) 
+        || !XTranslateCoordinates(dpy, window->drawable, root, 0, 0, x, y, &child))
     {
         crWarning("Failed to get windows geometry for %p, try xwininfo", window);
@@ -1021 +1021 @@
 
     /* If the user's specified a minimum window size for Chromium, see if
-     * this window satisfies that criterium. 
+     * this window satisfies that criterium.
      */
-    if (stub.minChromiumWindowWidth > 0 && 
+    if (stub.minChromiumWindowWidth > 0 &&
         stub.minChromiumWindowHeight > 0) {
         stubGetWindowGeometry( window, &x, &y, &w, &h );
-        if (w >= stub.minChromiumWindowWidth && 
+        if (w >= stub.minChromiumWindowWidth &&
             h >= stub.minChromiumWindowHeight) {
 
             /* Check for maximum sized window now too */
-            if (stub.maxChromiumWindowWidth && 
+            if (stub.maxChromiumWindowWidth &&
                 stub.maxChromiumWindowHeight) {
                 if (w < stub.maxChromiumWindowWidth &&
                     h < stub.maxChromiumWindowHeight)
                     return GL_TRUE;
-                else 
+                else
                     return GL_FALSE;
             }
@@ -1284 +1284 @@
                         );
 #endif
-                if (context->currentDrawable && context->currentDrawable->type==CHROMIUM 
+                if (context->currentDrawable && context->currentDrawable->type==CHROMIUM
                     && context->currentDrawable->pOwner==context)
                 {
@@ -1304 +1304 @@
                         XUNLOCK(context->currentDrawable->dpy);
 #endif
-                    
+
                 }
             }

trunk/src/VBox/Additions/common/crOpenGL/cr_gl.py

@@ -6 +6 @@
 
 /*
- * Copyright (C) 2008-2016 Oracle Corporation
+ * Copyright (C) 2008-2016 """ """Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as

trunk/src/VBox/Additions/common/crOpenGL/defs.py

@@ -429 +429 @@
         pass
 
-for func_name in ( "wglChoosePixelFormat", 
+for func_name in ( "wglChoosePixelFormat",
            "wglCopyContext",
            "wglCreateContext",
@@ -452 +452 @@
            "wglUseFontBitmapsW",
            "wglUseFontOutlinesA",
-           "wglUseFontOutlinesW", 
+           "wglUseFontOutlinesW",
            "wglChoosePixelFormatEXT",
            "wglGetPixelFormatAttribivEXT",

trunk/src/VBox/Additions/common/crOpenGL/defs64.py

@@ -426 +426 @@
         print("gl%s = cr_gl%s" % (func_name,func_name))
 
-for func_name in ( "wglChoosePixelFormat", 
+for func_name in ( "wglChoosePixelFormat",
            "wglCopyContext",
            "wglCreateContext",
@@ -449 +449 @@
            "wglUseFontBitmapsW",
            "wglUseFontOutlinesA",
-           "wglUseFontOutlinesW", 
+           "wglUseFontOutlinesW",
            "wglChoosePixelFormatEXT",
            "wglGetPixelFormatAttribivEXT",

trunk/src/VBox/Additions/common/crOpenGL/dri_drv.c

@@ -149 +149 @@
 
 #if 0  /* See comment in vboxdriInitFuncs */
-static void 
+static void
 vboxDDGetBufferSize(GLframebuffer *buffer, GLuint *width, GLuint *height)
 {
@@ -223 +223 @@
 {
 }
-   
+
 static void
 vboxDDTexImage3D(GLcontext *ctx, GLenum target, GLint level,
@@ -245 +245 @@
 {
 }
-   
+
 static void
 vboxDDTexSubImage2D(GLcontext *ctx, GLenum target, GLint level,
@@ -258 +258 @@
 }
 
-   
+
 static void
 vboxDDTexSubImage3D(GLcontext *ctx, GLenum target, GLint level,
@@ -317 +317 @@
 }
 
-/*@todo Enable or disable server-side gl capabilities, not related to glEnable? */
+/** @todo Enable or disable server-side gl capabilities, not related to glEnable? */
 static void
 vboxDDEnable(GLcontext *ctx, GLenum cap, GLboolean state)
 {
-    if (state) 
+    if (state)
         cr_glEnable(cap);
-    else 
+    else
         cr_glDisable(cap);
 }
@@ -340 +340 @@
 }
 
-/*Note, checking glGetError before and after those calls is the only way 
+/*Note, checking glGetError before and after those calls is the only way
  *to return if we succeeded to get value or not, but it will add 2 sync calls and
  *will reset glGetError value returned in case application calls it explicitly
  */
-static GLboolean 
+static GLboolean
 vboxDDGetBooleanv(GLcontext *ctx, GLenum pname, GLboolean *result)
 {
@@ -351 +351 @@
 }
 
-static GLboolean 
+static GLboolean
 vboxDDGetDoublev(GLcontext *ctx, GLenum pname, GLdouble *result)
 {
@@ -358 +358 @@
 }
 
-static GLboolean 
+static GLboolean
 vboxDDGetFloatv(GLcontext *ctx, GLenum pname, GLfloat *result)
 {
@@ -365 +365 @@
 }
 
-static GLboolean 
+static GLboolean
 vboxDDGetIntegerv(GLcontext *ctx, GLenum pname, GLint *result)
 {
@@ -372 +372 @@
 }
 
-static GLboolean 
+static GLboolean
 vboxDDGetPointerv(GLcontext *ctx, GLenum pname, GLvoid **result)
 {
@@ -379 +379 @@
 }
 
-/** @todo 
+/** @todo
  * change stub's createcontext to reuse driver private part of mesa's ctx to store stub ctx info.
  */
@@ -528 +528 @@
    driver->GetPointerv = vboxDDGetPointerv;
 
-/** @todo */   
+/** @todo */
 #if FEATURE_ARB_vertex_buffer_object
    // driver->NewBufferObject = _mesa_new_buffer_object;
@@ -777 +777 @@
  * This is the driver specific part of the createNewScreen entry point.
  * Called when using legacy DRI.
- * 
+ *
  * return the __GLcontextModes supported by this driver
  */
@@ -876 +876 @@
     if (sharedContextPrivate)
       shareCtx = ((tdfxContextPtr) sharedContextPrivate)->glCtx;
-   else 
+   else
       shareCtx = NULL;
     /** @todo save ctx, or be more confident that we can don't need to. */
@@ -891 +891 @@
      * properties. */
 
-   /* Set various context configuration.  We take these values from the 
+   /* Set various context configuration.  We take these values from the
     * TDFX driver. */
    /** @r=Leonid, stub.spu->dispatch_table.GetIntegerv(GL_MAX_TEXTURE_UNITS_ARB,&value) etc.

trunk/src/VBox/Additions/common/crOpenGL/dri_glx.h

@@ -53 +53 @@
 
 /*Common glX functions*/
-extern DECLEXPORT(void) VBOXGLXTAG(glXCopyContext)( Display *dpy, GLXContext src, GLXContext dst, 
+extern DECLEXPORT(void) VBOXGLXTAG(glXCopyContext)( Display *dpy, GLXContext src, GLXContext dst,
 #if defined(SunOS)
 unsigned long mask);

trunk/src/VBox/Additions/common/crOpenGL/dri_util.c

@@ -8 +8 @@
  * useful stuff is done here that otherwise would have to be duplicated in most
  * drivers.
- * 
+ *
  * Basically, these utility functions take care of some of the dirty details of
  * screen initialization, context creation, context binding, DRM setup, etc.
@@ -48 +48 @@
 /**
  * Print message to \c stderr if the \c LIBGL_DEBUG environment variable
- * is set. 
- * 
+ * is set.
+ *
  * Is called from the drivers.
- * 
+ *
  * \param f \c printf like format string.
  */
@@ -88 +88 @@
 /**
  * Unbind context.
- * 
+ *
  * \param scrn the screen.
  * \param gc context.
  *
  * \return \c GL_TRUE on success, or \c GL_FALSE on failure.
- * 
+ *
  * \internal
  * This function calls __DriverAPIRec::UnbindContext, and then decrements
  * __DRIdrawablePrivateRec::refcount which must be non-zero for a successful
  * return.
- * 
+ *
  * While casting the opaque private pointers associated with the parameters
- * into their respective real types it also assures they are not \c NULL. 
+ * into their respective real types it also assures they are not \c NULL.
  */
 static int driUnbindContext(__DRIcontext *pcp)
@@ -197 +197 @@
             DRM_SPINUNLOCK(&psp->pSAREA->drawable_lock, psp->drawLockID);
         }
-        
+
         if ((pdp != prp) && (!prp->pStamp || *prp->pStamp != prp->lastStamp)) {
             DRM_SPINLOCK(&psp->pSAREA->drawable_lock, psp->drawLockID);
@@ -223 +223 @@
  *
  * \param pdp pointer to the private drawable information to update.
- * 
+ *
  * This function basically updates the __DRIdrawablePrivate struct's
  * cliprect information by calling \c __DRIinterfaceMethods::getDrawableInfo.
@@ -236 +236 @@
     __DRIscreenPrivate *psp = pdp->driScreenPriv;
     __DRIcontextPrivate *pcp = pdp->driContextPriv;
-    
-    if (!pcp 
+
+    if (!pcp
         || ((pdp != pcp->driDrawablePriv) && (pdp != pcp->driReadablePriv))) {
-        /* ERROR!!! 
+        /* ERROR!!!
          * ...but we must ignore it. There can be many contexts bound to a
          * drawable.
@@ -246 +246 @@
 
     if (pdp->pClipRects) {
-        _mesa_free(pdp->pClipRects); 
+        _mesa_free(pdp->pClipRects);
         pdp->pClipRects = NULL;
     }
 
     if (pdp->pBackClipRects) {
-        _mesa_free(pdp->pBackClipRects); 
+        _mesa_free(pdp->pBackClipRects);
         pdp->pBackClipRects = NULL;
     }
@@ -330 +330 @@
        case DRI2_EVENT_BUFFER_ATTACH:
           ba = (__DRIBufferAttachEvent *) p;
-          if (ba->drawable == pdp->dri2.drawable_id && 
+          if (ba->drawable == pdp->dri2.drawable_id &&
               ba->buffer.attachment == DRI_DRAWABLE_BUFFER_FRONT_LEFT)
              last_ba = ba;
@@ -336 +336 @@
        }
     }
-          
+
     if (last_dc) {
        if (pdp->w != last_dc->width || pdp->h != last_dc->height)
@@ -449 +449 @@
  *
  * \param drawablePrivate opaque pointer to the per-drawable private info.
- * 
+ *
  * \internal
  * This function calls __DRIdrawablePrivate::swapBuffers.
- * 
+ *
  * Is called directly from glXSwapBuffers().
  */
@@ -595 +595 @@
     /* This special default value is replaced with the configured
      * default value when the drawable is first bound to a direct
-     * rendering context. 
+     * rendering context.
      */
     pdp->swap_interval = (unsigned)-1;
@@ -651 +651 @@
 /**
  * Destroy the per-context private information.
- * 
+ *
  * \internal
  * This function calls __DriverAPIRec::DestroyContext on \p contextPrivate, calls
@@ -668 +668 @@
 /**
  * Create the per-drawable private driver information.
- * 
+ *
  * \param render_type   Type of rendering target.  \c GLX_RGBA is the only
  *                      type likely to ever be supported for direct-rendering.
@@ -675 +675 @@
  * \returns An opaque pointer to the per-context private information on
  *          success, or \c NULL on failure.
- * 
+ *
  * \internal
  * This function allocates and fills a __DRIcontextPrivateRec structure.  It
@@ -685 +685 @@
 static __DRIcontext *
 driCreateNewContext(__DRIscreen *psp, const __DRIconfig *config,
-                    int render_type, __DRIcontext *shared, 
+                    int render_type, __DRIcontext *shared,
                     drm_context_t hwContext, void *data)
 {
@@ -756 +756 @@
 /**
  * Destroy the per-screen private information.
- * 
+ *
  * \internal
  * This function calls __DriverAPIRec::DestroyScreen on \p screenPrivate, calls
@@ -813 +813 @@
  *
  * For legacy DRI.
- * 
+ *
  * \param scrn  Index of the screen
  * \param ddx_version Version of the 2D DDX.  This may not be meaningful for
@@ -826 +826 @@
  * \param driver_modes  Returns modes supported by the driver
  * \param loaderPrivate  ??
- * 
+ *
  * \note There is no need to check the minimum API version in this
  * function.  Since the name of this function is versioned, it is
@@ -837 +837 @@
                    const __DRIversion *drm_version,
                    const __DRIframebuffer *frame_buffer,
-                   drmAddress pSAREA, int fd, 
+                   drmAddress pSAREA, int fd,
                    const __DRIextension **extensions,
                    const __DRIconfig ***driver_modes,
@@ -1049 +1049 @@
     { __DRI_FRAME_TRACKING, __DRI_FRAME_TRACKING_VERSION },
     driFrameTracking,
-    driQueryFrameTracking    
+    driQueryFrameTracking
 };
 
 /**
  * Calculate amount of swap interval used between GLX buffer swaps.
- * 
+ *
  * The usage value, on the range [0,max], is the fraction of total swap
  * interval time used between GLX buffer swaps is calculated.
  *
  *            \f$p = t_d / (i * t_r)\f$
- * 
+ *
  * Where \f$t_d\f$ is the time since the last GLX buffer swap, \f$i\f$ is the
  * swap interval (as set by \c glXSwapIntervalSGI), and \f$t_r\f$ time
  * required for a single vertical refresh period (as returned by \c
  * glXGetMscRateOML).
- * 
+ *
  * See the documentation for the GLX_MESA_swap_frame_usage extension for more
  * details.
@@ -1076 +1076 @@
  *
  * \sa glXSwapIntervalSGI glXGetMscRateOML
- * 
+ *
  * \todo Instead of caching the \c glXGetMscRateOML function pointer, would it
  *       be possible to cache the sync rate?
@@ -1111 +1111 @@
       usage /= 1000000.0;
    }
-   
+
    return usage;
 }

trunk/src/VBox/Additions/common/crOpenGL/egl.c

@@ -17 +17 @@
  */
 
-/*******************************************************************************
-*   Header Files                                                               *
-*******************************************************************************/
+
+/*********************************************************************************************************************************
+*   Header Files                                                                                                                 *
+*********************************************************************************************************************************/
 #include <iprt/cdefs.h>
 #include <iprt/types.h>
@@ -36 +37 @@
     if (!(expr)) { printf("Assertion failed: %s\n", #expr); exit(1); }
 
-/*******************************************************************************
-*   Structures and Typedefs                                                    *
-*******************************************************************************/
+
+/*********************************************************************************************************************************
+*   Structures and Typedefs                                                                                                      *
+*********************************************************************************************************************************/
 
 struct VBEGLTLS
@@ -56 +58 @@
 };
 
-/*******************************************************************************
-*   Defined Constants And Macros                                               *
-*******************************************************************************/
+
+/*********************************************************************************************************************************
+*   Defined Constants And Macros                                                                                                 *
+*********************************************************************************************************************************/
 /** @note IDs returned for surfaces should always be lower than these constants.
  */
@@ -72 +75 @@
 #define VBEGL_ANY_SURFACE     (VBEGL_WINDOW_SURFACE | VBEGL_PBUFFER_SURFACE | VBEGL_PIXMAP_SURFACE)
 
-/*******************************************************************************
-*   Global variables                                                           *
-*******************************************************************************/
+
+/*********************************************************************************************************************************
+*   Global variables                                                                                                             *
+*********************************************************************************************************************************/
 
 static pthread_key_t  g_tls;

trunk/src/VBox/Additions/common/crOpenGL/entrypoints.py

@@ -179 +179 @@
             print("")
 
-

trunk/src/VBox/Additions/common/crOpenGL/fakedri_drv.c

@@ -1 +1 @@
 /* $Id$ */
-
 /** @file
  * VBox OpenGL DRI driver functions
@@ -41 +40 @@
 /** X server message type definitions. */
 typedef enum {
-    X_PROBED,                   /* Value was probed */
-    X_CONFIG,                   /* Value was given in the config file */
-    X_DEFAULT,                  /* Value is a default */
-    X_CMDLINE,                  /* Value was given on the command line */
-    X_NOTICE,                   /* Notice */
-    X_ERROR,                    /* Error message */
-    X_WARNING,                  /* Warning message */
-    X_INFO,                     /* Informational message */
-    X_NONE,                     /* No prefix */
-    X_NOT_IMPLEMENTED,          /* Not implemented */
-    X_UNKNOWN = -1              /* unknown -- this must always be last */
+    X_PROBED,                   /* Value was probed */
+    X_CONFIG,                   /* Value was given in the config file */
+    X_DEFAULT,                  /* Value is a default */
+    X_CMDLINE,                  /* Value was given on the command line */
+    X_NOTICE,                   /* Notice */
+    X_ERROR,                    /* Error message */
+    X_WARNING,                  /* Warning message */
+    X_INFO,                     /* Informational message */
+    X_NONE,                     /* No prefix */
+    X_NOT_IMPLEMENTED,          /* Not implemented */
+    X_UNKNOWN = -1              /* unknown -- this must always be last */
 } MessageType;
 
@@ -58 +57 @@
 //#define DEBUG_DRI_CALLS
 
-//@todo this could be different...
+/// @todo this could be different...
 #ifdef RT_ARCH_AMD64
 # ifdef RT_OS_FREEBSD
@@ -219 +218 @@
     crMemcpy(pDst, pSrc, size);
 
-    /*@todo Restore the protection, probably have to check what was it before us...*/
+    /** @todo Restore the protection, probably have to check what was it before us...*/
     rv = RTMemProtect(alPatch, pDst-alPatch+size, RTMEM_PROT_READ|RTMEM_PROT_EXEC);
     if (RT_FAILURE(rv))
@@ -232 +231 @@
 /* Provide basic dladdr1 flags */
 enum {
-        RTLD_DL_SYMENT  = 1
+        RTLD_DL_SYMENT  = 1
 };
 
@@ -239 +238 @@
 dladdr1(const void *address, Dl_info *dlip, void **info, int flags)
 {
-        static DRI_ELFSYM desym;
-        GElf_Sym sym;
-        GElf_Shdr shdr;
-        Elf *elf;
-        Elf_Scn *scn;
-        Elf_Data *data;
-        int ret, fd, count, i;
-
-        /* Initialize variables */
-        fd = -1;
-        elf = NULL;
-
-        /* Call dladdr first */
-        ret = dladdr(address, dlip);
-        if (ret == 0) goto err_exit;
-
-        /* Check for supported flags */
-        if (flags != RTLD_DL_SYMENT) return 1;
-
-        /* Open shared library's ELF file */
-        if (elf_version(EV_CURRENT) == EV_NONE) goto err_exit;
-        fd = open(dlip->dli_fname, O_RDONLY);
-        if (fd < 0) goto err_exit;
-        elf = elf_begin(fd, ELF_C_READ, NULL);
-        if (elf == NULL) goto err_exit;
-
-        /* Find the '.dynsym' section */
-        scn = elf_nextscn(elf, NULL);
-        while (scn != NULL) {
-                if (gelf_getshdr(scn, &shdr) == NULL) goto err_exit;
-                if (shdr.sh_type == SHT_DYNSYM) break;
-                scn = elf_nextscn(elf, scn);
-        }
-        if (scn == NULL) goto err_exit;
-
-        /* Search for the requested symbol by name and offset */
-        data = elf_getdata(scn, NULL);
-        count = shdr.sh_size / shdr.sh_entsize;
-        for (i = 0; i < count; i++) {
-                gelf_getsym(data, i, &sym);
-                if ((strcmp(dlip->dli_sname,
-                        elf_strptr(elf, shdr.sh_link, sym.st_name)) == 0) &&
-                    (sym.st_value == (dlip->dli_saddr - dlip->dli_fbase))) {
-                        break;
-                }
-        }
-
-        /* Close ELF file */
-        elf_end(elf);
-        close(fd);
-
-        /* Return symbol entry in native format */
-        desym.st_name = sym.st_name;
-        desym.st_info = sym.st_info;
-        desym.st_other = sym.st_other;
-        desym.st_shndx = sym.st_shndx;
-        desym.st_value = sym.st_value;
-        desym.st_size = sym.st_size;
-        *info = &desym;
-        return 1;
-
-        /* Error handler */
+        static DRI_ELFSYM desym;
+        GElf_Sym sym;
+        GElf_Shdr shdr;
+        Elf *elf;
+        Elf_Scn *scn;
+        Elf_Data *data;
+        int ret, fd, count, i;
+
+        /* Initialize variables */
+        fd = -1;
+        elf = NULL;
+
+        /* Call dladdr first */
+        ret = dladdr(address, dlip);
+        if (ret == 0) goto err_exit;
+
+        /* Check for supported flags */
+        if (flags != RTLD_DL_SYMENT) return 1;
+
+        /* Open shared library's ELF file */
+        if (elf_version(EV_CURRENT) == EV_NONE) goto err_exit;
+        fd = open(dlip->dli_fname, O_RDONLY);
+        if (fd < 0) goto err_exit;
+        elf = elf_begin(fd, ELF_C_READ, NULL);
+        if (elf == NULL) goto err_exit;
+
+        /* Find the '.dynsym' section */
+        scn = elf_nextscn(elf, NULL);
+        while (scn != NULL) {
+                if (gelf_getshdr(scn, &shdr) == NULL) goto err_exit;
+                if (shdr.sh_type == SHT_DYNSYM) break;
+                scn = elf_nextscn(elf, scn);
+        }
+        if (scn == NULL) goto err_exit;
+
+        /* Search for the requested symbol by name and offset */
+        data = elf_getdata(scn, NULL);
+        count = shdr.sh_size / shdr.sh_entsize;
+        for (i = 0; i < count; i++) {
+                gelf_getsym(data, i, &sym);
+                if ((strcmp(dlip->dli_sname,
+                        elf_strptr(elf, shdr.sh_link, sym.st_name)) == 0) &&
+                    (sym.st_value == (dlip->dli_saddr - dlip->dli_fbase))) {
+                        break;
+                }
+        }
+
+        /* Close ELF file */
+        elf_end(elf);
+        close(fd);
+
+        /* Return symbol entry in native format */
+        desym.st_name = sym.st_name;
+        desym.st_info = sym.st_info;
+        desym.st_other = sym.st_other;
+        desym.st_shndx = sym.st_shndx;
+        desym.st_value = sym.st_value;
+        desym.st_size = sym.st_size;
+        *info = &desym;
+        return 1;
+
+        /* Error handler */
 err_exit:
-        if (elf != NULL) elf_end(elf);
-        if (fd >= 0) close(fd);
-        return 0;
+        if (elf != NULL) elf_end(elf);
+        if (fd >= 0) close(fd);
+        return 0;
 }
 #endif
@@ -373 +372 @@
         /* Try to insert 5 bytes jmp/jmpq to our stub code */
 
-        if (sym->st_size<5)
-        {
-            /*@todo we don't really know the size of targeted static function, but it's long enough in practice. We will also patch same place twice, but it's ok.*/
+        if (sym->st_size<5)
+        {
+            /** @todo we don't really know the size of targeted static function, but it's long enough in practice. We will also patch same place twice, but it's ok.*/
             if (!crStrcmp(psFuncName, "glXDestroyContext") || !crStrcmp(psFuncName, "glXFreeContextEXT"))
             {
@@ -392 +391 @@
             else if (!crStrcmp(psFuncName, "glXCreateGLXPixmapMESA"))
             {
-                /*@todo it's just a return 0, which we're fine with for now*/
+                /** @todo it's just a return 0, which we're fine with for now*/
                 return;
             }
@@ -440 +439 @@
                 pNode->pDstEnd = dlip.dli_saddr+sym->st_size;
                 pNode->pSrcStart = pStart;
-                pNode->pSrcEnd = pEnd; 
+                pNode->pSrcEnd = pEnd;
                 pNode->pNext = g_pRepatchList;
                 g_pRepatchList = pNode;
@@ -470 +469 @@
                 pNode->psFuncName = psFuncName;
                 pNode->pDstStart = dlip.dli_saddr+(pEnd-pStart);
-                pNode->pDstEnd = dlip.dli_saddr+sym->st_size; 
+                pNode->pDstEnd = dlip.dli_saddr+sym->st_size;
                 pNode->pSrcStart = dlip.dli_saddr;
                 pNode->pSrcEnd = NULL;
@@ -523 +522 @@
         crMemcpy(&patch[1], &offset, 4);
 # ifndef VBOX_NO_MESA_PATCH_REPORTS
-        crDebug("Adding jmp from mesa %s to mesa %s+%#lx", pPatchNode->psFuncName, pFreeNode->psFuncName, 
+        crDebug("Adding jmp from mesa %s to mesa %s+%#lx", pPatchNode->psFuncName, pFreeNode->psFuncName,
                 pFreeNode->pDstStart-pFreeNode->pSrcStart);
 # endif
@@ -604 +603 @@
 
     handle = NULL;
-    for (p = libPaths; *p; p = next) 
+    for (p = libPaths; *p; p = next)
     {
         next = strchr(p, ':');
-        if (next == NULL) 
+        if (next == NULL)
         {
             len = strlen(p);
             next = p + len;
-        } 
-        else 
+        }
+        else
         {
             len = next - p;
@@ -635 +634 @@
     crDebug("loaded %s", realDriverName);
 
-    for (i = 0; gppSwDriExternsion[i]; i++) 
+    for (i = 0; gppSwDriExternsion[i]; i++)
     {
         if (strcmp(gppSwDriExternsion[i]->name, __DRI_CORE) == 0)
@@ -716 +715 @@
 }
 
-static void 
+static void
 vboxdriDestroyScreen(__DRIscreen *screen)
 {
@@ -755 +754 @@
 }
 
-static void 
+static void
 vboxdriDestroyDrawable(__DRIdrawable *drawable)
 {
@@ -776 +775 @@
 }
 
-static int 
+static int
 vboxdriCopyContext(__DRIcontext *dest,
                    __DRIcontext *src,
@@ -784 +783 @@
 }
 
-static void 
+static void
 vboxdriDestroyContext(__DRIcontext *context)
 {
@@ -790 +789 @@
 }
 
-static int 
+static int
 vboxdriBindContext(__DRIcontext *ctx,
                    __DRIdrawable *pdraw,
@@ -798 +797 @@
 }
 
-static int 
+static int
 vboxdriUnbindContext(__DRIcontext *ctx)
 {
@@ -812 +811 @@
                               const __DRIversion *drm_version,
                               const __DRIframebuffer *frame_buffer,
-                              drmAddress pSAREA, int fd, 
+                              drmAddress pSAREA, int fd,
                               const __DRIextension **extensions,
                               const __DRIconfig ***driver_modes,
@@ -839 +838 @@
 static __DRIcontext *
 vboxdriCreateNewContext_Legacy(__DRIscreen *psp, const __DRIconfig *config,
-                               int render_type, __DRIcontext *shared, 
+                               int render_type, __DRIcontext *shared,
                                drm_context_t hwContext, void *data)
 {

trunk/src/VBox/Additions/common/crOpenGL/fakedri_drv.h

@@ -1 +1 @@
 /* $Id$ */
-
 /** @file
- *
  * VirtualBox guest OpenGL DRI header
  */
@@ -119 +117 @@
 #endif
 
-#endif /* ___CROPENGL_FAKEDRIDRV_H */
+#endif /* !___CROPENGL_FAKEDRIDRV_H */
 

trunk/src/VBox/Additions/common/crOpenGL/fakedri_glfuncsList.h

@@ -1 +1 @@
 /* $Id$ */
-
 /** @file
  * VBox OpenGL list of opengl functions common in Mesa and vbox opengl stub

trunk/src/VBox/Additions/common/crOpenGL/fakedri_glxfuncsList.h

@@ -1 +1 @@
 /* $Id$ */
-
 /** @file
  * VBox OpenGL list of opengl functions common in Mesa and vbox opengl stub

trunk/src/VBox/Additions/common/crOpenGL/feedback/feedback_context.c

@@ -29 +29 @@
 
 
-/*@todo Multithreading case. (See feedback_spu.self.RenderMode)*/
+/** @todo Multithreading case. (See feedback_spu.self.RenderMode)*/
 
 GLint FEEDBACKSPU_APIENTRY
@@ -94 +94 @@
         }
     }
-    else 
+    else
     {
         crStateMakeCurrent(NULL);

trunk/src/VBox/Additions/common/crOpenGL/feedback/feedbackspu_init.c

@@ -82 +82 @@
         *options = feedbackSPUOptions;
         *flags = (SPU_NO_PACKER|SPU_NOT_TERMINAL|SPU_MAX_SERVERS_ZERO);
-        
+
         return 1;
 }

trunk/src/VBox/Additions/common/crOpenGL/glx.c

@@ -1 @@
-/* $Id: dri_drv.c 100879 2015-06-09 14:26:20Z bird $ */
-
+/* $Id$ */
 /** @file
  * VBox OpenGL GLX implementation
@@ -40 +39 @@
 #define CR_MAX_DAMAGE_REGIONS_TRACKED 50
 
-/* Force "bigger" update (full or clip) if it's reducing number of regions updated 
+/* Force "bigger" update (full or clip) if it's reducing number of regions updated
  * but doesn't increase updated area more than given number
  */
 #define CR_MIN_DAMAGE_PROFIT_SIZE 64*64
 
-/*@todo combine it in some other place*/
+/** @todo combine it in some other place*/
 /* Size of pack spu buffer - some delta for commands packing, see pack/packspu_config.c*/
 
@@ -218 +217 @@
     pret = XGetVisualInfo(dpy, VisualIDMask, &searchvis, &nvisuals);
     XUNLOCK(dpy);
-      
+
     if (nvisuals!=1) crWarning("glXChooseVisual: XGetVisualInfo returned %i visuals for %x", nvisuals, (unsigned int) searchvis.visualid);
     if (pret)
@@ -232 +231 @@
  **  There is a problem with glXCopyContext.
  ** IRIX and Mesa both define glXCopyContext
- ** to have the mask argument being a 
+ ** to have the mask argument being a
  ** GLuint.  XFree 4 and oss.sgi.com
  ** define it to be an unsigned long.
@@ -240 +239 @@
  */
 DECLEXPORT(void)
-VBOXGLXTAG(glXCopyContext)( Display *dpy, GLXContext src, GLXContext dst, 
+VBOXGLXTAG(glXCopyContext)( Display *dpy, GLXContext src, GLXContext dst,
 #if defined(AIX) || defined(PLAYSTATION2)
 GLuint mask
@@ -377 +376 @@
         if (pGlxPixmap)
         {
-            /*@todo*/
+            /** @todo */
             crWarning("Unimplemented glxMakeCurrent call with GLXPixmap passed, unexpected things might happen.");
         }
@@ -523 +522 @@
 #if defined(SunOS) || 1
         /*
-          I don't think this is even a valid attribute for glxGetConfig. 
+          I don't think this is even a valid attribute for glxGetConfig.
           No idea why this gets called under SunOS but we simply ignore it
           -- jw
@@ -530 +529 @@
           crWarning ("Ignoring Unsupported GLX Call: glxGetConfig with attrib 0x%x", attrib);
           break;
-#endif 
+#endif
 
         case GLX_TRANSPARENT_TYPE:
@@ -679 +678 @@
 
         case GLX_EXTENSIONS:
-            /*@todo should be a screen not a name...but it's not used anyway*/
+            /** @todo should be a screen not a name...but it's not used anyway*/
             retval  = glXQueryExtensionsString(dpy, name);
             break;
@@ -730 +729 @@
 #if GLX_EXTRAS
 
-DECLEXPORT(GLXPbufferSGIX) 
+DECLEXPORT(GLXPbufferSGIX)
 VBOXGLXTAG(glXCreateGLXPbufferSGIX)(Display *dpy, GLXFBConfigSGIX config,
                                     unsigned int width, unsigned int height,
@@ -782 +781 @@
 }
 
-DECLEXPORT(GLXFBConfigSGIX *) 
+DECLEXPORT(GLXFBConfigSGIX *)
 VBOXGLXTAG(glXChooseFBConfigSGIX)(Display *dpy, int screen,
                                   int *attrib_list, int *nelements)
@@ -789 +788 @@
 }
 
-DECLEXPORT(GLXPixmap) 
+DECLEXPORT(GLXPixmap)
 VBOXGLXTAG(glXCreateGLXPixmapWithConfigSGIX)(Display *dpy,
                                              GLXFBConfig config,
@@ -797 +796 @@
 }
 
-DECLEXPORT(GLXContext) 
+DECLEXPORT(GLXContext)
 VBOXGLXTAG(glXCreateContextWithConfigSGIX)(Display *dpy, GLXFBConfig config,
                                            int render_type,
@@ -812 +811 @@
 }
 
-DECLEXPORT(XVisualInfo *) 
+DECLEXPORT(XVisualInfo *)
 VBOXGLXTAG(glXGetVisualFromFBConfigSGIX)(Display *dpy,
                                          GLXFBConfig config)
@@ -969 +968 @@
 }
 
-DECLEXPORT(GLXContext) 
+DECLEXPORT(GLXContext)
 VBOXGLXTAG(glXCreateNewContext)(Display *dpy, GLXFBConfig config, int render_type, GLXContext share_list, Bool direct)
 {
@@ -987 +986 @@
 }
 
-DECLEXPORT(GLXPbuffer) 
+DECLEXPORT(GLXPbuffer)
 VBOXGLXTAG(glXCreatePbuffer)(Display *dpy, GLXFBConfig config, ATTRIB_TYPE *attrib_list)
 {
@@ -1000 +999 @@
  * Instead we'd do necessary initialization on first use of those pixmaps.
  */
-DECLEXPORT(GLXPixmap) 
+DECLEXPORT(GLXPixmap)
 VBOXGLXTAG(glXCreatePixmap)(Display *dpy, GLXFBConfig config, Pixmap pixmap, ATTRIB_TYPE *attrib_list)
 {
@@ -1085 +1084 @@
 }
 
-DECLEXPORT(GLXWindow) 
+DECLEXPORT(GLXWindow)
 VBOXGLXTAG(glXCreateWindow)(Display *dpy, GLXFBConfig config, Window win, ATTRIB_TYPE *attrib_list)
 {
@@ -1294 +1293 @@
             break;
         default:
-            crDebug("glXGetFBConfigAttrib: unknown attribute=0x%x", attribute); 
+            crDebug("glXGetFBConfigAttrib: unknown attribute=0x%x", attribute);
             return GLX_BAD_ATTRIBUTE;
     }
@@ -1440 +1439 @@
     crInfo("Using XSHM for GLX_EXT_texture_from_pixmap");
 
-    /*Anyway mark to be deleted when our process detaches it, in case of segfault etc*/   
+    /*Anyway mark to be deleted when our process detaches it, in case of segfault etc*/
 
 /* Ramshankar: Solaris compiz fix */
@@ -1453 +1452 @@
 
     CRASSERT(pContext);
-    
+
     if (pContext->damageQueryFailed)
         return;
@@ -1479 +1478 @@
         int        nReturnRects;
 
-        /* Get the damage region as a server region */ 
+        /* Get the damage region as a server region */
         XserverRegion serverDamageRegion = XFixesCreateRegion (dpy, NULL, 0);
 
@@ -1610 +1609 @@
         pGlxPixmap->gc = XCreateGC(dpy, (Pixmap)draw, GCGraphicsExposures|GCSubwindowMode, &xgcv);
 
-        pGlxPixmap->hShmPixmap = XShmCreatePixmap(dpy, pGlxPixmap->root, stub.xshmSI.shmaddr, &stub.xshmSI, 
+        pGlxPixmap->hShmPixmap = XShmCreatePixmap(dpy, pGlxPixmap->root, stub.xshmSI.shmaddr, &stub.xshmSI,
                                                   pGlxPixmap->w, pGlxPixmap->h, pGlxPixmap->depth);
     }
@@ -1641 +1640 @@
     }
 
-    /* glTexSubImage2D generates GL_INVALID_OP if texture array hasn't been defined by a call to glTexImage2D first. 
+    /* glTexSubImage2D generates GL_INVALID_OP if texture array hasn't been defined by a call to glTexImage2D first.
      * It's fine for small textures which would be updated in stubXshmUpdateWholeImage, but we'd never call glTexImage2D for big ones.
      * Note that we're making empty texture by passing NULL as pixels pointer, so there's no overhead transferring data to host.*/
     if (CR_MAX_TRANSFER_SIZE < 4*pGlxPixmap->w*pGlxPixmap->h)
     {
-        stub.spu->dispatch_table.TexImage2D(pGlxPixmap->target, 0, pGlxPixmap->format, pGlxPixmap->w, pGlxPixmap->h, 0, 
+        stub.spu->dispatch_table.TexImage2D(pGlxPixmap->target, 0, pGlxPixmap->format, pGlxPixmap->w, pGlxPixmap->h, 0,
                                             GL_BGRA, GL_UNSIGNED_BYTE, NULL);
     }
@@ -1660 +1659 @@
     /* To limit the size of transferring buffer, split bigger texture into regions
      * which fit into connection buffer. Could be done in hgcm or packspu but implementation in this place allows to avoid
-     * unnecessary memcpy. 
+     * unnecessary memcpy.
      * This also workarounds guest driver failures when sending 6+mb texture buffers on linux.
      */
@@ -1691 +1690 @@
 
         XLOCK(dpy);
-        XCopyArea(dpy, (Pixmap)draw, pGlxPixmap->hShmPixmap, pGlxPixmap->gc, 
+        XCopyArea(dpy, (Pixmap)draw, pGlxPixmap->hShmPixmap, pGlxPixmap->gc,
                   pGlxPixmap->x, pGlxPixmap->y, pGlxPixmap->w, pGlxPixmap->h, 0, 0);
         /* Have to make sure XCopyArea is processed */
         XSync(dpy, False);
         XUNLOCK(dpy);
-        
+
         stubGetUnpackState(&unpackState);
         stubSetUnpackState(&defaultPacking);
-        stub.spu->dispatch_table.TexImage2D(pGlxPixmap->target, 0, pGlxPixmap->format, pGlxPixmap->w, pGlxPixmap->h, 0, 
+        stub.spu->dispatch_table.TexImage2D(pGlxPixmap->target, 0, pGlxPixmap->format, pGlxPixmap->w, pGlxPixmap->h, 0,
                                             GL_BGRA, GL_UNSIGNED_BYTE, stub.xshmSI.shmaddr);
         stubSetUnpackState(&unpackState);
-        /*crDebug("Sync texture for drawable 0x%x(dmg handle 0x%x) [%i,%i,%i,%i]", 
-                  (unsigned int) draw, (unsigned int)pGlxPixmap->hDamage, 
+        /*crDebug("Sync texture for drawable 0x%x(dmg handle 0x%x) [%i,%i,%i,%i]",
+                  (unsigned int) draw, (unsigned int)pGlxPixmap->hDamage,
                   pGlxPixmap->x, pGlxPixmap->y, pGlxPixmap->w, pGlxPixmap->h);*/
     }
@@ -1739 +1738 @@
 
         XLOCK(dpy);
-        XCopyArea(dpy, (Pixmap)draw, pGlxPixmap->hShmPixmap, pGlxPixmap->gc, 
+        XCopyArea(dpy, (Pixmap)draw, pGlxPixmap->hShmPixmap, pGlxPixmap->gc,
                   pRect->x, pRect->y, pRect->width, pRect->height, 0, 0);
         /* Have to make sure XCopyArea is processed */
@@ -1751 +1750 @@
             stub.spu->dispatch_table.PixelStorei(GL_UNPACK_ROW_LENGTH, pGlxPixmap->w);
         }
-        stub.spu->dispatch_table.TexSubImage2D(pGlxPixmap->target, 0, pRect->x, pRect->y, pRect->width, pRect->height, 
+        stub.spu->dispatch_table.TexSubImage2D(pGlxPixmap->target, 0, pRect->x, pRect->y, pRect->width, pRect->height,
                                                GL_BGRA, GL_UNSIGNED_BYTE, stub.xshmSI.shmaddr);
         stubSetUnpackState(&unpackState);
 
-        /*crDebug("Region sync texture for drawable 0x%x(dmg handle 0x%x) [%i,%i,%i,%i]", 
-                (unsigned int) draw, (unsigned int)pGlxPixmap->hDamage, 
+        /*crDebug("Region sync texture for drawable 0x%x(dmg handle 0x%x) [%i,%i,%i,%i]",
+                (unsigned int) draw, (unsigned int)pGlxPixmap->hDamage,
                 pRect->x, pRect->y, pRect->width, pRect->height);*/
     }
@@ -1769 +1768 @@
         ContextInfo *context = stubGetCurrentContext();
         XDamageNotifyEvent *e = (XDamageNotifyEvent *) event;
-        /* we're interested in pixmaps only...and those have e->drawable set to 0 or other strange value for some odd reason 
+        /* we're interested in pixmaps only...and those have e->drawable set to 0 or other strange value for some odd reason
          * so have to walk glxpixmaps hashtable to find if we have damage event handle assigned to some pixmap
          */
@@ -1782 +1781 @@
 #endif
 
-/*@todo check what error codes could we throw for failures here*/
+/** @todo check what error codes could we throw for failures here*/
 DECLEXPORT(void) VBOXGLXTAG(glXBindTexImageEXT)(Display *dpy, GLXDrawable draw, int buffer, const int *attrib_list)
 {
@@ -1826 +1825 @@
     if (stub.xshmSI.shmid<0)
     {
-        /*@todo add damage support here too*/
+        /** @todo add damage support here too*/
         XImage *pxim;
         CRPixelPackState unpackState;
@@ -1860 +1859 @@
         stubGetUnpackState(&unpackState);
         stubSetUnpackState(&defaultPacking);
-        stub.spu->dispatch_table.TexImage2D(pGlxPixmap->target, 0, pGlxPixmap->format, pxim->width, pxim->height, 0, 
+        stub.spu->dispatch_table.TexImage2D(pGlxPixmap->target, 0, pGlxPixmap->format, pxim->width, pxim->height, 0,
                                             GL_BGRA, GL_UNSIGNED_BYTE, (void*)(&(pxim->data[0])));
         stubSetUnpackState(&unpackState);
@@ -1900 +1899 @@
                     {
                         crWarning("glXBindTexImageEXT, damage regions seems to be broken, forcing full update");
-                        /*crDebug("**FULL** update for 0x%x, numRect=%li, *FS*=%li, CS=%li, DS=%li", 
+                        /*crDebug("**FULL** update for 0x%x, numRect=%li, *FS*=%li, CS=%li, DS=%li",
                                 (unsigned int)draw, pGlxPixmap->pDamageRegion->numRects, fullArea, clipdamageArea, damageArea);*/
                         stubXshmUpdateWholeImage(dpy, draw, pGlxPixmap);
@@ -1908 +1907 @@
                         if (CR_MIN_DAMAGE_PROFIT_SIZE > (fullArea-damageArea))
                         {
-                            /*crDebug("**FULL** update for 0x%x, numRect=%li, *FS*=%li, CS=%li, DS=%li", 
+                            /*crDebug("**FULL** update for 0x%x, numRect=%li, *FS*=%li, CS=%li, DS=%li",
                                     (unsigned int)draw, pGlxPixmap->pDamageRegion->numRects, fullArea, clipdamageArea, damageArea);*/
                             stubXshmUpdateWholeImage(dpy, draw, pGlxPixmap);
@@ -1914 +1913 @@
                         else if (CR_MIN_DAMAGE_PROFIT_SIZE > (clipdamageArea-damageArea))
                         {
-                            /*crDebug("**PARTIAL** update for 0x%x, numRect=%li, FS=%li, *CS*=%li, DS=%li", 
+                            /*crDebug("**PARTIAL** update for 0x%x, numRect=%li, FS=%li, *CS*=%li, DS=%li",
                                     (unsigned int)draw, pGlxPixmap->pDamageRegion->numRects, fullArea, clipdamageArea, damageArea);*/
                             stubXshmUpdateImageRect(dpy, draw, pGlxPixmap, &damageClipBox);
@@ -1920 +1919 @@
                         else
                         {
-                            /*crDebug("**PARTIAL** update for 0x%x, numRect=*%li*, FS=%li, CS=%li, *DS*=%li", 
+                            /*crDebug("**PARTIAL** update for 0x%x, numRect=*%li*, FS=%li, CS=%li, *DS*=%li",
                                     (unsigned int)draw, pGlxPixmap->pDamageRegion->numRects, fullArea, clipdamageArea, damageArea);*/
                             for (i=0; i<pGlxPixmap->pDamageRegion->numRects; ++i)
@@ -1926 +1925 @@
                                 XRectangle rect;
                                 BoxPtr pBox = &pGlxPixmap->pDamageRegion->rects[i];
-                                
+
                                 rect.x = pBox->x1;
                                 rect.y = pBox->y1;

trunk/src/VBox/Additions/common/crOpenGL/glx_c_exports.c

@@ -1 +1 @@
 /* $Id$ */
 /** @file
- *
  * VirtualBox guest OpenGL DRI GLX C stubs
  */

trunk/src/VBox/Additions/common/crOpenGL/glx_proto.h

@@ -1 +1 @@
 /* $Id$ */
 /** @file
- *
  * VirtualBox guest OpenGL DRI GLX header C prototypes
  */

trunk/src/VBox/Additions/common/crOpenGL/icd_drv.c

@@ -29 +29 @@
 #include <iprt/win/windows.h>
 
-//TODO: consider
+/// @todo consider
 /* We can modify chronium dispatch table functions order to match the one required by ICD,
  * but it'd render us incompatible with other chromium SPUs and require more changes.
@@ -65 +65 @@
 static GLuint ComputeVisBits( HDC hdc )
 {
-    PIXELFORMATDESCRIPTOR pfd; 
+    PIXELFORMATDESCRIPTOR pfd;
     int iPixelFormat;
     GLuint b = 0;
@@ -107 +107 @@
     }
 
-    crDebug("DrvValidateVersion %x -> FALSE, going to use system default opengl32.dll\n", version); 
+    crDebug("DrvValidateVersion %x -> FALSE, going to use system default opengl32.dll\n", version);
     return FALSE;
 }
@@ -203 +203 @@
         return NULL;
     }
-    
+
 }
 
@@ -392 +392 @@
     CR_DDI_PROLOGUE();
     /*crDebug( "DrvSwapBuffers(0x%x) called", hdc );*/
-    window = stubGetWindowInfo(hdc);    
+    window = stubGetWindowInfo(hdc);
     stubSwapBuffers( window, 0 );
     return 1;

trunk/src/VBox/Additions/common/crOpenGL/load.c

@@ -106 +106 @@
 
 #ifdef WINDOWS
-    /* @todo install hook and track for WM_DISPLAYCHANGE */
+    /** @todo install hook and track for WM_DISPLAYCHANGE */
     {
         DEVMODE devMode;
@@ -952 +952 @@
 
 #if defined(CR_NEWWINTRACK) && !defined(WINDOWS)
-    /*@todo when vm boots with compiz turned on, new code causes hang in xcb_wait_for_reply in the sync thread
+    /** @todo when vm boots with compiz turned on, new code causes hang in xcb_wait_for_reply in the sync thread
      * as at the start compiz runs our code under XGrabServer.
      */
@@ -962 +962 @@
 #endif
 
-    /* @todo check if it'd be of any use on other than guests, no use for windows */
+    /** @todo check if it'd be of any use on other than guests, no use for windows */
     app_id = crGetenv( "CR_APPLICATION_ID_NUMBER" );
 
@@ -1021 +1021 @@
         crDebug("running with %s", VBOX_MODNAME_DISPD3D);
         stub.trackWindowVisibleRgn = 0;
-        /* @todo: should we enable that? */
+        /** @todo should we enable that? */
         stub.trackWindowSize = 0;
         stub.trackWindowPos = 0;
@@ -1479 +1479 @@
         }
 
-        
+
 #if defined(VBOX_WITH_CRHGSMI) && defined(IN_GUEST)
         VBoxCrHgsmiTerm();

trunk/src/VBox/Additions/common/crOpenGL/pack/pack.py

@@ -39 +39 @@
 for func_name in keys:
     if ("get" in apiutil.Properties(func_name) or
-        apiutil.FindSpecial( "packspu", func_name ) or 
-        apiutil.FindSpecial( "packspu_flush", func_name ) or 
+        apiutil.FindSpecial( "packspu", func_name ) or
+        apiutil.FindSpecial( "packspu_flush", func_name ) or
         apiutil.FindSpecial( "packspu_vertex", func_name )):
       pack_specials.append( func_name )

trunk/src/VBox/Additions/common/crOpenGL/pack/packspu_bufferobject.c

@@ -39 +39 @@
         CRASSERT(pBufObj);
 
-        if (pBufObj->bResyncOnRead && 
+        if (pBufObj->bResyncOnRead &&
             access != GL_WRITE_ONLY_ARB)
         {
@@ -66 +66 @@
     }
 #endif
-    
+
     crStateGetBufferSubDataARB(target, offset, size, data);
 }

trunk/src/VBox/Additions/common/crOpenGL/pack/packspu_client.c

@@ -340 +340 @@
 packspu_ArrayElement( GLint index )
 {
-/*@todo cash guest/host pointers calculation and use appropriate path here without crStateUseServerArrays call*/
+/** @todo cash guest/host pointers calculation and use appropriate path here without crStateUseServerArrays call*/
 #if 1
     GLboolean serverArrays = GL_FALSE;
@@ -857 +857 @@
     GLboolean res = crStateIsEnabled(cap);
 #ifdef DEBUG
-    {    
+    {
         GET_THREAD(thread);
             int writeback = 1;
@@ -893 +893 @@
         */
         /*crPackLockArraysEXT(first, count);*/
-    } 
+    }
     else crDebug("Ignoring packspu_LockArraysEXT: first:%i, count:%i", first, count);
 }

trunk/src/VBox/Additions/common/crOpenGL/pack/packspu_config.c

@@ -37 +37 @@
 
 
-/* No SPU options yet. Well.. not really.. 
+/* No SPU options yet. Well.. not really..
  */
 SPUOptions packSPUOptions[] = {
-    { "emit_GATHER_POST_SWAPBUFFERS", CR_BOOL, 1, "0", NULL, NULL, 
+    { "emit_GATHER_POST_SWAPBUFFERS", CR_BOOL, 1, "0", NULL, NULL,
       "Emit a parameter after SwapBuffers", (SPUOptionCB)set_emit },
 

trunk/src/VBox/Additions/common/crOpenGL/pack/packspu_context.c

@@ -375 +375 @@
          * server could be aware of how each other were numbering things in
          * cases like file networking where they actually
-         * care. 
+         * care.
          *
-         *  -Humper 
+         *  -Humper
          *
          */

trunk/src/VBox/Additions/common/crOpenGL/pack/packspu_framebuffer.c

@@ -46 +46 @@
 packspu_BindFramebufferEXT(GLenum target, GLuint framebuffer)
 {
-        crStateBindFramebufferEXT(target, framebuffer);
+        crStateBindFramebufferEXT(target, framebuffer);
     crPackBindFramebufferEXT(target, framebuffer);
 }
@@ -53 +53 @@
 packspu_DeleteFramebuffersEXT(GLsizei n, const GLuint * framebuffers)
 {
-        crStateDeleteFramebuffersEXT(n, framebuffers);
+        crStateDeleteFramebuffersEXT(n, framebuffers);
     crPackDeleteFramebuffersEXT(n, framebuffers);
 }
@@ -60 +60 @@
 packspu_DeleteRenderbuffersEXT(GLsizei n, const GLuint * renderbuffers)
 {
-        crStateDeleteRenderbuffersEXT(n, renderbuffers);
+        crStateDeleteRenderbuffersEXT(n, renderbuffers);
     crPackDeleteRenderbuffersEXT(n, renderbuffers);
 }
@@ -67 +67 @@
 packspu_FramebufferRenderbufferEXT(GLenum target, GLenum attachment, GLenum renderbuffertarget, GLuint renderbuffer)
 {
-        crStateFramebufferRenderbufferEXT(target, attachment, renderbuffertarget, renderbuffer);
+        crStateFramebufferRenderbufferEXT(target, attachment, renderbuffertarget, renderbuffer);
     crPackFramebufferRenderbufferEXT(target, attachment, renderbuffertarget, renderbuffer);
 }
@@ -81 +81 @@
 packspu_CheckFramebufferStatusEXT(GLenum target)
 {
-        GET_THREAD(thread);
-        int writeback = 1;
+        GET_THREAD(thread);
+        int writeback = 1;
     GLenum status = crStateCheckFramebufferStatusEXT(target);
 
@@ -92 +92 @@
     crPackCheckFramebufferStatusEXT(target, &status, &writeback);
 
-        packspuFlush((void *) thread);
+        packspuFlush((void *) thread);
     CRPACKSPU_WRITEBACK_WAIT(thread, writeback);
 

trunk/src/VBox/Additions/common/crOpenGL/pack/packspu_get.py

@@ -51 +51 @@
 from get_sizes import *
 
-easy_swaps = { 
+easy_swaps = {
     'GenTextures': '(unsigned int) n',
     'GetClipPlane': '4',
     'GetPolygonStipple': '0'
 }
-    
+
 simple_funcs = [ 'GetIntegerv', 'GetFloatv', 'GetDoublev', 'GetBooleanv' ]
 simple_swaps = [ 'SWAP32', 'SWAPFLOAT', 'SWAPDOUBLE', '(GLboolean) SWAP32' ]
@@ -123 +123 @@
         || pname == GL_FRAMEBUFFER_BINDING_EXT
         || pname == GL_READ_FRAMEBUFFER_BINDING_EXT
-        || pname == GL_DRAW_FRAMEBUFFER_BINDING_EXT 
+        || pname == GL_DRAW_FRAMEBUFFER_BINDING_EXT
 #endif
         || pname == GL_ARRAY_BUFFER_BINDING
@@ -161 +161 @@
                 return;
             }
-            
+
         }
             """ % (params[-1][1], params[-1][1], func_name, func_name, apiutil.MakeCallString(params), func_name, func_name))
-            
+
         if func_name in vertattr_get_funcs:
             print("""
@@ -189 +189 @@
 #endif
         return;
-    } 
+    }
             """ % (params[-1][1], params[-1][1], func_name, func_name, apiutil.MakeCallString(params), func_name, func_name))
 

trunk/src/VBox/Additions/common/crOpenGL/pack/packspu_getshaders.c

@@ -24 +24 @@
 #include <iprt/assert.h>
 
-/*@todo combine with the one from server_getshaders.c*/
+/** @todo combine with the one from server_getshaders.c*/
 typedef struct _crGetActive_t
 {

trunk/src/VBox/Additions/common/crOpenGL/pack/packspu_getstring.c

@@ -87 +87 @@
 
 #ifdef Linux
-        /*@todo
+        /** @todo
          *That's a hack to allow running Unity, it uses libnux which is calling extension functions
          *without checking if it's being supported/exported.
@@ -123 +123 @@
             {
                 GetString(GL_REAL_VERSION, ctx->pszRealVersion);
-                return ctx->pszRealVersion;               
+                return ctx->pszRealVersion;
             }
             else

trunk/src/VBox/Additions/common/crOpenGL/pack/packspu_glsl.c

@@ -81 +81 @@
 GLint PACKSPU_APIENTRY packspu_GetUniformLocation(GLuint program, const char * name)
 {
-    if (!crStateIsProgramUniformsCached(program))  
+    if (!crStateIsProgramUniformsCached(program))
     {
         GET_THREAD(thread);

trunk/src/VBox/Additions/common/crOpenGL/pack/packspu_misc.c

@@ -19 +19 @@
     GET_THREAD(thread);
 
-    
+
     switch(target)
     {
@@ -104 +104 @@
     /*Usually buffer==GL_BACK, so put this extra check to simplify boolean eval on runtime*/
     return  (buffer != GL_BACK)
-            && (buffer == GL_FRONT_LEFT 
+            && (buffer == GL_FRONT_LEFT
                 || buffer == GL_FRONT_RIGHT
                 || buffer == GL_FRONT
@@ -795 +795 @@
     (void) lpvReserved;
 
-    switch (fdwReason) 
+    switch (fdwReason)
     {
         case DLL_PROCESS_ATTACH:

trunk/src/VBox/Additions/common/crOpenGL/pack/packspu_net.c

@@ -31 +31 @@
 packspuReadback( const CRMessageReadback *rb, unsigned int len )
 {
-    /* minus the header, the destination pointer, 
+    /* minus the header, the destination pointer,
      * *and* the implicit writeback pointer at the head. */
 
     int payload_len = len - sizeof( *rb );
     int *writeback;
-    void *dest_ptr; 
+    void *dest_ptr;
     crMemcpy( &writeback, &(rb->writeback_ptr), sizeof( writeback ) );
     crMemcpy( &dest_ptr, &(rb->readback_ptr), sizeof( dest_ptr ) );
@@ -90 +90 @@
 
     num_opcodes = buf->opcode_start - buf->opcode_current;
-    hdr = (CRMessageOpcodes *) 
+    hdr = (CRMessageOpcodes *)
         ( buf->data_start - ( ( num_opcodes + 3 ) & ~0x3 ) - sizeof(*hdr) );
 

trunk/src/VBox/Additions/common/crOpenGL/pack/packspu_pixel.c

@@ -3 +3 @@
 
    See the file LICENSE.txt for information on redistributing this software. */
-    
+
 #include "cr_packfunctions.h"
 #include "cr_glstate.h"
@@ -140 +140 @@
 # endif
 #endif
-        /*@todo ARB_texture_float*/
+        /** @todo ARB_texture_float*/
         && internalformat!=GL_RGBA32F_ARB
         && internalformat!=GL_RGB32F_ARB
@@ -301 +301 @@
     ContextInfo *ctx = thread->currentContext;
     CRClientState *clientState = &(ctx->clientState->client);
-    int writeback;    
+    int writeback;
 
     if (crStateIsBufferBound(GL_PIXEL_PACK_BUFFER_ARB))
@@ -326 +326 @@
 }
 
-/*@todo check with pbo's*/
+/** @todo check with pbo's*/
 void PACKSPU_APIENTRY packspu_CopyPixels( GLint x, GLint y, GLsizei width, GLsizei height, GLenum type )
 {

trunk/src/VBox/Additions/common/crOpenGL/pack/packspu_proto.py

@@ -32 +32 @@
 for func_name in keys:
     if ("get" in apiutil.Properties(func_name) or
-        apiutil.FindSpecial( "packspu", func_name ) or 
-        apiutil.FindSpecial( "packspu_flush", func_name ) or 
+        apiutil.FindSpecial( "packspu", func_name ) or
+        apiutil.FindSpecial( "packspu_flush", func_name ) or
         apiutil.FindSpecial( "packspu_vertex", func_name )):
       pack_specials.append( func_name )

trunk/src/VBox/Additions/common/crOpenGL/pack/packspu_swapbuf.c

@@ -66 +66 @@
          * This is complicated because writeback in the pack spu is
          * overridden to always set the value to zero when the
-         * reply is received, rather than decrementing it: 
+         * reply is received, rather than decrementing it:
          */
         switch( thread->writeback ) {

trunk/src/VBox/Additions/common/crOpenGL/passthrough/passthroughspu_init.c

@@ -60 +60 @@
         *options = passthroughSPUOptions;
         *flags = (SPU_NO_PACKER|SPU_NOT_TERMINAL|SPU_MAX_SERVERS_ZERO);
-        
+
         return 1;
 }

trunk/src/VBox/Additions/common/crOpenGL/stub.c

@@ -6 +6 @@
 
 #include "cr_spu.h"
-#include "cr_error.h" 
-#include "cr_mem.h" 
+#include "cr_error.h"
+#include "cr_mem.h"
 #include "stub.h"
 #include <iprt/thread.h>
@@ -199 +199 @@
     stubGetWindowGeometry(pWindow, &winX, &winY, &winW, &winH);
 
-    /* @todo remove "if (winW && winH)"?*/
+    /** @todo remove "if (winW && winH)"?*/
     if (winW && winH) {
         if (stub.trackWindowSize) {
@@ -257 +257 @@
         return GL_FALSE;
     }
-    
+
     hVisRgn = CreateRectRgn(0,0,0,0);
     iret = GetRandomRgn(pWindow->drawable, hVisRgn, SYSRGN);
@@ -263 +263 @@
     if (iret==1)
     {
-        /*@todo check win95/win98 here, as rects should be already in client space there*/
+        /** @todo check win95/win98 here, as rects should be already in client space there*/
         /* Convert screen related rectangles to client related rectangles */
         pt.x = 0;
@@ -285 +285 @@
         */
 
-        if (pWindow->hVisibleRegion==INVALID_HANDLE_VALUE 
+        if (pWindow->hVisibleRegion==INVALID_HANDLE_VALUE
             || !EqualRgn(pWindow->hVisibleRegion, hVisRgn))
         {
@@ -309 +309 @@
         }
     }
-    else 
+    else
     {
         crWarning("GetRandomRgn returned (%d) instead of (1), VisibleRegions update failed", iret);
@@ -395 +395 @@
             }
 
-            /* @todo remove it*/
+            /** @todo remove it*/
             default:
             {
@@ -433 +433 @@
 
     XLOCK(dpy);
-    if (XCompositeQueryExtension(dpy, &evb, &erb) 
-        && XCompositeQueryVersion(dpy, &vma, &vmi) 
+    if (XCompositeQueryExtension(dpy, &evb, &erb)
+        && XCompositeQueryVersion(dpy, &vma, &vmi)
         && (vma>0 || vmi>=4))
     {
@@ -441 +441 @@
         vma=0;
         vmi=0;
-        if (XFixesQueryExtension(dpy, &evb, &erb) 
+        if (XFixesQueryExtension(dpy, &evb, &erb)
             && XFixesQueryVersion(dpy, &vma, &vmi)
             && vma>=2)
@@ -488 +488 @@
     dpy = stubGetWindowDisplay(pWindow);
 
-    /*@todo see comment regarding size/position updates and XSync, same applies to those functions but
+    /** @todo see comment regarding size/position updates and XSync, same applies to those functions but
     * it seems there's no way to get even based updates for this. Or I've failed to find the appropriate extension.
     */
@@ -505 +505 @@
     if (!bNoUpdate
         && (!pWindow->pVisibleRegions
-            || pWindow->cVisibleRegions!=cRects 
+            || pWindow->cVisibleRegions!=cRects
             || (pWindow->pVisibleRegions && crMemcmp(pWindow->pVisibleRegions, pXRects, cRects * sizeof(XRectangle)))))
     {
@@ -531 +531 @@
             pGLRects[4*i+2] = pXRects[i].x+pXRects[i].width;
             pGLRects[4*i+3] = pXRects[i].y+pXRects[i].height;
-            //crDebug("Rect[%i]=(%i,%i,%i,%i)", i, pGLRects[4*i+0], pGLRects[4*i+1], pGLRects[4*i+2], pGLRects[4*i+3]);                   
+            //crDebug("Rect[%i]=(%i,%i,%i,%i)", i, pGLRects[4*i+0], pGLRects[4*i+1], pGLRects[4*i+2], pGLRects[4*i+3]);
         }
 

trunk/src/VBox/Additions/common/crOpenGL/stub_common.py

@@ -76 +76 @@
                 annotations[filename] = {}
                 return {}
-        
+
         for line in f.readlines():
                 line = line.strip()
@@ -96 +96 @@
         except KeyError:
                 table = LoadAnnotations(filename)
-        
+
         try:
                 subtable = table[key]
@@ -110 +110 @@
         except KeyError:
                 table = LoadAnnotations(filename)
-        
+
         try:
                 subtable = table[key]
@@ -120 +120 @@
         except KeyError:
                 return 0
-                
+
 
 
@@ -132 +132 @@
                 specials[filename] = {}
                 return {}
-        
+
         for line in f.readlines():
                 line = string.strip(line)
@@ -138 +138 @@
                         continue
                 table[line] = 1
-        
+
         specials[filename] = table
         return table
@@ -149 +149 @@
         except KeyError:
                 table = LoadSpecials( filename )
-        
+
         try:
                 if (table[glName] == 1):
@@ -165 +165 @@
         except KeyError:
                 table = LoadSpecials( filename )
-        
+
         return sorted(table.keys())
 
@@ -176 +176 @@
         except KeyError:
                 table = LoadSpecials(filename)
-        
+
         return sorted(table.keys())
-        
+
 def NumSpecials( table_file ):
         filename = table_file + "_special"
@@ -257 +257 @@
         output = '( ' + InternalArgumentString(arg_names, arg_types) + ' )'
         return output
-        
+
 def InternalCallString( arg_names ):
         output = ''

trunk/src/VBox/Additions/common/crOpenGL/utils.c

@@ -48 +48 @@
 
 unsigned
-driParseDebugString( const char * debug, 
+driParseDebugString( const char * debug,
                      const struct dri_debug_control * control  )
 {
@@ -73 +73 @@
 /**
  * Create the \c GL_RENDERER string for DRI drivers.
- * 
+ *
  * Almost all DRI drivers use a \c GL_RENDERER string of the form:
  *
@@ -80 +80 @@
  * Using the supplied chip name, driver data, and AGP speed, this function
  * creates the string.
- * 
+ *
  * \param buffer         Buffer to hold the \c GL_RENDERER string.
  * \param hardware_name  Name of the hardware.
  * \param driver_date    Driver date.
  * \param agp_mode       AGP mode (speed).
- * 
+ *
  * \returns
  * The length of the string stored in \c buffer.  This does \b not include
@@ -112 +112 @@
       offset += sprintf( & buffer[ offset ], " AGP %ux", agp_mode );
       break;
-        
+
    default:
       break;
@@ -215 +215 @@
 /**
  * Enable extensions supported by the driver.
- * 
+ *
  * \bug
  * ARB_imaging isn't handled properly.  In Mesa, enabling ARB_imaging also
@@ -252 +252 @@
 /**
  * Enable and add dispatch functions for a single extension
- * 
+ *
  * \param ctx  Context where extension is to be enabled.
  * \param ext  Extension that is to be enabled.
- * 
+ *
  * \sa driInitExtensions, _mesa_enable_extension, _glapi_add_entrypoint
  *
@@ -315 +315 @@
             }
             else if (ext->functions[i].remap_index != -1) {
-                driDispatchRemapTable[ ext->functions[i].remap_index ] = 
+                driDispatchRemapTable[ ext->functions[i].remap_index ] =
                   offset;
             }
@@ -344 +344 @@
  * \param drmActual    Actual DRM version supplied __driCreateNewScreen.
  * \param drmExpected  Minimum DRM version required by the driver.
- * 
+ *
  * \returns \c GL_TRUE if all version requirements are met.  Otherwise,
  *          \c GL_FALSE is returned.
- * 
+ *
  * \sa __driCreateNewScreen, driCheckDriDdxDrmVersions2, __driUtilMessage
  *
@@ -388 +388 @@
       return GL_FALSE;
    }
-   
+
    /* Check that the DRM driver version is compatible */
    if ( (drmActual->major != drmExpected->major)
@@ -455 +455 @@
 /**
  * Creates a set of \c __GLcontextModes that a driver will expose.
- * 
+ *
  * A set of \c __GLcontextModes will be created based on the supplied
  * parameters.  The number of modes processed will be 2 *
  * \c num_depth_stencil_bits * \c num_db_modes.
- * 
+ *
  * For the most part, data is just copied from \c depth_bits, \c stencil_bits,
  * \c db_modes, and \c visType into each \c __GLcontextModes element.
@@ -471 +471 @@
  * are the blue value, bits [10:5] are the green value, and bits [4:0] are
  * the red value.
- * 
+ *
  * One subtle issue is the combination of \c GL_RGB  or \c GL_BGR and either
  * of the \c GL_UNSIGNED_INT_8_8_8_8 modes.  The resulting mask values in the
@@ -480 +480 @@
  *
  * If in doubt, look at the tables used in the function.
- * 
+ *
  * \param ptr_to_modes  Pointer to a pointer to a linked list of
  *                      \c __GLcontextModes.  Upon completion, a pointer to
@@ -490 +490 @@
  *                      \c GL_RGBA, \c GL_BGR, and \c GL_BGRA are supported.
  * \param fb_type       Type of the pixels in the framebuffer.  Currently only
- *                      \c GL_UNSIGNED_SHORT_5_6_5, 
+ *                      \c GL_UNSIGNED_SHORT_5_6_5,
  *                      \c GL_UNSIGNED_SHORT_5_6_5_REV,
  *                      \c GL_UNSIGNED_INT_8_8_8_8, and
@@ -507 +507 @@
  * \param visType       GLX visual type.  Usually either \c GLX_TRUE_COLOR or
  *                      \c GLX_DIRECT_COLOR.
- * 
+ *
  * \returns
  * \c GL_TRUE on success or \c GL_FALSE on failure.  Currently the only
  * cause of failure is a bad parameter (i.e., unsupported \c fb_format or
  * \c fb_type).
- * 
+ *
  * \todo
  * There is currently no way to support packed RGB modes (i.e., modes with
  * exactly 3 bytes per pixel) or floating-point modes.  This could probably
  * be done by creating some new, private enums with clever names likes
- * \c GL_UNSIGNED_3BYTE_8_8_8, \c GL_4FLOAT_32_32_32_32, 
+ * \c GL_UNSIGNED_3BYTE_8_8_8, \c GL_4FLOAT_32_32_32_32,
  * \c GL_4HALF_16_16_16_16, etc.  We can cross that bridge when we come to it.
  */
@@ -746 +746 @@
     while (b[j] != NULL)
         j++;
-   
+
     all = _mesa_malloc((i + j + 1) * sizeof *all);
     index = 0;
@@ -844 +844 @@
         *value = *(unsigned int *)
             ((char *) &config->modes + attribMap[index].offset);
-        
+
         break;
     }

trunk/src/VBox/Additions/common/crOpenGL/vboxdri_drv.c

@@ -31 +31 @@
  * NOTES:
  *   -- No mechanism for cliprects or resize notification --
- *      assumes this is a fullscreen device.  
- *   -- No locking -- assumes this is the only driver accessing this 
+ *      assumes this is a fullscreen device.
+ *   -- No locking -- assumes this is the only driver accessing this
  *      device.
  *   -- Doesn't (yet) make use of any acceleration or other interfaces
- *      provided by fb.  Would be entirely happy working against any 
+ *      provided by fb.  Would be entirely happy working against any
  *      fullscreen interface.
  *   -- HOWEVER: only a small number of pixelformats are supported, and
@@ -125 +125 @@
 
    struct {
-      __DRIcontextPrivate *context;     
-      __DRIscreenPrivate *screen;       
+      __DRIcontextPrivate *context;
+      __DRIscreenPrivate *screen;
       __DRIdrawablePrivate *drawable; /* drawable bound to this ctx */
    } dri;
-   
+
 } fbContext, *fbContextPtr;
 
@@ -421 +421 @@
  * This is the driver specific part of the createNewScreen entry point.
  * Called when using legacy DRI.
- * 
+ *
  * return the __GLcontextModes supported by this driver
  */
@@ -437 +437 @@
              return NULL;
           }
-      
+
              driInitExtensions( NULL, card_extensions, GL_FALSE );
 
@@ -476 +476 @@
       shareCtx = NULL;
 
-   ctx = fbmesa->glCtx = _mesa_create_context(glVisual, shareCtx, 
+   ctx = fbmesa->glCtx = _mesa_create_context(glVisual, shareCtx,
                                               &functions, (void *) fbmesa);
    if (!fbmesa->glCtx) {
@@ -542 +542 @@
 {
    struct gl_framebuffer *mesa_framebuffer;
-   
+
    if (isPixmap) {
       return GL_FALSE; /* not implemented */
@@ -551 +551 @@
       const GLboolean swAccum = mesaVis->accumRedBits > 0;
       const GLboolean swStencil = mesaVis->stencilBits > 0;
-      
+
       mesa_framebuffer = _mesa_create_framebuffer(mesaVis);
       if (!mesa_framebuffer)
@@ -590 +590 @@
                                    swAlpha, /* or always zero? */
                                    GL_FALSE /* aux */);
-      
+
       driDrawPriv->driverPrivate = mesa_framebuffer;
 
@@ -620 +620 @@
       fbContextPtr fbmesa = (fbContextPtr) dPriv->driContextPriv->driverPrivate;
       GLcontext *ctx = fbmesa->glCtx;
-      
+
       if (ctx->Visual.doubleBufferMode) {
          int i;
@@ -638 +638 @@
             offset += currentPitch;
          }
-            
+
          _mesa_free(tmp);
       }
@@ -658 +658 @@
 {
    if ( driContextPriv ) {
-      fbContextPtr newFbCtx = 
+      fbContextPtr newFbCtx =
             (fbContextPtr) driContextPriv->driverPrivate;
 
       newFbCtx->dri.drawable = driDrawPriv;
 
-      _mesa_make_current( newFbCtx->glCtx, 
+      _mesa_make_current( newFbCtx->glCtx,
                            driDrawPriv->driverPrivate,
                            driReadPriv->driverPrivate);

trunk/src/VBox/Additions/common/crOpenGL/wgl.c

@@ -42 +42 @@
 static GLuint ComputeVisBits( HDC hdc )
 {
-    PIXELFORMATDESCRIPTOR pfd; 
+    PIXELFORMATDESCRIPTOR pfd;
     int iPixelFormat;
     GLuint b = 0;
@@ -77 +77 @@
     stubInit();
 
-    /* 
+    /*
      * NOTE!!!
      * Here we're telling the renderspu not to use the GDI
@@ -97 +97 @@
             PFD_SWAP_EXCHANGE         |
             PFD_SWAP_COPY             |
-            /* @todo: this is disabled due to VSG Open Inventor interop issues
+            /** @todo this is disabled due to VSG Open Inventor interop issues
              * it does not make any sense actually since reporting this
              * as well as choosing a pixel format with this cap would not do anything
@@ -144 +144 @@
         crError( "wglChoosePixelFormat; asked for too many depth bits\n" );
     }
-    
+
     if ( pfd->cDepthBits > 0 )
         desiredVisual |= CR_DEPTH_BIT;
@@ -241 +241 @@
     CR_DDI_PROLOGUE();
 
-/*  if ( pixelFormat != 1 ) { 
- *      crError( "wglDescribePixelFormat: pixelFormat=%d?\n", pixelFormat ); 
- *      return 0; 
+/*  if ( pixelFormat != 1 ) {
+ *      crError( "wglDescribePixelFormat: pixelFormat=%d?\n", pixelFormat );
+ *      return 0;
  *  } */
 
@@ -605 +605 @@
     stubInit();
 
-    /* TODO : Need to check pfAttributes too ! */
+    /** @todo : Need to check pfAttributes too ! */
 
     for ( pi = (int *)piAttributes; *pi != 0; pi++ )
@@ -641 +641 @@
                 if (pi[1] > 0)
                 {
-                    /* @todo: this is disabled due to VSG Open Inventor interop issues
+                    /** @todo this is disabled due to VSG Open Inventor interop issues
                      * it does not make any sense actually since reporting this
                      * as well as choosing a pixel format with this cap would not do anything
@@ -676 +676 @@
                 if (pi[1] > 0)
                 {
-                    /* @todo: this is disabled due to VSG Open Inventor interop issues
+                    /** @todo this is disabled due to VSG Open Inventor interop issues
                      * it does not make any sense actually since reporting this
                      * as well as choosing a pixel format with this cap would not do anything
@@ -694 +694 @@
 
             case WGL_PIXEL_TYPE_ARB:
-                if(pi[1]!=WGL_TYPE_RGBA_ARB) 
+                if(pi[1]!=WGL_TYPE_RGBA_ARB)
                 {
                     crWarning("WGL_PIXEL_TYPE 0x%x not supported!", pi[1]);
@@ -748 +748 @@
                 break;
             case WGL_STEREO_ARB:
-                /* @todo: this is disabled due to VSG Open Inventor interop issues
+                /** @todo this is disabled due to VSG Open Inventor interop issues
                  * it does not make any sense actually since reporting this
                  * as well as choosing a pixel format with this cap would not do anything
@@ -827 +827 @@
                 break;
             case WGL_SAMPLE_BUFFERS_EXT:
-                /* @todo: this is disabled due to VSG Open Inventor interop issues
+                /** @todo this is disabled due to VSG Open Inventor interop issues
                  * it does not make any sense actually since reporting this
                  * as well as choosing a pixel format with this cap would not do anything
@@ -834 +834 @@
                 break;
             case WGL_SAMPLES_EXT:
-                /* @todo: this is disabled due to VSG Open Inventor interop issues
+                /** @todo this is disabled due to VSG Open Inventor interop issues
                  * it does not make any sense actually since reporting this
                  * as well as choosing a pixel format with this cap would not do anything
@@ -883 +883 @@
                 break;
             case WGL_STEREO_ARB:
-                /* @todo: this is disabled due to VSG Open Inventor interop issues
+                /** @todo this is disabled due to VSG Open Inventor interop issues
                  * it does not make any sense actually since reporting this
                  * as well as choosing a pixel format with this cap would not do anything
@@ -962 +962 @@
                 break;
             case WGL_SAMPLE_BUFFERS_EXT:
-                /* @todo: this is disabled due to VSG Open Inventor interop issues
+                /** @todo this is disabled due to VSG Open Inventor interop issues
                  * it does not make any sense actually since reporting this
                  * as well as choosing a pixel format with this cap would not do anything
@@ -969 +969 @@
                 break;
             case WGL_SAMPLES_EXT:
-                /* @todo: this is disabled due to VSG Open Inventor interop issues
+                /** @todo this is disabled due to VSG Open Inventor interop issues
                  * it does not make any sense actually since reporting this
                  * as well as choosing a pixel format with this cap would not do anything

trunk/src/VBox/Additions/common/crOpenGL/windows_exports.py

@@ -93 +93 @@
 
 
-                
+
 
 GenerateEntrypoints()

trunk/src/VBox/Additions/common/crOpenGL/windows_getprocaddress.py

@@ -145 +145 @@
 
     if (!crStrcmp(name, "wglSwapIntervalEXT")) return (CR_PROC) wglSwapIntervalEXT;
-    
+
     crDebug("Returning GetProcAddress:NULL for %s", name);
     return NULL;