Changeset 62948 in vbox

Timestamp:

Aug 4, 2016 6:58:58 AM (9 years ago)

Author:

vboxsync

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

109551

Message:

VBoxSVGA3D: warnings

Location:

trunk/src/VBox/Devices

Files:

• Graphics/shaderlib/directx.c (modified) (7 diffs)
• Graphics/shaderlib/glsl_shader.c (modified) (2 diffs)
• Graphics/shaderlib/libWineStub/debug.c (modified) (4 diffs)
• Graphics/shaderlib/libWineStub/include/wine/debug.h (modified) (1 diff)
• Graphics/shaderlib/shader_sm1.c (modified) (1 diff)
• Graphics/shaderlib/wined3d_private.h (modified) (1 diff)
• Makefile.kmk (modified) (1 diff)

trunk/src/VBox/Devices/Graphics/shaderlib/directx.c

@@ -252 +252 @@
     GL_EXTCALL(glBindProgramARB(GL_VERTEX_PROGRAM_ARB, prog));
     GL_EXTCALL(glProgramStringARB(GL_VERTEX_PROGRAM_ARB, GL_PROGRAM_FORMAT_ASCII_ARB,
-                                  strlen(testcode), testcode));
+                                  (GLsizei)strlen(testcode), testcode));
     if(glGetError() != 0) {
         TRACE("OpenGL implementation does not allow indirect addressing offsets > 63\n");
@@ -494 +494 @@
     GL_EXTCALL(glBindProgramARB(GL_VERTEX_PROGRAM_ARB, prog));
     GL_EXTCALL(glProgramStringARB(GL_VERTEX_PROGRAM_ARB, GL_PROGRAM_FORMAT_ASCII_ARB,
-                                  strlen(testcode), testcode));
+                                  (GLsizei)strlen(testcode), testcode));
     glGetIntegerv(GL_PROGRAM_ERROR_POSITION_ARB, &pos);
     if(pos != -1)
@@ -1928 +1928 @@
 BOOL IWineD3DImpl_FillGLCaps(struct wined3d_adapter *adapter, struct VBOXVMSVGASHADERIF *pVBoxShaderIf)
 {
+#ifndef VBOX_WITH_VMSVGA
     struct wined3d_driver_info *driver_info = &adapter->driver_info;
+#endif
     struct wined3d_gl_info *gl_info = &adapter->gl_info;
 #ifndef VBOX_WITH_VMSVGA
@@ -1935 +1937 @@
 #endif
     const char *gl_vendor_str, *gl_renderer_str, *gl_version_str;
+#ifndef VBOX_WITH_VMSVGA
     struct fragment_caps fragment_caps;
+#endif
     enum wined3d_gl_vendor gl_vendor;
     enum wined3d_pci_vendor card_vendor;
@@ -1942 +1946 @@
     GLfloat     gl_floatv[2];
     unsigned    i;
+#ifndef VBOX_WITH_VMSVGA
     HDC         hdc;
+#endif
     unsigned int vidmem=0;
     DWORD gl_version;
+#ifndef VBOX_WITH_VMSVGA
     size_t len;
+#endif
 
     TRACE_(d3d_caps)("(%p)\n", gl_info);
@@ -2074 +2082 @@
             check_gl_extension(gl_info, szCurExt);
     }
-#else /* VBOX_WITH_VMSVGA */
+#else /* !VBOX_WITH_VMSVGA */
     while (*GL_Extensions)
     {
@@ -2101 +2109 @@
         }
     }
-#endif
+#endif /* !VBOX_WITH_VMSVGA */
 
 #ifdef VBOX_WITH_VMSVGA

trunk/src/VBox/Devices/Graphics/shaderlib/glsl_shader.c

@@ -2014 +2014 @@
     {
         enum complex_fixup complex_fixup = get_complex_fixup(fixup);
-        FIXME("Complex fixup (%#x) not supported\n",complex_fixup);
+        FIXME("Complex fixup (%#x) not supported\n",complex_fixup); (void)complex_fixup;
         return;
     }
