Module: wine Branch: master Commit: 7e8bd13188568070f3ca04ac547b5687cd24c322 URL: https://gitlab.winehq.org/wine/wine/-/commit/7e8bd13188568070f3ca04ac547b568...
Author: Ziqing Hui zhui@codeweavers.com Date: Fri Aug 19 11:31:47 2022 +0800
d3dx10: Introduce create_effect().
---
dlls/d3dx10_43/compiler.c | 63 ++++++++++++++++++++++++++----------------- dlls/d3dx10_43/tests/d3dx10.c | 4 +-- 2 files changed, 40 insertions(+), 27 deletions(-)
diff --git a/dlls/d3dx10_43/compiler.c b/dlls/d3dx10_43/compiler.c index ad27783eabb..34d46ea0d2d 100644 --- a/dlls/d3dx10_43/compiler.c +++ b/dlls/d3dx10_43/compiler.c @@ -28,25 +28,19 @@
WINE_DEFAULT_DEBUG_CHANNEL(d3dx);
- -HRESULT WINAPI D3DX10CreateEffectFromMemory(const void *data, SIZE_T datasize, const char *filename, +static HRESULT create_effect(const void *data, SIZE_T datasize, const char *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) + ID3D10Effect **effect, ID3D10Blob **errors) { ID3D10Blob *code; HRESULT hr;
- TRACE("data %p, datasize %Iu, 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", - data, datasize, debugstr_a(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 (!data || !device) + return E_FAIL;
- if (!include) - include = D3D_COMPILE_STANDARD_FILE_INCLUDE; + if (errors) + *errors = NULL;
if (FAILED(hr = D3DCompile(data, datasize, filename, defines, include, "main", profile, shader_flags, effect_flags, &code, errors))) @@ -62,12 +56,34 @@ HRESULT WINAPI D3DX10CreateEffectFromMemory(const void *data, SIZE_T datasize, c return hr; }
+HRESULT WINAPI D3DX10CreateEffectFromMemory(const void *data, SIZE_T datasize, const char *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) +{ + TRACE("data %p, datasize %Iu, 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", + data, datasize, debugstr_a(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; + + return create_effect(data, datasize, filename, defines, include, profile, + shader_flags, effect_flags, device, effect_pool, effect, errors); +} + 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; + char filename_a[MAX_PATH]; + void *buffer = NULL; + DWORD size = 0; HRESULT hr;
TRACE("filename %s, defines %p, include %p, profile %s, shader_flags %#x, effect_flags %#x, " @@ -81,17 +97,14 @@ HRESULT WINAPI D3DX10CreateEffectFromFileW(const WCHAR *filename, const D3D10_SH if (!include) include = D3D_COMPILE_STANDARD_FILE_INCLUDE;
- if (FAILED(hr = D3DCompileFromFile(filename, defines, include, "main", profile, shader_flags, - effect_flags, &code, errors))) + if (SUCCEEDED((hr = load_file(filename, &buffer, &size)))) { - WARN("Effect compilation failed, hr %#lx.\n", hr); - return hr; + WideCharToMultiByte(CP_ACP, 0, filename, -1, filename_a, sizeof(filename_a), NULL, NULL); + hr = create_effect(buffer, size, filename_a, defines, include, profile, + shader_flags, effect_flags, device, effect_pool, effect, errors); + free(buffer); }
- hr = D3D10CreateEffectFromMemory(ID3D10Blob_GetBufferPointer(code), ID3D10Blob_GetBufferSize(code), - effect_flags, device, effect_pool, effect); - ID3D10Blob_Release(code); - return hr; }
@@ -144,8 +157,8 @@ HRESULT WINAPI D3DX10CreateEffectFromResourceA(HMODULE module, const char *resou if (FAILED(hr)) return hr;
- return D3DX10CreateEffectFromMemory(data, size, filename, defines, include, profile, - shader_flags, effect_flags, device, effect_pool, pump, effect, errors, hresult); + return create_effect(data, size, filename, defines, include, profile, + shader_flags, effect_flags, device, effect_pool, effect, errors); }
HRESULT WINAPI D3DX10CreateEffectFromResourceW(HMODULE module, const WCHAR *resource_name, @@ -178,8 +191,8 @@ HRESULT WINAPI D3DX10CreateEffectFromResourceW(HMODULE module, const WCHAR *reso WideCharToMultiByte(CP_ACP, 0, filenameW, -1, filename, len, NULL, NULL); }
- hr = D3DX10CreateEffectFromMemory(data, size, filename, defines, include, profile, - shader_flags, effect_flags, device, effect_pool, pump, effect, errors, hresult); + hr = create_effect(data, size, filename, defines, include, profile, + shader_flags, effect_flags, device, effect_pool, effect, errors); free(filename); return hr; } diff --git a/dlls/d3dx10_43/tests/d3dx10.c b/dlls/d3dx10_43/tests/d3dx10.c index e178fb65e9d..ecea9a5420e 100644 --- a/dlls/d3dx10_43/tests/d3dx10.c +++ b/dlls/d3dx10_43/tests/d3dx10.c @@ -4073,7 +4073,7 @@ static void test_create_effect_from_file(void) effect = (ID3D10Effect *)0xdeadbeef; hr = D3DX10CreateEffectFromFileW(L"deadbeef", NULL, NULL, NULL, 0x0, 0x0, device, NULL, NULL, &effect, &errors, NULL); - todo_wine ok(hr == D3D10_ERROR_FILE_NOT_FOUND, "Got unexpected hr %#lx.\n", hr); + ok(hr == D3D10_ERROR_FILE_NOT_FOUND, "Got unexpected hr %#lx.\n", hr); todo_wine ok(!errors, "Got unexpected errors %p.\n", errors); ok(effect == (ID3D10Effect *)0xdeadbeef, "Got unexpected effect %p.\n", effect);
@@ -4081,7 +4081,7 @@ static void test_create_effect_from_file(void) effect = (ID3D10Effect *)0xdeadbeef; hr = D3DX10CreateEffectFromFileA("deadbeef", NULL, NULL, NULL, 0x0, 0x0, device, NULL, NULL, &effect, &errors, NULL); - todo_wine ok(hr == D3D10_ERROR_FILE_NOT_FOUND, "Got unexpected hr %#lx.\n", hr); + ok(hr == D3D10_ERROR_FILE_NOT_FOUND, "Got unexpected hr %#lx.\n", hr); todo_wine ok(!errors, "Got unexpected errors %p.\n", errors); ok(effect == (ID3D10Effect *)0xdeadbeef, "Got unexpected effect %p.\n", effect);