Nikolay Sivov : d3dx10: Partially implement D3DX10CreateEffectFromFileW().
Alexandre Julliard
julliard at winehq.org
Tue Aug 10 16:24:09 CDT 2021
Module: wine
Branch: master
Commit: eb2946addfbb8f6d41c848aa8047b16d98199d54
URL: https://source.winehq.org/git/wine.git/?a=commit;h=eb2946addfbb8f6d41c848aa8047b16d98199d54
Author: Nikolay Sivov <nsivov at codeweavers.com>
Date: Tue Aug 10 15:56:43 2021 +0200
d3dx10: Partially implement D3DX10CreateEffectFromFileW().
Signed-off-by: Nikolay Sivov <nsivov at codeweavers.com>
Signed-off-by: Matteo Bruni <mbruni at codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard at winehq.org>
---
dlls/d3dx10_43/compiler.c | 33 +++++++++++++++++++++++++++++++++
dlls/d3dx10_43/d3dx10_43_main.c | 13 -------------
2 files changed, 33 insertions(+), 13 deletions(-)
diff --git a/dlls/d3dx10_43/compiler.c b/dlls/d3dx10_43/compiler.c
index 1ccb0e45a69..932bdadea1a 100644
--- a/dlls/d3dx10_43/compiler.c
+++ b/dlls/d3dx10_43/compiler.c
@@ -60,3 +60,36 @@ HRESULT WINAPI D3DX10CreateEffectFromMemory(const void *data, SIZE_T datasize, c
return hr;
}
+
+HRESULT WINAPI D3DX10CreateEffectFromFileW(const WCHAR *filename, const D3D10_SHADER_MACRO *defines,
+ ID3D10Include *include, const char *profile, UINT shader_flags, UINT effect_flags,
+ ID3D10Device *device, ID3D10EffectPool *effect_pool, ID3DX10ThreadPump *pump,
+ ID3D10Effect **effect, ID3D10Blob **errors, HRESULT *hresult)
+{
+ ID3D10Blob *code;
+ HRESULT hr;
+
+ TRACE("filename %s, defines %p, include %p, profile %s, shader_flags %#x, effect_flags %#x, "
+ "device %p, effect_pool %p, pump %p, effect %p, errors %p, hresult %p.\n",
+ debugstr_w(filename), defines, include, debugstr_a(profile), shader_flags, effect_flags,
+ device, effect_pool, pump, effect, errors, hresult);
+
+ if (pump)
+ FIXME("Asynchronous mode is not supported.\n");
+
+ if (!include)
+ include = D3D_COMPILE_STANDARD_FILE_INCLUDE;
+
+ if (FAILED(hr = D3DCompileFromFile(filename, defines, include, "main", profile, shader_flags,
+ effect_flags, &code, errors)))
+ {
+ WARN("Effect compilation failed, hr %#x.\n", hr);
+ return hr;
+ }
+
+ hr = D3D10CreateEffectFromMemory(ID3D10Blob_GetBufferPointer(code), ID3D10Blob_GetBufferSize(code),
+ effect_flags, device, effect_pool, effect);
+ ID3D10Blob_Release(code);
+
+ return hr;
+}
diff --git a/dlls/d3dx10_43/d3dx10_43_main.c b/dlls/d3dx10_43/d3dx10_43_main.c
index 2bbfac9c632..2c53924ac20 100644
--- a/dlls/d3dx10_43/d3dx10_43_main.c
+++ b/dlls/d3dx10_43/d3dx10_43_main.c
@@ -61,19 +61,6 @@ HRESULT WINAPI D3DX10CreateEffectFromFileA(const char *filename, const D3D10_SHA
return E_NOTIMPL;
}
-HRESULT WINAPI D3DX10CreateEffectFromFileW(const WCHAR *filename, const D3D10_SHADER_MACRO *defines,
- ID3D10Include *include, const char *profile, UINT hlslflags, UINT fxflags, ID3D10Device *device,
- ID3D10EffectPool *effectpool, ID3DX10ThreadPump *pump, ID3D10Effect **effect, ID3D10Blob **errors,
- HRESULT *hresult)
-{
- FIXME("filename %s, defines %p, include %p, profile %s, hlslflags %#x, fxflags %#x, "
- "device %p, effectpool %p, pump %p, effect %p, errors %p, hresult %p\n",
- debugstr_w(filename), defines, include, debugstr_a(profile), hlslflags, fxflags, device,
- effectpool, pump, effect, errors, hresult);
-
- return E_NOTIMPL;
-}
-
HRESULT WINAPI D3DX10CreateEffectPoolFromMemory(const void *data, SIZE_T datasize, const char *filename,
const D3D10_SHADER_MACRO *defines, ID3D10Include *include, const char *profile, UINT hlslflags,
UINT fxflags, ID3D10Device *device, ID3DX10ThreadPump *pump, ID3D10EffectPool **effectpool,
More information about the wine-cvs
mailing list