Changeset 69310 in vbox for trunk/src/VBox/Additions/common/crOpenGL/dri_util.c

Timestamp:

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

Author:

vboxsync

Message:

common/crOpenGL: scm updates

File:

• trunk/src/VBox/Additions/common/crOpenGL/dri_util.c (modified) (22 diffs)

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;
 }