Changeset 53222 in vbox for trunk/src/VBox/Devices/Graphics

Timestamp:

Nov 5, 2014 9:21:42 AM (10 years ago)

Author:

vboxsync

Message:

Devices/vmsvga: enabled 3D and a few warning fixes

Location:

trunk/src/VBox/Devices/Graphics/shaderlib

Files:

• glsl_shader.c (modified) (1 diff)
• libWineStub/debug.c (modified) (1 diff)
• vboxext.h (modified) (3 diffs)
• wine/include/wine/wined3d.h (modified) (1 diff)
• wined3d_gl.h (modified) (1 diff)

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

@@ -55 +55 @@
 #undef WDLOG
 #define WDLOG(_m) Log(_m)
+#undef CONST
 #define CONST const
 #endif

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

@@ -229 +229 @@
     {
         static char buf[8092];
-        int offset = sprintf(buf, "[0x%lx.0x%lx] Wine Debug: ", GetCurrentProcessId(), GetCurrentThreadId());
+        int offset = sprintf(buf, "[0x%lx.0x%lx] Wine Debug: ", (unsigned long)GetCurrentProcessId(), (unsigned long)GetCurrentThreadId());
         vsprintf(buf + offset, pszFormat, args);
         vbox_log_backdoor(buf);

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

@@ -40 +40 @@
  * So lock order should always be "wined3d lock" -> "dll lock".
  * To avoid possible deadlocks we make an asynchronous call to a worker thread to make a context release from there. */
+struct wined3d_context;
 void VBoxExtReleaseContextAsync(struct wined3d_context *context);
 #endif
@@ -55 +56 @@
 typedef FNVBOXEXT_HASHMAP_EQUAL *PFNVBOXEXT_HASHMAP_EQUAL;
 
+struct VBOXEXT_HASHMAP;
+struct VBOXEXT_HASHMAP_ENTRY;
 typedef DECLCALLBACK(bool) FNVBOXEXT_HASHMAP_VISITOR(struct VBOXEXT_HASHMAP *pMap, void *pvKey, struct VBOXEXT_HASHMAP_ENTRY *pValue, void *pvVisitor);
 typedef FNVBOXEXT_HASHMAP_VISITOR *PFNVBOXEXT_HASHMAP_VISITOR;
@@ -98 +101 @@
 }
 
+struct VBOXEXT_HASHCACHE_ENTRY;
 typedef DECLCALLBACK(void) FNVBOXEXT_HASHCACHE_CLEANUP_ENTRY(void *pvKey, struct VBOXEXT_HASHCACHE_ENTRY *pEntry);
 typedef FNVBOXEXT_HASHCACHE_CLEANUP_ENTRY *PFNVBOXEXT_HASHCACHE_CLEANUP_ENTRY;

trunk/src/VBox/Devices/Graphics/shaderlib/wine/include/wine/wined3d.h

@@ -11 +11 @@
 #endif
 
+# undef DECLSPEC_HIDDEN
 # define DECLSPEC_HIDDEN
 

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

@@ -1386 +1386 @@
 BOOL (WINAPI *pwglSetPixelFormat)(HDC, int, const PIXELFORMATDESCRIPTOR *) DECLSPEC_HIDDEN;
 
+struct VBOXUHGSMI;
 HGLRC (WINAPI *pVBoxCreateContext)(HDC, struct VBOXUHGSMI*) DECLSPEC_HIDDEN;
 void (WINAPI *pVBoxFlushToHost)(HGLRC) DECLSPEC_HIDDEN;