Commit 83b86d18 authored by Alistair Leslie-Hughes's avatar Alistair Leslie-Hughes Committed by Alexandre Julliard

d3dx11: Add D3DX11LoadTextureFromTexture stub.

parent 9f375360
...@@ -32,7 +32,7 @@ ...@@ -32,7 +32,7 @@
@ stdcall D3DX11GetImageInfoFromMemory(ptr long ptr ptr ptr) @ stdcall D3DX11GetImageInfoFromMemory(ptr long ptr ptr ptr)
@ stub D3DX11GetImageInfoFromResourceA @ stub D3DX11GetImageInfoFromResourceA
@ stub D3DX11GetImageInfoFromResourceW @ stub D3DX11GetImageInfoFromResourceW
@ stub D3DX11LoadTextureFromTexture @ stdcall D3DX11LoadTextureFromTexture(ptr ptr ptr ptr)
@ stub D3DX11PreprocessShaderFromFileA @ stub D3DX11PreprocessShaderFromFileA
@ stub D3DX11PreprocessShaderFromFileW @ stub D3DX11PreprocessShaderFromFileW
@ stub D3DX11PreprocessShaderFromMemory @ stub D3DX11PreprocessShaderFromMemory
......
...@@ -32,7 +32,7 @@ ...@@ -32,7 +32,7 @@
@ stdcall D3DX11GetImageInfoFromMemory(ptr long ptr ptr ptr) @ stdcall D3DX11GetImageInfoFromMemory(ptr long ptr ptr ptr)
@ stub D3DX11GetImageInfoFromResourceA @ stub D3DX11GetImageInfoFromResourceA
@ stub D3DX11GetImageInfoFromResourceW @ stub D3DX11GetImageInfoFromResourceW
@ stub D3DX11LoadTextureFromTexture @ stdcall D3DX11LoadTextureFromTexture(ptr ptr ptr ptr)
@ stub D3DX11PreprocessShaderFromFileA @ stub D3DX11PreprocessShaderFromFileA
@ stub D3DX11PreprocessShaderFromFileW @ stub D3DX11PreprocessShaderFromFileW
@ stub D3DX11PreprocessShaderFromMemory @ stub D3DX11PreprocessShaderFromMemory
......
...@@ -89,3 +89,12 @@ HRESULT WINAPI D3DX11SaveTextureToMemory(ID3D11DeviceContext *context, ID3D11Res ...@@ -89,3 +89,12 @@ HRESULT WINAPI D3DX11SaveTextureToMemory(ID3D11DeviceContext *context, ID3D11Res
return E_NOTIMPL; return E_NOTIMPL;
} }
HRESULT WINAPI D3DX11LoadTextureFromTexture(ID3D11DeviceContext *context, ID3D11Resource *src_texture,
D3DX11_TEXTURE_LOAD_INFO *info, ID3D11Resource *dst_texture)
{
FIXME("context %p, src_texture %p, info %p, dst_texture %p stub!\n",
context, src_texture, info, dst_texture);
return E_NOTIMPL;
}
...@@ -155,6 +155,8 @@ HRESULT WINAPI D3DX11GetImageInfoFromFileW(const WCHAR *filename, ID3DX11ThreadP ...@@ -155,6 +155,8 @@ HRESULT WINAPI D3DX11GetImageInfoFromFileW(const WCHAR *filename, ID3DX11ThreadP
HRESULT *hresult); HRESULT *hresult);
HRESULT WINAPI D3DX11GetImageInfoFromMemory(const void *src_data, SIZE_T src_data_size, ID3DX11ThreadPump *pump, HRESULT WINAPI D3DX11GetImageInfoFromMemory(const void *src_data, SIZE_T src_data_size, ID3DX11ThreadPump *pump,
D3DX11_IMAGE_INFO *img_info, HRESULT *hresult); D3DX11_IMAGE_INFO *img_info, HRESULT *hresult);
HRESULT WINAPI D3DX11LoadTextureFromTexture(ID3D11DeviceContext *context, ID3D11Resource *src_texture,
D3DX11_TEXTURE_LOAD_INFO *info, ID3D11Resource *dst_texture);
HRESULT WINAPI D3DX11SaveTextureToFileA(ID3D11DeviceContext *context, ID3D11Resource *texture, HRESULT WINAPI D3DX11SaveTextureToFileA(ID3D11DeviceContext *context, ID3D11Resource *texture,
D3DX11_IMAGE_FILE_FORMAT format, const char *filename); D3DX11_IMAGE_FILE_FORMAT format, const char *filename);
HRESULT WINAPI D3DX11SaveTextureToFileW(ID3D11DeviceContext *context, ID3D11Resource *texture, HRESULT WINAPI D3DX11SaveTextureToFileW(ID3D11DeviceContext *context, ID3D11Resource *texture,
......
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