Changeset 63204 in vbox for trunk/src/VBox/Additions/common

Timestamp:

Aug 9, 2016 1:36:53 PM (9 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

109830

Message:

GA/common/crOpenGL: warnings (gcc)

Location:

trunk/src/VBox/Additions/common/crOpenGL

Files:

• context.c (modified) (4 diffs)
• glx.c (modified) (13 diffs)
• load.c (modified) (13 diffs)
• stub.c (modified) (1 diff)
• stub.h (modified) (1 diff)

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

@@ -135 +135 @@
 {
     ContextInfo *context = (ContextInfo *) data1;
+    RT_NOREF(key);
 
     CRASSERT(context);
@@ -252 +253 @@
 
 #ifdef GLX
+# if 0 /* unused */
 static XErrorHandler oldErrorHandler;
 static unsigned char lastXError = Success;
@@ -258 +260 @@
 errorHandler (Display *dpy, XErrorEvent *e)
 {
+    RT_NOREF(dpy);
+
     lastXError = e->error_code;
     return 0;
 }
+# endif /* unused */
 #endif
 
@@ -1095 +1100 @@
     ContextInfo *pCtx = (ContextInfo *) data2;
 
+    RT_NOREF(key);
+
+
     if (pWindow->pOwner == pCtx)
     {

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

@@ -74 +74 @@
 };
 
+#ifndef VBOX_NO_NATIVEGL /* Old code */
 static struct VisualInfo *VisualInfoList = NULL;
+#endif
 
 static void stubXshmUpdateImageRect(Display *dpy, GLXDrawable draw, GLX_Pixmap_t *pGlxPixmap, XRectangle *pRect);
 static void stubQueryXDamageExtension(Display *dpy, ContextInfo *pContext);
+
+#ifndef VBOX_NO_NATIVEGL /* Old code */
 
 static void
@@ -154 +158 @@
     {GLX_SAMPLE_BUFFERS_SGIS, "GLX_SAMPLE_BUFFERS_SGIS", TEST_GREATER_0, CR_MULTISAMPLE_BIT},
 };
-#ifndef VBOX_NO_NATIVEGL  /* Currently not used */
+
 static int QueryVisBits(Display *dpy, XVisualInfo *vis)
 {
@@ -210 +214 @@
     return visBits;
 }
-#endif /* not 0 */
+
+#endif /* !VBOX_NO_NATIVEGL */
 
 
@@ -564 +569 @@
     ContextInfo *context;
     int visBits = CR_RGB_BIT | CR_DOUBLE_BIT | CR_DEPTH_BIT; /* default vis */
-    int i, numExt;
 
     stubInit();
@@ -572 +576 @@
     /*
     {
+        int i, numExt;
         char **list;
 
@@ -667 +672 @@
     stubFindPixmapParms_t *pParms = (stubFindPixmapParms_t *) data2;
     GLX_Pixmap_t *pGlxPixmap = (GLX_Pixmap_t *) crHashtableSearch(pCtx->pGLXPixmapsHash, (unsigned int) pParms->draw);
+    (void)key;
 
     if (pGlxPixmap)
@@ -930 +936 @@
 DECLEXPORT(int) VBOXGLXTAG(glXGetConfig)( Display *dpy, XVisualInfo *vis, int attrib, int *value )
 {
+    (void)dpy;
+
     if (!vis) {
         /* SGI OpenGL Performer hits this */
@@ -1106 +1114 @@
 }
 
+#ifdef VBOX_TEST_MEGOO
 static XErrorHandler oldErrorHandler;
 static unsigned char lastXError = Success;
@@ -1112 +1121 @@
 errorHandler (Display *dpy, XErrorEvent *e)
 {
+    (void)dpy;
     lastXError = e->error_code;
     return 0;
 }
+#endif /* VBOX_TEST_MGEOO */
 
 DECLEXPORT(void) VBOXGLXTAG(glXSwapBuffers)( Display *dpy, GLXDrawable drawable )
