Changeset 78263 in vbox for trunk/src/VBox/GuestHost/OpenGL

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/GuestHost/OpenGL

Files:

• include/cr_spu.h (modified) (1 diff)
• include/cr_unpack.h (modified) (1 diff)
• spu_loader/choosevisual.c (modified) (1 diff)
• state_tracker/state_client.c (modified) (3 diffs)
• state_tracker/state_glsl.c (modified) (2 diffs)
• state_tracker/state_init.c (modified) (1 diff)
• state_tracker/state_lists.c (modified) (3 diffs)
• state_tracker/state_snapshot.c (modified) (2 diffs)
• state_tracker/state_transform.c (modified) (3 diffs)
• util/vboxhgcm.c (modified) (1 diff)

trunk/src/VBox/GuestHost/OpenGL/include/cr_spu.h

@@ -114 +114 @@
 typedef int (WGL_APIENTRY *wglDescribePixelFormatFunc_t)(HDC, int, UINT, CONST PIXELFORMATDESCRIPTOR *);
 typedef int (WGL_APIENTRY *wglSetPixelFormatFunc_t)(HDC, int, CONST PIXELFORMATDESCRIPTOR *);
-typedef HGLRC (WGL_APIENTRY *wglGetCurrentContextFunc_t)();
-typedef PROC (WGL_APIENTRY *wglGetProcAddressFunc_t)();
+typedef HGLRC (WGL_APIENTRY *wglGetCurrentContextFunc_t)(void);
+typedef PROC (WGL_APIENTRY *wglGetProcAddressFunc_t)(LPCSTR Arg1);
 typedef BOOL (WGL_APIENTRY *wglChoosePixelFormatEXTFunc_t)(HDC, const int *, const FLOAT *, UINT, int *, UINT *);
 typedef BOOL (WGL_APIENTRY *wglGetPixelFormatAttribivEXTFunc_t)(HDC, int, int, UINT, int *, int *);
 typedef BOOL (WGL_APIENTRY *wglGetPixelFormatAttribfvEXTFunc_t)(HDC, int, int, UINT, int *, float *);
 typedef const GLubyte *(WGL_APIENTRY *glGetStringFunc_t)( GLenum );
-typedef const GLubyte *(WGL_APIENTRY *wglGetExtensionsStringEXTFunc_t)();
+typedef const GLubyte *(WGL_APIENTRY *wglGetExtensionsStringEXTFunc_t)(void);
 typedef const GLubyte *(WGL_APIENTRY *wglGetExtensionsStringARBFunc_t)(HDC);
 /*@}*/

trunk/src/VBox/GuestHost/OpenGL/include/cr_unpack.h

@@ -94 +94 @@
         return; \
     } \
-    size_t int_cbAccessVerified = (a_cbAccess)
+    size_t int_cbAccessVerified = (a_cbAccess); RT_NOREF(int_cbAccessVerified)
 
 #define CHECK_BUFFER_SIZE_STATIC_LAST(a_pState, a_offAccessLast, a_Type) CHECK_BUFFER_SIZE_STATIC(a_pState, (a_offAccessLast) + sizeof( a_Type ))

trunk/src/VBox/GuestHost/OpenGL/spu_loader/choosevisual.c

@@ -21 +21 @@
 {
         /* placeholder */
+        RT_NOREF(ws, visBits);
         return 0;
 }

trunk/src/VBox/GuestHost/OpenGL/state_tracker/state_client.c

@@ -1085 +1085 @@
     unsigned char *base = (unsigned char *) p;
 
+#ifndef IN_GUEST
+    RT_NOREF(fRealPtr);
+#endif
+
     if (g->current.inBeginEnd)
     {
@@ -1579 +1583 @@
 }
 
-void STATE_APIENTRY crStateUnlockArraysEXT()
+void STATE_APIENTRY crStateUnlockArraysEXT(void)
 {
     CRContext *g = GetCurrentContext();
@@ -1728 +1732 @@
             else
             {
-                zvMax = ~0;
+                zvMax = ~UINT32_C(0);
                 break;
             }

trunk/src/VBox/GuestHost/OpenGL/state_tracker/state_glsl.c

@@ -1281 +1281 @@
     return result;
 #else
+    RT_NOREF(program, name);
     crWarning("crStateGetUniformLocation called on host side!!");
     return -1;
@@ -1316 +1317 @@
     return result;
 #else
+    RT_NOREF(program, name);
     crWarning("crStateGetAttribLocation called on host side!!");
     return -1;

trunk/src/VBox/GuestHost/OpenGL/state_tracker/state_init.c

@@ -787 +787 @@
 }
 
