[PATCH 0/2] MR3468: D3DX11 load texture from texture

[PATCH 1/2] include: Added D3DX11_TEXTURE_LOAD_INFO struct

[Alistair Leslie-Hughes]

From: Alistair Leslie-Hughes

---
 include/d3dx11tex.h | 30 ++++++++++++++++++++++++++++++
 1 file changed, 30 insertions(+)

diff --git a/include/d3dx11tex.h b/include/d3dx11tex.h
index c8a47925c80..76c49ae1cbb 100644
--- a/include/d3dx11tex.h
+++ b/include/d3dx11tex.h
@@ -103,6 +103,36 @@ typedef struct D3DX11_IMAGE_LOAD_INFO
 #endif
 } D3DX11_IMAGE_LOAD_INFO;

+typedef struct _D3DX11_TEXTURE_LOAD_INFO
+{
+    D3D11_BOX *pSrcBox;
+    D3D11_BOX *pDstBox;
+    UINT      SrcFirstMip;
+    UINT      DstFirstMip;
+    UINT      NumMips;
+    UINT      SrcFirstElement;
+    UINT      DstFirstElement;
+    UINT      NumElements;
+    UINT      Filter;
+    UINT      MipFilter;
+
+#ifdef __cplusplus
+    _D3DX11_TEXTURE_LOAD_INFO()
+    {
+        pSrcBox         = NULL;
+        pDstBox         = NULL;
+        SrcFirstMip     = 0;
+        DstFirstMip     = 0;
+        NumMips         = D3DX11_DEFAULT;
+        SrcFirstElement = 0;
+        DstFirstElement = 0;
+        NumElements     = D3DX11_DEFAULT;
+        Filter          = D3DX11_DEFAULT;
+        MipFilter       = D3DX11_DEFAULT;
+    }
+#endif
+} D3DX11_TEXTURE_LOAD_INFO;
+
 #ifdef __cplusplus
 extern "C" {
 #endif

[PATCH 2/2] d3dx11_4[23]: Add D3DX11LoadTextureFromTexture stub

[Alistair Leslie-Hughes]

From: Alistair Leslie-Hughes

---
 dlls/d3dx11_42/d3dx11_42.spec | 2 +-
 dlls/d3dx11_43/d3dx11_43.spec | 2 +-
 dlls/d3dx11_43/texture.c      | 9 +++++++++
 include/d3dx11tex.h           | 2 ++
 4 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/dlls/d3dx11_42/d3dx11_42.spec b/dlls/d3dx11_42/d3dx11_42.spec
index 99a38557b83..2d93b8d760a 100644
--- a/dlls/d3dx11_42/d3dx11_42.spec
+++ b/dlls/d3dx11_42/d3dx11_42.spec
@@ -32,7 +32,7 @@
 @ stdcall D3DX11GetImageInfoFromMemory(ptr long ptr ptr ptr)
 @ stub D3DX11GetImageInfoFromResourceA
 @ stub D3DX11GetImageInfoFromResourceW
-@ stub D3DX11LoadTextureFromTexture
+@ stdcall D3DX11LoadTextureFromTexture(ptr ptr ptr ptr)
 @ stub D3DX11PreprocessShaderFromFileA
 @ stub D3DX11PreprocessShaderFromFileW
 @ stub D3DX11PreprocessShaderFromMemory
diff --git a/dlls/d3dx11_43/d3dx11_43.spec b/dlls/d3dx11_43/d3dx11_43.spec
index 99a38557b83..2d93b8d760a 100644
--- a/dlls/d3dx11_43/d3dx11_43.spec
+++ b/dlls/d3dx11_43/d3dx11_43.spec
@@ -32,7 +32,7 @@
 @ stdcall D3DX11GetImageInfoFromMemory(ptr long ptr ptr ptr)
 @ stub D3DX11GetImageInfoFromResourceA
 @ stub D3DX11GetImageInfoFromResourceW
-@ stub D3DX11LoadTextureFromTexture
+@ stdcall D3DX11LoadTextureFromTexture(ptr ptr ptr ptr)
 @ stub D3DX11PreprocessShaderFromFileA
 @ stub D3DX11PreprocessShaderFromFileW
 @ stub D3DX11PreprocessShaderFromMemory
diff --git a/dlls/d3dx11_43/texture.c b/dlls/d3dx11_43/texture.c
index 81ac8ee6db7..11f8e58c87e 100644
--- a/dlls/d3dx11_43/texture.c
+++ b/dlls/d3dx11_43/texture.c
@@ -89,3 +89,12 @@ HRESULT WINAPI D3DX11SaveTextureToMemory(ID3D11DeviceContext *context, ID3D11Res

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;
+}
diff --git a/include/d3dx11tex.h b/include/d3dx11tex.h
index 76c49ae1cbb..cf605ec3b66 100644
--- a/include/d3dx11tex.h
+++ b/include/d3dx11tex.h
@@ -155,6 +155,8 @@ HRESULT WINAPI D3DX11GetImageInfoFromFileW(const WCHAR *filename, ID3DX11ThreadP
         HRESULT *hresult);
 HRESULT WINAPI D3DX11GetImageInfoFromMemory(const void *src_data, SIZE_T src_data_size, ID3DX11ThreadPump *pump,
         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,
         D3DX11_IMAGE_FILE_FORMAT format, const char *filename);
 HRESULT WINAPI D3DX11SaveTextureToFileW(ID3D11DeviceContext *context, ID3D11Resource *texture,

[Matteo Bruni (＠Mystral)]

Matteo Bruni (@Mystral) commented about include/d3dx11tex.h:
> #endif
>  } D3DX11_IMAGE_LOAD_INFO;
>
> +typedef struct _D3DX11_TEXTURE_LOAD_INFO
> +{
> - D3D11_BOX *pSrcBox;
> - D3D11_BOX *pDstBox;
> - UINT      SrcFirstMip;
> - UINT      DstFirstMip;
> - UINT      NumMips;
> - UINT      SrcFirstElement;
> - UINT      DstFirstElement;
> - UINT      NumElements;
> - UINT      Filter;
> - UINT      MipFilter;

It's maybe overkill but, could you get rid of the field name alignment? Just to make it more different from the SDK version.

[Matteo Bruni (＠Mystral)]

Another nitpick, can you just use "d3dx11:" as prefix in the subject of the second patch?