Valentin Gabriel Mitrea : d3d10: Implement D3D10CompileEffectFromMemory().
Alexandre Julliard
julliard at winehq.org
Mon Apr 23 17:58:36 CDT 2018
Module: wine
Branch: master
Commit: 9dd88e31efd753ff0c6f0c5ac077773464519cc9
URL: https://source.winehq.org/git/wine.git/?a=commit;h=9dd88e31efd753ff0c6f0c5ac077773464519cc9
Author: Valentin Gabriel Mitrea <mitrea.valentin at gmail.com>
Date: Sun Apr 22 23:27:20 2018 +0300
d3d10: Implement D3D10CompileEffectFromMemory().
Signed-off-by: Valentin Gabriel Mitrea <mitrea.valentin at gmail.com>
Signed-off-by: Matteo Bruni <mbruni at codeweavers.com>
Signed-off-by: Henri Verbeet <hverbeet at codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard at winehq.org>
---
dlls/d3d10/d3d10_main.c | 12 ++++--------
1 file changed, 4 insertions(+), 8 deletions(-)
diff --git a/dlls/d3d10/d3d10_main.c b/dlls/d3d10/d3d10_main.c
index f2fbb41..7c8bee7 100644
--- a/dlls/d3d10/d3d10_main.c
+++ b/dlls/d3d10/d3d10_main.c
@@ -253,17 +253,13 @@ HRESULT WINAPI D3D10CompileEffectFromMemory(void *data, SIZE_T data_size, const
const D3D10_SHADER_MACRO *defines, ID3D10Include *include, UINT hlsl_flags, UINT fx_flags,
ID3D10Blob **effect, ID3D10Blob **errors)
{
- FIXME("data %p, data_size %lu, filename %s, defines %p, include %p,"
- " hlsl_flags %#x, fx_flags %#x, effect %p, errors %p stub!\n",
+ TRACE("data %p, data_size %lu, filename %s, defines %p, include %p, "
+ "hlsl_flags %#x, fx_flags %#x, effect %p, errors %p.\n",
data, data_size, wine_dbgstr_a(filename), defines, include,
hlsl_flags, fx_flags, effect, errors);
- if (effect)
- *effect = NULL;
- if (errors)
- *errors = NULL;
-
- return E_NOTIMPL;
+ return D3DCompile(data, data_size, filename, defines, include,
+ NULL, "fx_4_0", hlsl_flags, fx_flags, effect, errors);
}
HRESULT WINAPI D3D10CreateEffectPoolFromMemory(void *data, SIZE_T data_size, UINT fx_flags,
More information about the wine-cvs
mailing list