Piotr Caban : d3dx10: Add support for ID3DX10ThreadPump parameter in D3DX10CreateTextureFromResourceA.
Alexandre Julliard
julliard at winehq.org
Fri Jun 17 14:52:05 CDT 2022
Module: wine
Branch: master
Commit: 1b39e769b5132315797813b7b97bda595e28ce5a
URL: https://source.winehq.org/git/wine.git/?a=commit;h=1b39e769b5132315797813b7b97bda595e28ce5a
Author: Piotr Caban <piotr at codeweavers.com>
Date: Sat Jun 11 14:19:03 2022 +0200
d3dx10: Add support for ID3DX10ThreadPump parameter in D3DX10CreateTextureFromResourceA.
Signed-off-by: Piotr Caban <piotr at codeweavers.com>
---
dlls/d3dx10_43/texture.c | 27 ++++++++++++++++++++++++---
1 file changed, 24 insertions(+), 3 deletions(-)
diff --git a/dlls/d3dx10_43/texture.c b/dlls/d3dx10_43/texture.c
index 31775fd6863..7a4031727fa 100644
--- a/dlls/d3dx10_43/texture.c
+++ b/dlls/d3dx10_43/texture.c
@@ -674,11 +674,32 @@ HRESULT WINAPI D3DX10CreateTextureFromResourceA(ID3D10Device *device, HMODULE mo
if (!device)
return E_INVALIDARG;
- hr = load_resourceA(module, resource, &buffer, &size);
- if (FAILED(hr))
+ if (pump)
+ {
+ ID3DX10DataProcessor *processor;
+ ID3DX10DataLoader *loader;
+
+ if (FAILED((hr = D3DX10CreateAsyncResourceLoaderA(module, resource, &loader))))
+ return hr;
+ if (FAILED((hr = D3DX10CreateAsyncTextureProcessor(device, load_info, &processor))))
+ {
+ ID3DX10DataLoader_Destroy(loader);
+ return hr;
+ }
+ if (FAILED((hr = ID3DX10ThreadPump_AddWorkItem(pump, loader, processor, hresult, (void **)texture))))
+ {
+ ID3DX10DataLoader_Destroy(loader);
+ ID3DX10DataProcessor_Destroy(processor);
+ }
return hr;
+ }
- return D3DX10CreateTextureFromMemory(device, buffer, size, load_info, pump, texture, hresult);
+ if (FAILED((hr = load_resourceA(module, resource, &buffer, &size))))
+ return hr;
+ hr = create_texture(device, buffer, size, load_info, texture);
+ if (hresult)
+ *hresult = hr;
+ return hr;
}
HRESULT WINAPI D3DX10CreateTextureFromResourceW(ID3D10Device *device, HMODULE module, const WCHAR *resource,
More information about the wine-cvs
mailing list