@@ -3640 +3640 @@
 static void shader_glsl_texbem(const struct wined3d_shader_instruction *ins)
 {
-    IWineD3DBaseShaderImpl *shader = (IWineD3DBaseShaderImpl *)ins->ctx->shader;
-    IWineD3DDeviceImpl *deviceImpl = (IWineD3DDeviceImpl *)shader->baseShader.device;
+    /*IWineD3DBaseShaderImpl *shader = (IWineD3DBaseShaderImpl *)ins->ctx->shader;
+    IWineD3DDeviceImpl *deviceImpl = (IWineD3DDeviceImpl *)shader->baseShader.device; - unused */
     const struct wined3d_gl_info *gl_info = ins->ctx->gl_info;
     const struct shader_glsl_ctx_priv *priv = ins->ctx->backend_data;

trunk/src/VBox/Devices/Graphics/shaderlib/libWineStub/debug.c

@@ -177 +177 @@
             for (i = 0; i < sizeof(debug_classes)/sizeof(debug_classes[0]); i++)
             {
-                int len = strlen(debug_classes[i]);
+                int len = (int)strlen(debug_classes[i]);
                 if (len != (p - opt)) continue;
                 if (!memcmp( opt, debug_classes[i], len ))  /* found it */
@@ -318 +318 @@
 int interlocked_xchg_add( int *dest, int incr )
 {
-    return InterlockedExchangeAdd(dest, incr);
+    return InterlockedExchangeAdd((LONG *)dest, incr);
 }
 #endif
@@ -347 +347 @@
 static const char *default_dbgstr_an( const char *str, int n )
 {
-    static const char hex[16] = "0123456789abcdef";
+    static const char hex[16+1] = "0123456789abcdef";
     char *dst, *res;
     size_t size;
@@ -358 +358 @@
         return res;
     }
-    if (n == -1) n = strlen(str);
+    if (n == -1) n = (int)strlen(str);
     if (n < 0) n = 0;
     size = 10 + min( 300, n * 4 );

trunk/src/VBox/Devices/Graphics/shaderlib/libWineStub/include/wine/debug.h

@@ -315 +315 @@
 
 #define WINE_DECLARE_DEBUG_CHANNEL(ch) \
-    static struct __wine_debug_channel __wine_dbch_##ch = { ~0, #ch }
+    static struct __wine_debug_channel __wine_dbch_##ch = { /* was: ~0, VBox:*/ UINT8_MAX, #ch }
 #define WINE_DEFAULT_DEBUG_CHANNEL(ch) \
-    static struct __wine_debug_channel __wine_dbch_##ch = { ~0, #ch }; \
+    static struct __wine_debug_channel __wine_dbch_##ch = { /* was: ~0, VBox:*/ UINT8_MAX, #ch }; \
     static struct __wine_debug_channel * const __wine_dbch___default = &__wine_dbch_##ch
 

trunk/src/VBox/Devices/Graphics/shaderlib/shader_sm1.c

@@ -424 +424 @@
     while (opcode_table[i].handler_idx != WINED3DSIH_TABLE_SIZE)
     {
-        if ((code & WINED3DSI_OPCODE_MASK) == opcode_table[i].opcode
+        if ((code & WINED3DSI_OPCODE_MASK) == (DWORD)opcode_table[i].opcode
                 && shader_version >= opcode_table[i].min_version
                 && (!opcode_table[i].max_version || shader_version <= opcode_table[i].max_version))

trunk/src/VBox/Devices/Graphics/shaderlib/wined3d_private.h

@@ -47 +47 @@
 #include "winuser.h"
 #else
-#include <iprt/win/windows.h>
+# include <iprt/win/windows.h>
 #endif
 #include "wine/debug.h"

trunk/src/VBox/Devices/Makefile.kmk

@@ -1453 +1453 @@
         -install_name $(VBOX_DYLD_EXECUTABLE_PATH)/VBoxSVGA3D.dylib
  $(call VBOX_SET_VER_INFO_DLL,VBoxSVGA3D,VirtualBox VMSVGA 3D)
+ #  -wd4100: unreferenced format parameter
+ #  -wd4204: nonstandard extension used : non-constant initializer
+ #  -wd4245: '=' : conversion from 'int' to 'DWORD', signed/unsigned mismatch
+ #  -wd4305: 'function' : truncation from 'double' to 'GLclampf'
+ VBoxSVGA3D_CFLAGS.win = -wd4100  -wd4204 -wd4245 -wd4305
 
  #