From 558bb053a29d5a49228d64a1cb00678971cb4d67 Mon Sep 17 00:00:00 2001 From: Amine Khaldi Date: Mon, 23 Feb 2015 19:01:22 +0000 Subject: [PATCH] [D3DX9_30] Sync with Wine Staging 1.7.37. CORE-9246 svn path=/trunk/; revision=66432 --- .../dll/directx/wine/d3dx9_30/d3dx9_30.spec | 2 +- .../dll/directx/wine/d3dx9_30/d3dx9_30_main.c | 18 ++++++++++++++++++ 2 files changed, 19 insertions(+), 1 deletion(-) diff --git a/reactos/dll/directx/wine/d3dx9_30/d3dx9_30.spec b/reactos/dll/directx/wine/d3dx9_30/d3dx9_30.spec index 82d8592d973..54234b24149 100644 --- a/reactos/dll/directx/wine/d3dx9_30/d3dx9_30.spec +++ b/reactos/dll/directx/wine/d3dx9_30/d3dx9_30.spec @@ -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 diff --git a/reactos/dll/directx/wine/d3dx9_30/d3dx9_30_main.c b/reactos/dll/directx/wine/d3dx9_30/d3dx9_30_main.c index e81aac210fc..f33e7462591 100644 --- a/reactos/dll/directx/wine/d3dx9_30/d3dx9_30_main.c +++ b/reactos/dll/directx/wine/d3dx9_30/d3dx9_30_main.c @@ -35,6 +35,10 @@ #include +#include + +WINE_DEFAULT_DEBUG_CHANNEL(d3dx); + /*********************************************************************** * DllMain. */ @@ -62,3 +66,17 @@ BOOL WINAPI D3DXCheckVersion(UINT d3dsdkvers, UINT d3dxsdkvers) 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; +}