Commit 798395d3 authored by Piotr Caban's avatar Piotr Caban Committed by Alexandre Julliard

d3dx10: Add support for ID3DX10ThreadPump parameter in D3DX10CreateTextureFromResourceW.

parent 1b39e769
......@@ -715,11 +715,32 @@ HRESULT WINAPI D3DX10CreateTextureFromResourceW(ID3D10Device *device, HMODULE mo
if (!device)
return E_INVALIDARG;
hr = load_resourceW(module, resource, &buffer, &size);
if (FAILED(hr))
if (pump)
{
ID3DX10DataProcessor *processor;
ID3DX10DataLoader *loader;
if (FAILED((hr = D3DX10CreateAsyncResourceLoaderW(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_resourceW(module, resource, &buffer, &size))))
return hr;
hr = create_texture(device, buffer, size, load_info, texture);
if (hresult)
*hresult = hr;
return hr;
}
void init_load_info(const D3DX10_IMAGE_LOAD_INFO *load_info, D3DX10_IMAGE_LOAD_INFO *out)
......
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