-void crStateCleanupCurrent()
+void crStateCleanupCurrent(void)
 {
     crStateSetCurrentEx( NULL, GL_TRUE );

trunk/src/VBox/GuestHost/OpenGL/state_tracker/state_lists.c

@@ -59 +59 @@
 #define CRSTATE_SET_ENABLED(state, cap) CRSTATE_SET_CAP(state, diff_api.IsEnabled(cap), "%u")
 
-#define CRSTATE_SET_ENUM(state, cap) {GLenum _e=g->state; diff_api.GetIntegerv(cap, &_e); CRSTATE_SET_CAP(state, _e, "%#x");}
+#define CRSTATE_SET_ENUM(state, cap) {GLenum _e=g->state; diff_api.GetIntegerv(cap, (GLint *)&_e); CRSTATE_SET_CAP(state, _e, "%#x");}
 #define CRSTATE_SET_FLOAT(state, cap) {GLfloat _f=g->state; diff_api.GetFloatv(cap, &_f); CRSTATE_SET_CAP(state, _f, "%f");}
 #define CRSTATE_SET_INT(state, cap) {GLint _i=g->state; diff_api.GetIntegerv(cap, &_i); CRSTATE_SET_CAP(state, _i, "%i");}
@@ -224 +224 @@
         {
             GLuint buf = 0;
-            diff_api.GetIntegerv(GL_DRAW_BUFFER, &buf);
+            diff_api.GetIntegerv(GL_DRAW_BUFFER, (GLint *)&buf);
 
             if (buf == GL_COLOR_ATTACHMENT0_EXT && (bbFbo || fbFbo))
             {
                 GLuint binding = 0;
-                diff_api.GetIntegerv(GL_DRAW_FRAMEBUFFER_BINDING, &binding);
+                diff_api.GetIntegerv(GL_DRAW_FRAMEBUFFER_BINDING, (GLint *)&binding);
                 if (!binding)
                 {
@@ -257 +257 @@
         {
             GLuint buf = 0;
-            diff_api.GetIntegerv(GL_READ_BUFFER, &buf);
+            diff_api.GetIntegerv(GL_READ_BUFFER, (GLint *)&buf);
 
             if (buf == GL_COLOR_ATTACHMENT0_EXT && (bbFbo || fbFbo))
             {
                 GLuint binding = 0;
-                diff_api.GetIntegerv(GL_READ_FRAMEBUFFER_BINDING, &binding);
+                diff_api.GetIntegerv(GL_READ_FRAMEBUFFER_BINDING, (GLint *)&binding);
                 if (!binding)
                 {

trunk/src/VBox/GuestHost/OpenGL/state_tracker/state_snapshot.c

@@ -1106 +1106 @@
     int32_t rc;
 
+    RT_NOREF(data1);
+
     rc = SSMR3PutMem(pSSM, &key, sizeof(key));
     CRASSERT(rc == VINF_SUCCESS);
@@ -1809 +1811 @@
 #include "state_bits_globalop.h"
 #undef CRSTATE_BITS_OP
+#else
+    RT_NOREF(pSSM);
 #endif
     return VINF_SUCCESS;

trunk/src/VBox/GuestHost/OpenGL/state_tracker/state_transform.c

@@ -343 +343 @@
 }
 
-void STATE_APIENTRY crStateLoadIdentity() 
+void STATE_APIENTRY crStateLoadIdentity(void) 
 {
     CRContext *g = GetCurrentContext();
@@ -366 +366 @@
 }
 
-void STATE_APIENTRY crStatePopMatrix() 
+void STATE_APIENTRY crStatePopMatrix(void) 
 {
     CRContext *g = GetCurrentContext();
@@ -398 +398 @@
 }
 
-void STATE_APIENTRY crStatePushMatrix() 
+void STATE_APIENTRY crStatePushMatrix(void) 
 {
     CRContext *g = GetCurrentContext();

trunk/src/VBox/GuestHost/OpenGL/util/vboxhgcm.c

@@ -1354 +1354 @@
 
 #else  /* !IN_GUEST */
+    RT_NOREF(conn);
     crError("crVBoxHGCMDoConnect called on host side!");
     CRASSERT(FALSE);