Piotr Caban : d3dx10: Add support for ID3DX10ThreadPump parameter in D3DX10CreateTextureFromFileW.
Alexandre Julliard
julliard at winehq.org
Fri Jun 17 14:52:05 CDT 2022
Module: wine
Branch: master
Commit: 0c659a23c244e1e3f2568b5bf1ab8dc62fadb52e
URL: https://source.winehq.org/git/wine.git/?a=commit;h=0c659a23c244e1e3f2568b5bf1ab8dc62fadb52e
Author: Piotr Caban <piotr at codeweavers.com>
Date: Sat Jun 11 14:15:24 2022 +0200
d3dx10: Add support for ID3DX10ThreadPump parameter in D3DX10CreateTextureFromFileW.
Signed-off-by: Piotr Caban <piotr at codeweavers.com>
---
dlls/d3dx10_43/texture.c | 30 +++++++++++++++++++++++-------
1 file changed, 23 insertions(+), 7 deletions(-)
diff --git a/dlls/d3dx10_43/texture.c b/dlls/d3dx10_43/texture.c
index 7a43d8409da..31775fd6863 100644
--- a/dlls/d3dx10_43/texture.c
+++ b/dlls/d3dx10_43/texture.c
@@ -631,17 +631,33 @@ HRESULT WINAPI D3DX10CreateTextureFromFileW(ID3D10Device *device, const WCHAR *s
if (!src_file)
return E_FAIL;
- if (FAILED((hr = load_file(src_file, &buffer, &size))))
+ if (pump)
{
- if (hresult)
- *hresult = hr;
+ ID3DX10DataProcessor *processor;
+ ID3DX10DataLoader *loader;
+
+ if (FAILED((hr = D3DX10CreateAsyncFileLoaderW(src_file, &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;
}
- hr = D3DX10CreateTextureFromMemory(device, buffer, size, load_info, pump, texture, hresult);
-
- free(buffer);
-
+ if (SUCCEEDED((hr = load_file(src_file, &buffer, &size))))
+ {
+ hr = create_texture(device, buffer, size, load_info, texture);
+ free(buffer);
+ }
+ if (hresult)
+ *hresult = hr;
return hr;
}
More information about the wine-cvs
mailing list