Changeset 54766 in vbox for trunk/src/VBox/Devices

Timestamp:

Mar 15, 2015 6:22:17 PM (10 years ago)

Author:

vboxsync

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

98945

Message:

The D3DXDisassembleShader API required the DirectX SDK, which we don't have handy.

Location:

trunk/src/VBox/Devices

Files:

• Graphics/DevVGA-SVGA3d-ogl.cpp (modified) (2 diffs)
• Graphics/DevVGA-SVGA3d-win.cpp (modified) (3 diffs)
• Makefile.kmk (modified) (2 diffs)

trunk/src/VBox/Devices/Graphics/DevVGA-SVGA3d-ogl.cpp

@@ -21 +21 @@
 *******************************************************************************/
 /* Enable to disassemble defined shaders. (Windows host only) */
-#if defined(RT_OS_WINDOWS) && defined(DEBUG)
+#if defined(RT_OS_WINDOWS) && defined(DEBUG) && 0 /* Disabled as we don't have the DirectX SDK avaible atm. */
 # define DUMP_SHADER_DISASSEMBLY
 #endif
@@ -7468 +7468 @@
 #ifdef DUMP_SHADER_DISASSEMBLY
     LPD3DXBUFFER pDisassembly;
-
     HRESULT hr = D3DXDisassembleShader((const DWORD *)pShaderData, FALSE, NULL, &pDisassembly);
     if (hr == D3D_OK)

trunk/src/VBox/Devices/Graphics/DevVGA-SVGA3d-win.cpp

@@ -48 +48 @@
 
 /* Enable to disassemble defined shaders. */
-#ifdef DEBUG
+#if defined(DEBUG) && 0 /* Disabled as we don't have the DirectX SDK avaible atm. */
 #define DUMP_SHADER_DISASSEMBLY
 #endif
@@ -5763 +5763 @@
 #ifdef DUMP_SHADER_DISASSEMBLY
     LPD3DXBUFFER pDisassembly;
-
     hr = D3DXDisassembleShader((const DWORD *)pShaderData, FALSE, NULL, &pDisassembly);
     if (hr == D3D_OK)
@@ -5771 +5770 @@
     }
 #endif
+
     switch (type)
     {

trunk/src/VBox/Devices/Makefile.kmk

@@ -257 +257 @@
   ifeq ($(KBUILD_TARGET),win) # (Disable this to work with OpenGL on Windows.)
    VBoxDD_SOURCES       += Graphics/DevVGA-SVGA3d-win.cpp
-   VBoxDD_LIBS.win      += d3d9.lib d3dx9.lib $(PATH_TOOL_$(VBOX_VCC_TOOL)_LIB)/delayimp.lib
+   VBoxDD_LIBS.win      += d3d9.lib $(PATH_TOOL_$(VBOX_VCC_TOOL)_LIB)/delayimp.lib
    VBoxDD_LDFLAGS.win   += /DELAYLOAD:d3d9.dll
   else
@@ -276 +276 @@
 
    VBoxDD_LIBS.linux    += GL X11
-   VBoxDD_LIBS.win      += d3dx9.lib $(PATH_SDK_$(VBOX_WINPSDK)_LIB)/Opengl32.lib
+   VBoxDD_LIBS.win      += $(PATH_SDK_$(VBOX_WINPSDK)_LIB)/Opengl32.lib
    VBoxDD_LDFLAGS.darwin += -framework OpenGL
    VBoxDD_DEFS.darwin    += VBOX_VMSVGA3D_DUAL_OPENGL_PROFILE