On Tue, Oct 29, 2019 at 3:16 AM Connor McAdams conmanx360@gmail.com wrote:
Add the function definition for D3DX10LoadTextureFromTexture to the header file, as well as the structure definition for D3DX10_TEXTURE_LOAD_INFO.
Signed-off-by: Connor McAdams conmanx360@gmail.com
include/d3dx10tex.h | 33 +++++++++++++++++++++++++++++++++ 1 file changed, 33 insertions(+)
diff --git a/include/d3dx10tex.h b/include/d3dx10tex.h index 25ad490949..282f245e8e 100644 --- a/include/d3dx10tex.h +++ b/include/d3dx10tex.h @@ -103,6 +103,36 @@ typedef struct D3DX10_IMAGE_LOAD_INFO #endif } D3DX10_IMAGE_LOAD_INFO;
+typedef struct _D3DX10_TEXTURE_LOAD_INFO +{
- D3D10_BOX *pSrcBox;
- D3D10_BOX *pDstBox;
- UINT SrcFirstMip;
- UINT DstFirstMip;
- UINT NumMips;
- UINT SrcFirstElement;
- UINT DstFirstElement;
- UINT NumElements;
- UINT Filter;
- UINT MipFilter;
+#ifdef __cplusplus
- _D3DX10_TEXTURE_LOAD_INFO()
- {
pSrcBox = NULL;
pDstBox = NULL;
SrcFirstMip = 0;
DstFirstMip = 0;
NumMips = D3DX10_DEFAULT;
SrcFirstElement = 0;
DstFirstElement = 0;
NumElements = D3DX10_DEFAULT;
Filter = D3DX10_DEFAULT;
MipFilter = D3DX10_DEFAULT;
- }
+#endif +} D3DX10_TEXTURE_LOAD_INFO;
This looks suspiciously similar to the MS header. Copy-pasting from the SDK headers is not allowed, you must retype the definitions yourself (and you should use our preferred style while at it, like getting rid of that extra spacing).