marko10_000
/
wine-wine
forked from Mirrors/wine-wine
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

d3dx11: Add D3DX11CreateTextureFromFileA/W stub. 

Signed-off-by: Andrey Gusev <andrey.goosev@gmail.com>
Signed-off-by: Matteo Bruni <mbruni@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
oldstable
Andrey Gusev 2018-03-24 16:40:22 +02:00 committed by Alexandre Julliard
parent f762097f50
commit 8dedf244f6
4 changed files with 32 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
dlls/d3dx11_42/d3dx11_42.spec
View File

@ -20,8 +20,8 @@
@ stdcall D3DX11CreateShaderResourceViewFromMemory(ptr ptr long ptr ptr ptr ptr) d3dx11_43.D3DX11CreateShaderResourceViewFromMemory
@ stub D3DX11CreateShaderResourceViewFromResourceA
@ stub D3DX11CreateShaderResourceViewFromResourceW
@ stub D3DX11CreateTextureFromFileA
@ stub D3DX11CreateTextureFromFileW
@ stdcall D3DX11CreateTextureFromFileA(ptr str ptr ptr ptr ptr) d3dx11_43.D3DX11CreateTextureFromFileA
@ stdcall D3DX11CreateTextureFromFileW(ptr wstr ptr ptr ptr ptr) d3dx11_43.D3DX11CreateTextureFromFileW
@ stdcall D3DX11CreateTextureFromMemory(ptr ptr long ptr ptr ptr ptr)
@ stub D3DX11CreateTextureFromResourceA
@ stub D3DX11CreateTextureFromResourceW

4
dlls/d3dx11_43/d3dx11_43.spec
View File

@ -20,8 +20,8 @@
@ stub D3DX11CreateShaderResourceViewFromMemory(ptr ptr long ptr ptr ptr ptr)
@ stub D3DX11CreateShaderResourceViewFromResourceA
@ stub D3DX11CreateShaderResourceViewFromResourceW
@ stub D3DX11CreateTextureFromFileA
@ stub D3DX11CreateTextureFromFileW
@ stdcall D3DX11CreateTextureFromFileA(ptr str ptr ptr ptr ptr)
@ stdcall D3DX11CreateTextureFromFileW(ptr wstr ptr ptr ptr ptr)
@ stdcall D3DX11CreateTextureFromMemory(ptr ptr long ptr ptr ptr ptr)
@ stub D3DX11CreateTextureFromResourceA
@ stub D3DX11CreateTextureFromResourceW

20
dlls/d3dx11_43/texture.c
View File

@ -35,6 +35,26 @@ HRESULT WINAPI D3DX11CreateShaderResourceViewFromMemory(ID3D11Device *device, co
return E_NOTIMPL;
}
HRESULT WINAPI D3DX11CreateTextureFromFileA(ID3D11Device *device, const char *filename,
D3DX11_IMAGE_LOAD_INFO *load_info, ID3DX11ThreadPump *pump, ID3D11Resource **texture,
HRESULT *hresult)
{
FIXME("device %p, filename %s, load_info %p, pump %p, texture %p, hresult %p stub.\n",
device, debugstr_a(filename), load_info, pump, texture, hresult);
return E_NOTIMPL;
}
HRESULT WINAPI D3DX11CreateTextureFromFileW(ID3D11Device *device, const WCHAR *filename,
D3DX11_IMAGE_LOAD_INFO *load_info, ID3DX11ThreadPump *pump, ID3D11Resource **texture,
HRESULT *hresult)
{
FIXME("device %p, filename %s, load_info %p, pump %p, texture %p, hresult %p stub.\n",
device, debugstr_w(filename), load_info, pump, texture, hresult);
return E_NOTIMPL;
}
HRESULT WINAPI D3DX11CreateTextureFromMemory(ID3D11Device *device, const void *data,
SIZE_T data_size, D3DX11_IMAGE_LOAD_INFO *load_info, ID3DX11ThreadPump *pump,
ID3D11Resource **texture, HRESULT *hresult)

8
include/d3dx11tex.h
View File

@ -111,6 +111,14 @@ HRESULT WINAPI D3DX11CreateShaderResourceViewFromMemory(ID3D11Device *device, co
SIZE_T data_size, D3DX11_IMAGE_LOAD_INFO *load_info, ID3DX11ThreadPump *pump,
ID3D11ShaderResourceView **view, HRESULT *hresult);
HRESULT WINAPI D3DX11CreateTextureFromFileA(ID3D11Device *device, const char *filename,
D3DX11_IMAGE_LOAD_INFO *load_info, ID3DX11ThreadPump *pump, ID3D11Resource **texture,
HRESULT *hresult);
HRESULT WINAPI D3DX11CreateTextureFromFileW(ID3D11Device *device, const WCHAR *filename,
D3DX11_IMAGE_LOAD_INFO *load_info, ID3DX11ThreadPump *pump, ID3D11Resource **texture,
HRESULT *hresult);
HRESULT WINAPI D3DX11CreateTextureFromMemory(ID3D11Device *device, const void *src_data, SIZE_T src_data_size,
D3DX11_IMAGE_LOAD_INFO *loadinfo, ID3DX11ThreadPump *pump, ID3D11Resource **texture, HRESULT *hresult);