Author: akhaldi Date: Mon Feb 23 19:01:22 2015 New Revision: 66432
URL: http://svn.reactos.org/svn/reactos?rev=66432&view=rev Log: [D3DX9_30] Sync with Wine Staging 1.7.37. CORE-9246
Modified: trunk/reactos/dll/directx/wine/d3dx9_30/d3dx9_30.spec trunk/reactos/dll/directx/wine/d3dx9_30/d3dx9_30_main.c
Modified: trunk/reactos/dll/directx/wine/d3dx9_30/d3dx9_30.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3dx9_30/d... ============================================================================== --- trunk/reactos/dll/directx/wine/d3dx9_30/d3dx9_30.spec [iso-8859-1] (original) +++ trunk/reactos/dll/directx/wine/d3dx9_30/d3dx9_30.spec [iso-8859-1] Mon Feb 23 19:01:22 2015 @@ -30,7 +30,7 @@ @ stdcall D3DXConcatenateMeshes(ptr long long ptr ptr ptr ptr ptr) d3dx9_36.D3DXConcatenateMeshes @ stdcall D3DXConvertMeshSubsetToSingleStrip(ptr long long ptr ptr) d3dx9_36.D3DXConvertMeshSubsetToSingleStrip @ stdcall D3DXConvertMeshSubsetToStrips(ptr long long ptr ptr ptr ptr) d3dx9_36.D3DXConvertMeshSubsetToStrips -@ stdcall -stub D3DXCpuOptimizations(long) +@ stdcall D3DXCpuOptimizations(long) @ stdcall D3DXCreateAnimationController(long long long long ptr) d3dx9_36.D3DXCreateAnimationController @ stdcall D3DXCreateBox(ptr float float float ptr ptr) d3dx9_36.D3DXCreateBox @ stdcall D3DXCreateBuffer(long ptr) d3dx9_36.D3DXCreateBuffer
Modified: trunk/reactos/dll/directx/wine/d3dx9_30/d3dx9_30_main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3dx9_30/d... ============================================================================== --- trunk/reactos/dll/directx/wine/d3dx9_30/d3dx9_30_main.c [iso-8859-1] (original) +++ trunk/reactos/dll/directx/wine/d3dx9_30/d3dx9_30_main.c [iso-8859-1] Mon Feb 23 19:01:22 2015 @@ -35,6 +35,10 @@
#include <d3dx9.h>
+#include <wine/debug.h> + +WINE_DEFAULT_DEBUG_CHANNEL(d3dx); + /*********************************************************************** * DllMain. */ @@ -62,3 +66,17 @@ else return FALSE; } + +typedef enum _D3DX_CPU_OPTIMIZATION +{ + D3DX_NOT_OPTIMIZED = 0, + D3DX_3DNOW_OPTIMIZED = 1, + D3DX_SSE2_OPTIMIZED = 2, + D3DX_SSE_OPTIMIZED = 3 +} D3DX_CPU_OPTIMIZATION; + +D3DX_CPU_OPTIMIZATION WINAPI D3DXCpuOptimizations(BOOL enable) +{ + FIXME("%i - stub\n", enable); + return D3DX_NOT_OPTIMIZED; +}