Commit 9b0e3de4 authored by Piotr Caban's avatar Piotr Caban Committed by Alexandre Julliard

d3dx10: Add support for ID3DX10ThreadPump parameter in D3DX10GetImageInfoFromFileW.

parent 0d6b9b83
...@@ -332,17 +332,34 @@ HRESULT WINAPI D3DX10GetImageInfoFromFileW(const WCHAR *src_file, ID3DX10ThreadP ...@@ -332,17 +332,34 @@ HRESULT WINAPI D3DX10GetImageInfoFromFileW(const WCHAR *src_file, ID3DX10ThreadP
if (!src_file) if (!src_file)
return E_FAIL; return E_FAIL;
if (FAILED((hr = load_file(src_file, &buffer, &size)))) if (pump)
{ {
if (result) ID3DX10DataProcessor *processor;
*result = hr; ID3DX10DataLoader *loader;
if (FAILED((hr = D3DX10CreateAsyncFileLoaderW(src_file, &loader))))
return hr;
if (FAILED((hr = D3DX10CreateAsyncTextureInfoProcessor(info, &processor))))
{
ID3DX10DataLoader_Destroy(loader);
return hr;
}
hr = ID3DX10ThreadPump_AddWorkItem(pump, loader, processor, result, NULL);
if (FAILED(hr))
{
ID3DX10DataLoader_Destroy(loader);
ID3DX10DataProcessor_Destroy(processor);
}
return hr; return hr;
} }
hr = D3DX10GetImageInfoFromMemory(buffer, size, pump, info, result); if (SUCCEEDED((hr = load_file(src_file, &buffer, &size))))
{
free(buffer); hr = get_image_info(buffer, size, info);
free(buffer);
}
if (result)
*result = hr;
return hr; return hr;
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment