Andrey Gusev : d3dx11: Add D3DX11FilterTexture stub.
Alexandre Julliard
julliard at winehq.org
Thu Jul 20 12:11:29 CDT 2017
Module: wine
Branch: stable
Commit: d79933bfab5ffb8aca85dd2426ef8b0b6bb91d64
URL: http://source.winehq.org/git/wine.git/?a=commit;h=d79933bfab5ffb8aca85dd2426ef8b0b6bb91d64
Author: Andrey Gusev <andrey.goosev at gmail.com>
Date: Sun Apr 9 21:17:15 2017 +0300
d3dx11: Add D3DX11FilterTexture stub.
Signed-off-by: Andrey Gusev <andrey.goosev at gmail.com>
Signed-off-by: Matteo Bruni <mbruni at codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard at winehq.org>
(cherry picked from commit 0e2bbb210a5973341adc9c88943da6ecebb9d9bc)
Signed-off-by: Michael Stefaniuc <mstefani at winehq.org>
---
dlls/d3dx11_42/d3dx11_42.spec | 2 +-
dlls/d3dx11_43/d3dx11_43.c | 7 +++++++
dlls/d3dx11_43/d3dx11_43.spec | 2 +-
include/d3dx11tex.h | 23 +++++++++++++++++++++++
4 files changed, 32 insertions(+), 2 deletions(-)
diff --git a/dlls/d3dx11_42/d3dx11_42.spec b/dlls/d3dx11_42/d3dx11_42.spec
index 815c162..12d4429 100644
--- a/dlls/d3dx11_42/d3dx11_42.spec
+++ b/dlls/d3dx11_42/d3dx11_42.spec
@@ -26,7 +26,7 @@
@ stub D3DX11CreateTextureFromResourceA
@ stub D3DX11CreateTextureFromResourceW
@ stub D3DX11CreateThreadPump
-@ stub D3DX11FilterTexture
+@ stdcall D3DX11FilterTexture(ptr ptr long long) d3dx11_43.D3DX11FilterTexture
@ stub D3DX11GetImageInfoFromFileA
@ stub D3DX11GetImageInfoFromFileW
@ stdcall D3DX11GetImageInfoFromMemory(ptr long ptr ptr ptr) d3dx11_43.D3DX11GetImageInfoFromMemory
diff --git a/dlls/d3dx11_43/d3dx11_43.c b/dlls/d3dx11_43/d3dx11_43.c
index 201f3fb..4bf4998 100644
--- a/dlls/d3dx11_43/d3dx11_43.c
+++ b/dlls/d3dx11_43/d3dx11_43.c
@@ -61,6 +61,13 @@ BOOL WINAPI D3DX11CheckVersion(UINT d3dsdkversion, UINT d3dxsdkversion)
return FALSE;
}
+HRESULT WINAPI D3DX11FilterTexture(ID3D11DeviceContext *context, ID3D11Resource *texture, UINT src_level, UINT filter)
+{
+ FIXME("context %p, texture %p, src_level %u, filter %#x stub!\n", context, texture, src_level, filter);
+
+ return E_NOTIMPL;
+}
+
HRESULT WINAPI D3DX11GetImageInfoFromMemory(const void *src_data, SIZE_T src_data_size, ID3DX11ThreadPump *pump,
D3DX11_IMAGE_INFO *img_info, HRESULT *hresult)
{
diff --git a/dlls/d3dx11_43/d3dx11_43.spec b/dlls/d3dx11_43/d3dx11_43.spec
index 452e513..a4e85af 100644
--- a/dlls/d3dx11_43/d3dx11_43.spec
+++ b/dlls/d3dx11_43/d3dx11_43.spec
@@ -26,7 +26,7 @@
@ stub D3DX11CreateTextureFromResourceA
@ stub D3DX11CreateTextureFromResourceW
@ stub D3DX11CreateThreadPump
-@ stub D3DX11FilterTexture
+@ stdcall D3DX11FilterTexture(ptr ptr long long)
@ stub D3DX11GetImageInfoFromFileA
@ stub D3DX11GetImageInfoFromFileW
@ stdcall D3DX11GetImageInfoFromMemory(ptr long ptr ptr ptr)
diff --git a/include/d3dx11tex.h b/include/d3dx11tex.h
index 16b280a..584a3bd 100644
--- a/include/d3dx11tex.h
+++ b/include/d3dx11tex.h
@@ -21,6 +21,27 @@
#ifndef __D3DX11TEX_H__
#define __D3DX11TEX_H__
+typedef enum D3DX11_FILTER_FLAG
+{
+ D3DX11_FILTER_NONE = 0x00000001,
+ D3DX11_FILTER_POINT = 0x00000002,
+ D3DX11_FILTER_LINEAR = 0x00000003,
+ D3DX11_FILTER_TRIANGLE = 0x00000004,
+ D3DX11_FILTER_BOX = 0x00000005,
+
+ D3DX11_FILTER_MIRROR_U = 0x00010000,
+ D3DX11_FILTER_MIRROR_V = 0x00020000,
+ D3DX11_FILTER_MIRROR_W = 0x00040000,
+ D3DX11_FILTER_MIRROR = 0x00070000,
+
+ D3DX11_FILTER_DITHER = 0x00080000,
+ D3DX11_FILTER_DITHER_DIFFUSION = 0x00100000,
+
+ D3DX11_FILTER_SRGB_IN = 0x00200000,
+ D3DX11_FILTER_SRGB_OUT = 0x00400000,
+ D3DX11_FILTER_SRGB = 0x00600000,
+} D3DX11_FILTER_FLAG;
+
typedef enum D3DX11_IMAGE_FILE_FORMAT
{
D3DX11_IFF_BMP = 0,
@@ -93,6 +114,8 @@ HRESULT WINAPI D3DX11CreateShaderResourceViewFromMemory(ID3D11Device *device, co
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);
+HRESULT WINAPI D3DX11FilterTexture(ID3D11DeviceContext *context, ID3D11Resource *texture, UINT src_level, UINT filter);
+
HRESULT WINAPI D3DX11GetImageInfoFromMemory(const void *src_data, SIZE_T src_data_size, ID3DX11ThreadPump *pump,
D3DX11_IMAGE_INFO *img_info, HRESULT *hresult);
More information about the wine-cvs
mailing list