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

Timestamp:

Apr 23, 2019 6:41:06 PM (6 years ago)

Author:

vboxsync

Message:

Config.kmk,GuestHost\OpenGL,HostServices\SharedOpenGL: Fix a bunch of compiler warnings and enable them again

Location:

trunk/src/VBox/HostServices/SharedOpenGL/render

Files:

• renderspu.c (modified) (7 diffs)
• renderspu.h (modified) (3 diffs)
• renderspu_init.c (modified) (2 diffs)
• renderspu_wgl.c (modified) (15 diffs)

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

@@ -243 +243 @@
 }
 
-ContextInfo * renderspuDefaultSharedContextAcquire()
+ContextInfo * renderspuDefaultSharedContextAcquire(void)
 {
     ContextInfo * pCtx = render_spu.defaultSharedContext;
@@ -651 +651 @@
     WindowInfo *window;
 
+    RT_NOREF(dpyName);
+
     if (id <= 0)
     {
@@ -731 +733 @@
     window = (WindowInfo *) crHashtableSearch(render_spu.windowTable, win);
     if (window) {
-        if (w != window->BltInfo.width
-                || h != window->BltInfo.height)
+        if (   (GLuint)w != window->BltInfo.width
+            || (GLuint)h != window->BltInfo.height)
         {
             /* window is resized, compositor data is no longer valid
@@ -1063 +1065 @@
 {
     PCR_BLITTER pBlitter = renderspuVBoxPresentBlitterGetAndEnter(window, i32MakeCurrentUserData, fRedraw);
+
+    RT_NOREF(pChangedEntry);
     if (!pBlitter)
         return;
@@ -1111 +1115 @@
 {
     WindowInfo *window = (WindowInfo *) data1;
+    RT_NOREF(key, data2);
+
     renderspuVBoxCompositorSet(window, NULL);
 }
 
-void renderspuVBoxCompositorClearAll()
+void renderspuVBoxCompositorClearAll(void)
 {
     /* we need to clear window compositor, which is not that trivial though,
@@ -1506 +1512 @@
 }
 
-bool renderspuCalloutAvailable()
+bool renderspuCalloutAvailable(void)
 {
     return render_spu.pfnClientCallout != NULL;
@@ -1854 +1860 @@
 {
     WindowInfo *pWindow = (WindowInfo *)data1;
+    RT_NOREF(key, data2);
 
     renderspu_SystemReparentWindow(pWindow);

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

@@ -339 +339 @@
 extern void renderspu_SystemWindowVisibleRegion(WindowInfo *window, GLint cRects, const GLint* pRects);
 extern GLboolean renderspu_SystemWindowNeedEmptyPresent(WindowInfo *window);
-extern int renderspu_SystemInit();
-extern int renderspu_SystemTerm();
+extern int renderspu_SystemInit(void);
+extern int renderspu_SystemTerm(void);
 extern void renderspu_SystemDefaultSharedContextChanged(ContextInfo *fromContext, ContextInfo *toContext);
 extern void renderspu_SystemShowWindow( WindowInfo *window, GLboolean showIt );
@@ -351 +351 @@
 extern int renderspuCreateFunctions( SPUNamedFunctionTable table[] );
 extern GLboolean renderspuVBoxCompositorSet( WindowInfo *window, const struct VBOXVR_SCR_COMPOSITOR * pCompositor);
-extern void renderspuVBoxCompositorClearAll();
+extern void renderspuVBoxCompositorClearAll(void);
 extern int renderspuVBoxCompositorLock(WindowInfo *window, const struct VBOXVR_SCR_COMPOSITOR **ppCompositor);
 extern int renderspuVBoxCompositorUnlock(WindowInfo *window);
@@ -408 +408 @@
 extern uint32_t renderspuContextMarkDeletedAndRelease( ContextInfo *context );
 
-int renderspuDefaultCtxInit();
+int renderspuDefaultCtxInit(void);
 void renderspuCleanupBase(bool fDeleteTables);
 
-ContextInfo * renderspuDefaultSharedContextAcquire();
+ContextInfo * renderspuDefaultSharedContextAcquire(void);
 void renderspuDefaultSharedContextRelease(ContextInfo * pCtx);
 uint32_t renderspuContextRelease(ContextInfo *context);
 uint32_t renderspuContextRetain(ContextInfo *context);
 
-bool renderspuCalloutAvailable();
+bool renderspuCalloutAvailable(void);
 bool renderspuCalloutClient(PFNVCRSERVER_CLIENT_CALLOUT_CB pfnCb, void *pvCb);
 

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

@@ -100 +100 @@
 #endif
 
-int renderspuDefaultCtxInit()
+int renderspuDefaultCtxInit(void)
 {
     GLint defaultWin, defaultCtx;
@@ -367 +367 @@
     CRASSERT(window);
 
+    RT_NOREF(key, data2);
+
     renderspuVBoxPresentBlitterCleanup( window );
 }

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

@@ -99 +99 @@
 }
 
-int renderspuIatPatcherPatchEntry(void *pvEntry, void *pvValue, void **ppvOldVal)
-{
-    void **ppfn = (void**)pvEntry;
+int renderspuIatPatcherPatchEntry(void *pvEntry, PFNRT pfnValue, PFNRT *ppfnOldVal)
+{
+    PFNRT *ppfn = (PFNRT *)pvEntry;
     DWORD dwOldProtect = 0;
 
@@ -110 +110 @@
     }
 
-    if (ppvOldVal)
-        *ppvOldVal = *ppfn;
-    *ppfn = pvValue;
+    if (ppfnOldVal)
+        *ppfnOldVal = *ppfn;
+    *ppfn = pfnValue;
 
     if (!VirtualProtect(pvEntry, sizeof (pvEntry), dwOldProtect, &dwOldProtect))
@@ -123 +123 @@
 
 
-int renderspuIatPatcherPatchFunction(HMODULE hModule, LPCSTR pszLib, LPCSTR pszName, void* pfn)
+int renderspuIatPatcherPatchFunction(HMODULE hModule, LPCSTR pszLib, LPCSTR pszName, PFNRT pfn)
 {
     void* pAdr;
@@ -144 +144 @@
 
 /* patch */
-static HWND __stdcall renderspuAtiQuirk_GetForegroundWindow()
+static HWND __stdcall renderspuAtiQuirk_GetForegroundWindow(void)
 {
     crDebug("renderspuAtiQuirk_GetForegroundWindow");
@@ -279 +279 @@
     }
 
-    rc = renderspuIatPatcherPatchFunction(hAtiDll, "user32.dll", "GetForegroundWindow", (void*)renderspuAtiQuirk_GetForegroundWindow);
+    rc = renderspuIatPatcherPatchFunction(hAtiDll, "user32.dll", "GetForegroundWindow", (PFNRT)renderspuAtiQuirk_GetForegroundWindow);
     if (RT_FAILURE(rc))
     {
@@ -311 +311 @@
 
 
-static int renderspuAtiQuirk_Apply()
+static int renderspuAtiQuirk_Apply(void)
 {
     char aBuf[4096];
@@ -337 +337 @@
 }
 
-static GLboolean renderspuAtiQuirk_Needed()
-{
-    const char * pszString = render_spu.ws.glGetString(GL_VENDOR);
+static GLboolean renderspuAtiQuirk_Needed(void)
+{
+    const char * pszString = (const char *)render_spu.ws.glGetString(GL_VENDOR);
     if (pszString && strstr(pszString, "ATI"))
         return GL_TRUE;
-    pszString = render_spu.ws.glGetString(GL_RENDERER);
+    pszString = (const char *)render_spu.ws.glGetString(GL_RENDERER);
     if (pszString && strstr(pszString, "ATI"))
         return GL_TRUE;
@@ -348 +348 @@
 }
 
-static void renderspuAtiQuirk_ChkApply()
+static void renderspuAtiQuirk_ChkApply(void)
 {
     static GLboolean fChecked = GL_FALSE;
@@ -506 +506 @@
     int attribList[100];
     float fattribList[] = { 0.0, 0.0 };
-    int numFormats;
+    unsigned numFormats;
     int i = 0;
     BOOL vis;
@@ -1400 +1400 @@
         }
 
+#if 0
         if (0/*render_spu.render_to_app_window && nativeWindow*/)
         {
@@ -1439 +1440 @@
         }
         else
+#endif
         {
             if (!context->hRC) {
@@ -1583 +1585 @@
 GLboolean renderspu_SystemWindowNeedEmptyPresent(WindowInfo *window)
 {
+    RT_NOREF(window);
     return GL_FALSE;
 }
@@ -1642 +1645 @@
 {
     int return_value;
+
+    RT_NOREF(flags);
 
     /* peek at the windows message queue */
@@ -1721 +1726 @@
 }
 
-int renderspu_SystemInit()
+int renderspu_SystemInit(void)
 {
     return VINF_SUCCESS;
 }
 
-int renderspu_SystemTerm()
+int renderspu_SystemTerm(void)
 {
     return VINF_SUCCESS;
@@ -1733 +1738 @@
 void renderspu_SystemDefaultSharedContextChanged(ContextInfo *fromContext, ContextInfo *toContext)
 {
-
+    RT_NOREF(fromContext, toContext);
 }
 
 uint32_t renderspu_SystemPostprocessFunctions(SPUNamedFunctionTable *aFunctions, uint32_t cFunctions, uint32_t cTable)
 {
+    RT_NOREF(aFunctions, cTable);
     return cFunctions;
 }