Skip to content

W
wine-winehq
Commit 8dedf244 authored by Andrey Gusev's avatar Andrey Gusev Committed by Alexandre Julliard
Browse files
Options

d3dx11: Add D3DX11CreateTextureFromFileA/W stub.

Signed-off-by: 's avatarAndrey Gusev <andrey.goosev@gmail.com> Signed-off-by: 's avatarMatteo Bruni <mbruni@codeweavers.com> Signed-off-by: 's avatarAlexandre Julliard <julliard@winehq.org>
parent f762097f
Hide whitespace changes
Inline Side-by-side
Showing with 32 additions and 4 deletions
dlls/d3dx11_42/d3dx11_42.spec
View file @ 8dedf244
...@@ -20,8 +20,8 @@ ...@@ -20,8 +20,8 @@
@ stdcall D3DX11CreateShaderResourceViewFromMemory(ptr ptr long ptr ptr ptr ptr) d3dx11_43.D3DX11CreateShaderResourceViewFromMemory @ stdcall D3DX11CreateShaderResourceViewFromMemory(ptr ptr long ptr ptr ptr ptr) d3dx11_43.D3DX11CreateShaderResourceViewFromMemory
@ stub D3DX11CreateShaderResourceViewFromResourceA @ stub D3DX11CreateShaderResourceViewFromResourceA
@ stub D3DX11CreateShaderResourceViewFromResourceW @ stub D3DX11CreateShaderResourceViewFromResourceW
@ stub D3DX11CreateTextureFromFileA @ stdcall D3DX11CreateTextureFromFileA(ptr str ptr ptr ptr ptr) d3dx11_43.D3DX11CreateTextureFromFileA
@ stub D3DX11CreateTextureFromFileW @ stdcall D3DX11CreateTextureFromFileW(ptr wstr ptr ptr ptr ptr) d3dx11_43.D3DX11CreateTextureFromFileW
@ stdcall D3DX11CreateTextureFromMemory(ptr ptr long ptr ptr ptr ptr) @ stdcall D3DX11CreateTextureFromMemory(ptr ptr long ptr ptr ptr ptr)
@ stub D3DX11CreateTextureFromResourceA @ stub D3DX11CreateTextureFromResourceA
@ stub D3DX11CreateTextureFromResourceW @ stub D3DX11CreateTextureFromResourceW
......
dlls/d3dx11_43/d3dx11_43.spec
View file @ 8dedf244
...@@ -20,8 +20,8 @@ ...@@ -20,8 +20,8 @@
@ stub D3DX11CreateShaderResourceViewFromMemory(ptr ptr long ptr ptr ptr ptr) @ stub D3DX11CreateShaderResourceViewFromMemory(ptr ptr long ptr ptr ptr ptr)
@ stub D3DX11CreateShaderResourceViewFromResourceA @ stub D3DX11CreateShaderResourceViewFromResourceA
@ stub D3DX11CreateShaderResourceViewFromResourceW @ stub D3DX11CreateShaderResourceViewFromResourceW
@ stub D3DX11CreateTextureFromFileA @ stdcall D3DX11CreateTextureFromFileA(ptr str ptr ptr ptr ptr)
@ stub D3DX11CreateTextureFromFileW @ stdcall D3DX11CreateTextureFromFileW(ptr wstr ptr ptr ptr ptr)
@ stdcall D3DX11CreateTextureFromMemory(ptr ptr long ptr ptr ptr ptr) @ stdcall D3DX11CreateTextureFromMemory(ptr ptr long ptr ptr ptr ptr)
@ stub D3DX11CreateTextureFromResourceA @ stub D3DX11CreateTextureFromResourceA
@ stub D3DX11CreateTextureFromResourceW @ stub D3DX11CreateTextureFromResourceW
......
dlls/d3dx11_43/texture.c
View file @ 8dedf244
...@@ -35,6 +35,26 @@ HRESULT WINAPI D3DX11CreateShaderResourceViewFromMemory(ID3D11Device *device, co ...@@ -35,6 +35,26 @@ HRESULT WINAPI D3DX11CreateShaderResourceViewFromMemory(ID3D11Device *device, co
return E_NOTIMPL; 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, HRESULT WINAPI D3DX11CreateTextureFromMemory(ID3D11Device *device, const void *data,
SIZE_T data_size, D3DX11_IMAGE_LOAD_INFO *load_info, ID3DX11ThreadPump *pump, SIZE_T data_size, D3DX11_IMAGE_LOAD_INFO *load_info, ID3DX11ThreadPump *pump,
ID3D11Resource **texture, HRESULT *hresult) ID3D11Resource **texture, HRESULT *hresult)
......
include/d3dx11tex.h
View file @ 8dedf244
...@@ -111,6 +111,14 @@ HRESULT WINAPI D3DX11CreateShaderResourceViewFromMemory(ID3D11Device *device, co ...@@ -111,6 +111,14 @@ HRESULT WINAPI D3DX11CreateShaderResourceViewFromMemory(ID3D11Device *device, co
SIZE_T data_size, D3DX11_IMAGE_LOAD_INFO *load_info, ID3DX11ThreadPump *pump, SIZE_T data_size, D3DX11_IMAGE_LOAD_INFO *load_info, ID3DX11ThreadPump *pump,
ID3D11ShaderResourceView **view, HRESULT *hresult); 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, 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); D3DX11_IMAGE_LOAD_INFO *loadinfo, ID3DX11ThreadPump *pump, ID3D11Resource **texture, HRESULT *hresult);
......
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