@@ -1947 +1958 @@
 {
     GLXFBConfig *pGLXFBConfigs = NULL;
-    struct VisualInfo *v;
-    int i=0, cVisuals;
+    /*struct VisualInfo *v; */
+    int i=0;
     XVisualInfo searchvis, *pVisuals;
 
@@ -2025 +2036 @@
     (void) config;
     
+    /*
     struct VisualInfo *v;
 
-    /*
     for (v = VisualInfoList; v; v = v->next) {
         if (v->dpy == dpy && v->visualid == (VisualID)config)
@@ -2418 +2429 @@
                 pGlxPixmap->x, pGlxPixmap->y, pGlxPixmap->w, pGlxPixmap->h, rect.height);*/
 
-        for (; (rect.y+rect.height)<=(pGlxPixmap->y+pGlxPixmap->h); rect.y+=rect.height)
+        for (; (rect.y+rect.height)<=(pGlxPixmap->y+(int)pGlxPixmap->h); rect.y+=rect.height)
         {
             stubXshmUpdateImageRect(dpy, draw, pGlxPixmap, &rect);
         }
 
-        if (rect.y!=(pGlxPixmap->y+pGlxPixmap->h))
+        if (rect.y!=(pGlxPixmap->y+(int)pGlxPixmap->h))
         {
             rect.height=pGlxPixmap->h-rect.y;
@@ -2528 +2539 @@
 DECLEXPORT(void) VBOXGLXTAG(glXBindTexImageEXT)(Display *dpy, GLXDrawable draw, int buffer, const int *attrib_list)
 {
-    static int cnt=0;
-    XImage dummyimg;
     ContextInfo *context = stubGetCurrentContext();
-
     GLX_Pixmap_t *pGlxPixmap;
+    RT_NOREF(buffer, attrib_list);
 
     if (!context)

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

@@ -70 +70 @@
 
 
+#ifndef VBOX_NO_NATIVEGL
 static void stubInitNativeDispatch( void )
 {
-#define MAX_FUNCS 1000
+# define MAX_FUNCS 1000
     SPUNamedFunctionTable gl_funcs[MAX_FUNCS];
     int numFuncs;
@@ -88 +89 @@
     crSPUInitDispatch( &stub.nativeDispatch, gl_funcs );
     crSPUInitDispatchNops( &stub.nativeDispatch );
-#undef MAX_FUNCS
-}
+# undef MAX_FUNCS
+}
+#endif /* !VBOX_NO_NATIVEGL */
 
 
@@ -178 +180 @@
     WindowInfo *pWindow = (WindowInfo *) data1;
     ContextInfo *pCtx = (ContextInfo *) data2;
+    (void)key;
 
     if (pWindow == pCtx->currentDrawable
@@ -252 +255 @@
 }
 
-static void SPU_APIENTRY trapSwapBuffers(GLint window, GLint flags)
+/*static void SPU_APIENTRY trapSwapBuffers(GLint window, GLint flags)
 {
     stubCheckWindowsState();
@@ -262 +265 @@
     stubCheckWindowsState();
     origDrawBuffer(buf);
-}
-
+}*/
+
+#if 0 /* unused */
 static void SPU_APIENTRY trapScissor(GLint x, GLint y, GLsizei w, GLsizei h)
 {
@@ -270 +274 @@
     WindowInfo *pWindow;
     ContextInfo *context = stubGetCurrentContext();
+    (void)x; (void)y; (void)w; (void)h;
+
     pWindow = context->currentDrawable;
     stubGetWindowGeometry(pWindow, &winX, &winY, &winW, &winH);
     origScissor(0, 0, winW, winH);
 }
+#endif /* unused */
 
 /**
@@ -301 +308 @@
 }
 
+#if 0 /** @todo stubSPUTearDown & stubSPUTearDownLocked are not referenced */
+
 // Callback function, used to destroy all created contexts
 static void hsWalkStubDestroyContexts(unsigned long key, void *data1, void *data2)
 {
+    (void)data1; (void)data2;
     stubDestroyContext(key);
 }
@@ -378 +388 @@
     STUB_INIT_UNLOCK();
 }
+
+#endif /** @todo stubSPUTearDown & stubSPUTearDownLocked are not referenced */
 
 static void stubSPUSafeTearDown(void)
@@ -498 +510 @@
 static void stubSignalHandler(int signo)
 {
+    (void)signo;
     stubSPUSafeTearDown();
     exit(0);  /* this causes stubExitHandler() to be called */
@@ -721 +734 @@
 #endif /* 0 */
 
-void stubSetDefaultConfigurationOptions(void)
+static void stubSetDefaultConfigurationOptions(void)
 {
     unsigned char key[16]= {0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0};
@@ -755 +768 @@
 #ifdef CR_NEWWINTRACK
 # ifdef VBOX_WITH_WDDM
-static stubDispatchVisibleRegions(WindowInfo *pWindow)
+static void stubDispatchVisibleRegions(WindowInfo *pWindow)
 {
     DWORD dwCount;
@@ -798 +811 @@
 {
     WindowInfo *pWindow = (WindowInfo *) data1;
-    (void) data2;
+    (void)key; (void) data2;
 
     if (pWindow->type!=CHROMIUM || pWindow->spuWindow==0)
@@ -942 +955 @@
      */
 
-    CRConnection *conn = NULL;
     char response[1024];
     char **spuchain;

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

@@ -156 +156 @@
 void APIENTRY crVBoxTexPresent(GLuint texture, GLuint cfg, GLint xPos, GLint yPos, GLint cRects, const GLint *pRects)
 {
+    RT_NOREF(texture, cfg, xPos, yPos, cRects, pRects);
     crError("not expected!");
 }

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

@@ -284 +284 @@
 extern CRtsd g_stubCurrentContextTSD;
 
-DECLINLINE(ContextInfo*) stubGetCurrentContext()
+DECLINLINE(ContextInfo*) stubGetCurrentContext(void)
 {
     ContextInfo* ctx;