Changeset 69310 in vbox for trunk/src/VBox/Additions/common/crOpenGL/glx.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/glx.c (modified) (37 diffs, 1 prop)

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;