mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-03-30 07:20:36 +00:00
Code Issues Packages Projects Releases Wiki Activity

(D3D8 headers) Start making this C89-compatible

Browse Source
This commit is contained in:
twinaphex 2018-02-03 15:29:56 +01:00
parent 0336c2f975
commit 5d2b7ce32f
5 changed files with 280 additions and 279 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
gfx/include/d3d8/d3dx8core.h
View File

@ -555,6 +555,6 @@ HRESULT WINAPI
#ifdef __cplusplus #ifdef __cplusplus
} }
#endif //__cplusplus #endif /* __cplusplus */
#endif //__D3DX8CORE_H__ #endif /* __D3DX8CORE_H__ */

89
gfx/include/d3d8/d3dx8effect.h
View File

@ -1,11 +1,10 @@
/////////////////////////////////////////////////////////////////////////// /*
// *
// Copyright (C) Microsoft Corporation. All Rights Reserved. * Copyright (C) Microsoft Corporation. All Rights Reserved.
// *
// File: d3dx8effect.h * File: d3dx8effect.h
// Content: D3DX effect types and functions * Content: D3DX effect types and functions
// */
///////////////////////////////////////////////////////////////////////////
#include "d3dx8.h" #include "d3dx8.h"
@ -67,14 +66,14 @@ typedef struct _D3DXPASS_DESC
////////////////////////////////////////////////////////////////////////////// /*
// ID3DXEffect /////////////////////////////////////////////////////////////// * ID3DXEffect
////////////////////////////////////////////////////////////////////////////// */
typedef interface ID3DXEffect ID3DXEffect; typedef interface ID3DXEffect ID3DXEffect;
typedef interface ID3DXEffect *LPD3DXEFFECT; typedef interface ID3DXEffect *LPD3DXEFFECT;
// {648B1CEB-8D4E-4d66-B6FA-E44969E82E89} /* {648B1CEB-8D4E-4d66-B6FA-E44969E82E89} */
DEFINE_GUID( IID_ID3DXEffect, DEFINE_GUID( IID_ID3DXEffect,
0x648b1ceb, 0x8d4e, 0x4d66, 0xb6, 0xfa, 0xe4, 0x49, 0x69, 0xe8, 0x2e, 0x89); 0x648b1ceb, 0x8d4e, 0x4d66, 0xb6, 0xfa, 0xe4, 0x49, 0x69, 0xe8, 0x2e, 0x89);
@ -84,12 +83,12 @@ DEFINE_GUID( IID_ID3DXEffect,
DECLARE_INTERFACE_(ID3DXEffect, IUnknown) DECLARE_INTERFACE_(ID3DXEffect, IUnknown)
{ {
// IUnknown /* IUnknown */
STDMETHOD(QueryInterface)(THIS_ REFIID iid, LPVOID *ppv) PURE; STDMETHOD(QueryInterface)(THIS_ REFIID iid, LPVOID *ppv) PURE;
STDMETHOD_(ULONG, AddRef)(THIS) PURE; STDMETHOD_(ULONG, AddRef)(THIS) PURE;
STDMETHOD_(ULONG, Release)(THIS) PURE; STDMETHOD_(ULONG, Release)(THIS) PURE;
// ID3DXEffect /* ID3DXEffect */
STDMETHOD(GetDevice)(THIS_ LPDIRECT3DDEVICE8* ppDevice) PURE; STDMETHOD(GetDevice)(THIS_ LPDIRECT3DDEVICE8* ppDevice) PURE;
STDMETHOD(GetDesc)(THIS_ D3DXEFFECT_DESC* pDesc) PURE; STDMETHOD(GetDesc)(THIS_ D3DXEFFECT_DESC* pDesc) PURE;
STDMETHOD(GetParameterDesc)(THIS_ LPCSTR pParameter, D3DXPARAMETER_DESC* pDesc) PURE; STDMETHOD(GetParameterDesc)(THIS_ LPCSTR pParameter, D3DXPARAMETER_DESC* pDesc) PURE;
@ -130,41 +129,41 @@ DECLARE_INTERFACE_(ID3DXEffect, IUnknown)
////////////////////////////////////////////////////////////////////////////// /*
// APIs ////////////////////////////////////////////////////////////////////// * APIs
////////////////////////////////////////////////////////////////////////////// */
#ifdef __cplusplus #ifdef __cplusplus
extern "C" { extern "C" {
#endif //__cplusplus #endif /* __cplusplus */
//---------------------------------------------------------------------------- /*
// D3DXCreateEffect: * D3DXCreateEffect:
// ----------------- * -----------------
// Creates an effect from an ascii or binaray effect description. * Creates an effect from an ascii or binaray effect description.
// *
// Parameters: * Parameters:
// pDevice * pDevice
// Pointer of the device on which to create the effect * Pointer of the device on which to create the effect
// pSrcFile * pSrcFile
// Name of the file containing the effect description * Name of the file containing the effect description
// hSrcModule * hSrcModule
// Module handle. if NULL, current module will be used. * Module handle. if NULL, current module will be used.
// pSrcResource * pSrcResource
// Resource name in module * Resource name in module
// pSrcData * pSrcData
// Pointer to effect description * Pointer to effect description
// SrcDataSize * SrcDataSize
// Size of the effect description in bytes * Size of the effect description in bytes
// ppEffect * ppEffect
// Returns a buffer containing created effect. * Returns a buffer containing created effect.
// ppCompilationErrors * ppCompilationErrors
// Returns a buffer containing any error messages which occurred during * Returns a buffer containing any error messages which occurred during
// compile. Or NULL if you do not care about the error messages. * compile. Or NULL if you do not care about the error messages.
// *
//---------------------------------------------------------------------------- */
HRESULT WINAPI HRESULT WINAPI
D3DXCreateEffectFromFileA( D3DXCreateEffectFromFileA(
@ -221,6 +220,6 @@ HRESULT WINAPI
#ifdef __cplusplus #ifdef __cplusplus
} }
#endif //__cplusplus #endif /* __cplusplus */
#endif //__D3DX8EFFECT_H__ #endif /* __D3DX8EFFECT_H__ */

196
gfx/include/d3d8/d3dx8mesh.h
View File

@ -1,76 +1,74 @@
////////////////////////////////////////////////////////////////////////////// /*
// *
// Copyright (C) Microsoft Corporation. All Rights Reserved. * Copyright (C) Microsoft Corporation. All Rights Reserved.
// *
// File: d3dx8mesh.h * File: d3dx8mesh.h
// Content: D3DX mesh types and functions * Content: D3DX mesh types and functions
// */
//////////////////////////////////////////////////////////////////////////////
#include "d3dx8.h" #include "d3dx8.h"
#ifndef __D3DX8MESH_H__ #ifndef __D3DX8MESH_H__
#define __D3DX8MESH_H__ #define __D3DX8MESH_H__
#include "dxfile.h" // defines LPDIRECTXFILEDATA #include "dxfile.h" /* defines LPDIRECTXFILEDATA */
// {2A835771-BF4D-43f4-8E14-82A809F17D8A} /* {2A835771-BF4D-43f4-8E14-82A809F17D8A} */
DEFINE_GUID(IID_ID3DXBaseMesh, DEFINE_GUID(IID_ID3DXBaseMesh,
0x2a835771, 0xbf4d, 0x43f4, 0x8e, 0x14, 0x82, 0xa8, 0x9, 0xf1, 0x7d, 0x8a); 0x2a835771, 0xbf4d, 0x43f4, 0x8e, 0x14, 0x82, 0xa8, 0x9, 0xf1, 0x7d, 0x8a);
// {CCAE5C3B-4DD1-4d0f-997E-4684CA64557F} /* {CCAE5C3B-4DD1-4d0f-997E-4684CA64557F} */
DEFINE_GUID(IID_ID3DXMesh, DEFINE_GUID(IID_ID3DXMesh,
0xccae5c3b, 0x4dd1, 0x4d0f, 0x99, 0x7e, 0x46, 0x84, 0xca, 0x64, 0x55, 0x7f); 0xccae5c3b, 0x4dd1, 0x4d0f, 0x99, 0x7e, 0x46, 0x84, 0xca, 0x64, 0x55, 0x7f);
// {19FBE386-C282-4659-97BD-CB869B084A6C} /* {19FBE386-C282-4659-97BD-CB869B084A6C} */
DEFINE_GUID(IID_ID3DXPMesh, DEFINE_GUID(IID_ID3DXPMesh,
0x19fbe386, 0xc282, 0x4659, 0x97, 0xbd, 0xcb, 0x86, 0x9b, 0x8, 0x4a, 0x6c); 0x19fbe386, 0xc282, 0x4659, 0x97, 0xbd, 0xcb, 0x86, 0x9b, 0x8, 0x4a, 0x6c);
// {4E3CA05C-D4FF-4d11-8A02-16459E08F6F4} /* {4E3CA05C-D4FF-4d11-8A02-16459E08F6F4} */
DEFINE_GUID(IID_ID3DXSPMesh, DEFINE_GUID(IID_ID3DXSPMesh,
0x4e3ca05c, 0xd4ff, 0x4d11, 0x8a, 0x2, 0x16, 0x45, 0x9e, 0x8, 0xf6, 0xf4); 0x4e3ca05c, 0xd4ff, 0x4d11, 0x8a, 0x2, 0x16, 0x45, 0x9e, 0x8, 0xf6, 0xf4);
// {8DB06ECC-EBFC-408a-9404-3074B4773515} /* {8DB06ECC-EBFC-408a-9404-3074B4773515} */
DEFINE_GUID(IID_ID3DXSkinMesh, DEFINE_GUID(IID_ID3DXSkinMesh,
0x8db06ecc, 0xebfc, 0x408a, 0x94, 0x4, 0x30, 0x74, 0xb4, 0x77, 0x35, 0x15); 0x8db06ecc, 0xebfc, 0x408a, 0x94, 0x4, 0x30, 0x74, 0xb4, 0x77, 0x35, 0x15);
// Mesh options - lower 3 bytes only, upper byte used by _D3DXMESHOPT option flags /* Mesh options - lower 3 bytes only, upper byte used by _D3DXMESHOPT option flags */
enum _D3DXMESH { enum _D3DXMESH {
D3DXMESH_32BIT = 0x001, // If set, then use 32 bit indices, if not set use 16 bit indices. D3DXMESH_32BIT = 0x001, /* If set, then use 32 bit indices, if not set use 16 bit indices. */
D3DXMESH_DONOTCLIP = 0x002, // Use D3DUSAGE_DONOTCLIP for VB & IB. D3DXMESH_DONOTCLIP = 0x002, /* Use D3DUSAGE_DONOTCLIP for VB & IB. */
D3DXMESH_POINTS = 0x004, // Use D3DUSAGE_POINTS for VB & IB. D3DXMESH_POINTS = 0x004, /* Use D3DUSAGE_POINTS for VB & IB. */
D3DXMESH_RTPATCHES = 0x008, // Use D3DUSAGE_RTPATCHES for VB & IB. D3DXMESH_RTPATCHES = 0x008, /* Use D3DUSAGE_RTPATCHES for VB & IB. */
D3DXMESH_NPATCHES = 0x4000,// Use D3DUSAGE_NPATCHES for VB & IB. D3DXMESH_NPATCHES = 0x4000,/* Use D3DUSAGE_NPATCHES for VB & IB. */
D3DXMESH_VB_SYSTEMMEM = 0x010, // Use D3DPOOL_SYSTEMMEM for VB. Overrides D3DXMESH_MANAGEDVERTEXBUFFER D3DXMESH_VB_SYSTEMMEM = 0x010, /* Use D3DPOOL_SYSTEMMEM for VB. Overrides D3DXMESH_MANAGEDVERTEXBUFFER */
D3DXMESH_VB_MANAGED = 0x020, // Use D3DPOOL_MANAGED for VB. D3DXMESH_VB_MANAGED = 0x020, /* Use D3DPOOL_MANAGED for VB. */
D3DXMESH_VB_WRITEONLY = 0x040, // Use D3DUSAGE_WRITEONLY for VB. D3DXMESH_VB_WRITEONLY = 0x040, /* Use D3DUSAGE_WRITEONLY for VB. */
D3DXMESH_VB_DYNAMIC = 0x080, // Use D3DUSAGE_DYNAMIC for VB. D3DXMESH_VB_DYNAMIC = 0x080, /* Use D3DUSAGE_DYNAMIC for VB. */
D3DXMESH_VB_SOFTWAREPROCESSING = 0x8000, // Use D3DUSAGE_SOFTWAREPROCESSING for VB. D3DXMESH_VB_SOFTWAREPROCESSING = 0x8000, /* Use D3DUSAGE_SOFTWAREPROCESSING for VB. */
D3DXMESH_IB_SYSTEMMEM = 0x100, // Use D3DPOOL_SYSTEMMEM for IB. Overrides D3DXMESH_MANAGEDINDEXBUFFER D3DXMESH_IB_SYSTEMMEM = 0x100, /* Use D3DPOOL_SYSTEMMEM for IB. Overrides D3DXMESH_MANAGEDINDEXBUFFER */
D3DXMESH_IB_MANAGED = 0x200, // Use D3DPOOL_MANAGED for IB. D3DXMESH_IB_MANAGED = 0x200, /* Use D3DPOOL_MANAGED for IB. */
D3DXMESH_IB_WRITEONLY = 0x400, // Use D3DUSAGE_WRITEONLY for IB. D3DXMESH_IB_WRITEONLY = 0x400, /* Use D3DUSAGE_WRITEONLY for IB. */
D3DXMESH_IB_DYNAMIC = 0x800, // Use D3DUSAGE_DYNAMIC for IB. D3DXMESH_IB_DYNAMIC = 0x800, /* Use D3DUSAGE_DYNAMIC for IB. */
D3DXMESH_IB_SOFTWAREPROCESSING= 0x10000, // Use D3DUSAGE_SOFTWAREPROCESSING for IB. D3DXMESH_IB_SOFTWAREPROCESSING= 0x10000, /* Use D3DUSAGE_SOFTWAREPROCESSING for IB. */
D3DXMESH_VB_SHARE = 0x1000, // Valid for Clone* calls only, forces cloned mesh/pmesh to share vertex buffer D3DXMESH_VB_SHARE = 0x1000, /* Valid for Clone* calls only, forces cloned mesh/pmesh to share vertex buffer */
D3DXMESH_USEHWONLY = 0x2000, // Valid for ID3DXSkinMesh::ConvertToBlendedMesh D3DXMESH_USEHWONLY = 0x2000, /* Valid for ID3DXSkinMesh::ConvertToBlendedMesh */
// Helper options /* Helper options */
D3DXMESH_SYSTEMMEM = 0x110, // D3DXMESH_VB_SYSTEMMEM | D3DXMESH_IB_SYSTEMMEM D3DXMESH_SYSTEMMEM = 0x110, /* D3DXMESH_VB_SYSTEMMEM | D3DXMESH_IB_SYSTEMMEM */
D3DXMESH_MANAGED = 0x220, // D3DXMESH_VB_MANAGED | D3DXMESH_IB_MANAGED D3DXMESH_MANAGED = 0x220, /* D3DXMESH_VB_MANAGED | D3DXMESH_IB_MANAGED */
D3DXMESH_WRITEONLY = 0x440, // D3DXMESH_VB_WRITEONLY | D3DXMESH_IB_WRITEONLY D3DXMESH_WRITEONLY = 0x440, /* D3DXMESH_VB_WRITEONLY | D3DXMESH_IB_WRITEONLY */
D3DXMESH_DYNAMIC = 0x880, // D3DXMESH_VB_DYNAMIC | D3DXMESH_IB_DYNAMIC D3DXMESH_DYNAMIC = 0x880, /* D3DXMESH_VB_DYNAMIC | D3DXMESH_IB_DYNAMIC */
D3DXMESH_SOFTWAREPROCESSING = 0x18000, // D3DXMESH_VB_SOFTWAREPROCESSING | D3DXMESH_IB_SOFTWAREPROCESSING D3DXMESH_SOFTWAREPROCESSING = 0x18000 /* D3DXMESH_VB_SOFTWAREPROCESSING | D3DXMESH_IB_SOFTWAREPROCESSING */
}; };
// option field values for specifying min value in D3DXGeneratePMesh and D3DXSimplifyMesh /* option field values for specifying min value in D3DXGeneratePMesh and D3DXSimplifyMesh */
enum _D3DXMESHSIMP enum _D3DXMESHSIMP
{ {
D3DXMESHSIMP_VERTEX = 0x1, D3DXMESHSIMP_VERTEX = 0x1,
D3DXMESHSIMP_FACE = 0x2, D3DXMESHSIMP_FACE = 0x2
}; };
enum _MAX_FVF_DECL_SIZE enum _MAX_FVF_DECL_SIZE
@ -97,7 +95,7 @@ typedef D3DXATTRIBUTERANGE* LPD3DXATTRIBUTERANGE;
#ifdef __cplusplus #ifdef __cplusplus
extern "C" { extern "C" {
#endif //__cplusplus #endif /* __cplusplus */
struct D3DXMATERIAL struct D3DXMATERIAL
{ {
D3DMATERIAL8 MatD3D; D3DMATERIAL8 MatD3D;
@ -106,7 +104,7 @@ struct D3DXMATERIAL
typedef struct D3DXMATERIAL *LPD3DXMATERIAL; typedef struct D3DXMATERIAL *LPD3DXMATERIAL;
#ifdef __cplusplus #ifdef __cplusplus
} }
#endif //__cplusplus #endif /* __cplusplus */
typedef struct _D3DXATTRIBUTEWEIGHTS typedef struct _D3DXATTRIBUTEWEIGHTS
{ {
@ -122,14 +120,14 @@ typedef D3DXATTRIBUTEWEIGHTS* LPD3DXATTRIBUTEWEIGHTS;
enum _D3DXWELDEPSILONSFLAGS enum _D3DXWELDEPSILONSFLAGS
{ {
D3DXWELDEPSILONS_WELDALL = 0x1, // weld all vertices marked by adjacency as being overlapping D3DXWELDEPSILONS_WELDALL = 0x1, /* weld all vertices marked by adjacency as being overlapping */
D3DXWELDEPSILONS_WELDPARTIALMATCHES = 0x2, // if a given vertex component is within epsilon, modify partial matched D3DXWELDEPSILONS_WELDPARTIALMATCHES = 0x2, /* if a given vertex component is within epsilon, modify partial matched
// vertices so that both components identical AND if all components "equal" * vertices so that both components identical AND if all components "equal"
// remove one of the vertices * remove one of the vertices */
D3DXWELDEPSILONS_DONOTREMOVEVERTICES = 0x4, // instructs weld to only allow modifications to vertices and not removal D3DXWELDEPSILONS_DONOTREMOVEVERTICES = 0x4 /* instructs weld to only allow modifications to vertices and not removal
// ONLY valid if D3DXWELDEPSILONS_WELDPARTIALMATCHES is set * ONLY valid if D3DXWELDEPSILONS_WELDPARTIALMATCHES is set
// useful to modify vertices to be equal, but not allow vertices to be removed * useful to modify vertices to be equal, but not allow vertices to be removed */
}; };
typedef struct _D3DXWELDEPSILONS typedef struct _D3DXWELDEPSILONS
@ -148,12 +146,12 @@ typedef D3DXWELDEPSILONS* LPD3DXWELDEPSILONS;
DECLARE_INTERFACE_(ID3DXBaseMesh, IUnknown) DECLARE_INTERFACE_(ID3DXBaseMesh, IUnknown)
{ {
// IUnknown /* IUnknown */
STDMETHOD(QueryInterface)(THIS_ REFIID iid, LPVOID *ppv) PURE; STDMETHOD(QueryInterface)(THIS_ REFIID iid, LPVOID *ppv) PURE;
STDMETHOD_(ULONG, AddRef)(THIS) PURE; STDMETHOD_(ULONG, AddRef)(THIS) PURE;
STDMETHOD_(ULONG, Release)(THIS) PURE; STDMETHOD_(ULONG, Release)(THIS) PURE;
// ID3DXBaseMesh /* ID3DXBaseMesh */
STDMETHOD(DrawSubset)(THIS_ DWORD AttribId) PURE; STDMETHOD(DrawSubset)(THIS_ DWORD AttribId) PURE;
STDMETHOD_(DWORD, GetNumFaces)(THIS) PURE; STDMETHOD_(DWORD, GetNumFaces)(THIS) PURE;
STDMETHOD_(DWORD, GetNumVertices)(THIS) PURE; STDMETHOD_(DWORD, GetNumVertices)(THIS) PURE;
@ -185,12 +183,12 @@ DECLARE_INTERFACE_(ID3DXBaseMesh, IUnknown)
DECLARE_INTERFACE_(ID3DXMesh, ID3DXBaseMesh) DECLARE_INTERFACE_(ID3DXMesh, ID3DXBaseMesh)
{ {
// IUnknown /* IUnknown */
STDMETHOD(QueryInterface)(THIS_ REFIID iid, LPVOID *ppv) PURE; STDMETHOD(QueryInterface)(THIS_ REFIID iid, LPVOID *ppv) PURE;
STDMETHOD_(ULONG, AddRef)(THIS) PURE; STDMETHOD_(ULONG, AddRef)(THIS) PURE;
STDMETHOD_(ULONG, Release)(THIS) PURE; STDMETHOD_(ULONG, Release)(THIS) PURE;
// ID3DXBaseMesh /* ID3DXBaseMesh */
STDMETHOD(DrawSubset)(THIS_ DWORD AttribId) PURE; STDMETHOD(DrawSubset)(THIS_ DWORD AttribId) PURE;
STDMETHOD_(DWORD, GetNumFaces)(THIS) PURE; STDMETHOD_(DWORD, GetNumFaces)(THIS) PURE;
STDMETHOD_(DWORD, GetNumVertices)(THIS) PURE; STDMETHOD_(DWORD, GetNumVertices)(THIS) PURE;
@ -215,7 +213,7 @@ DECLARE_INTERFACE_(ID3DXMesh, ID3DXBaseMesh)
STDMETHOD(ConvertAdjacencyToPointReps)(THIS_ CONST DWORD* pAdjacency, DWORD* pPRep) PURE; STDMETHOD(ConvertAdjacencyToPointReps)(THIS_ CONST DWORD* pAdjacency, DWORD* pPRep) PURE;
STDMETHOD(GenerateAdjacency)(THIS_ FLOAT Epsilon, DWORD* pAdjacency) PURE; STDMETHOD(GenerateAdjacency)(THIS_ FLOAT Epsilon, DWORD* pAdjacency) PURE;
// ID3DXMesh /* ID3DXMesh */
STDMETHOD(LockAttributeBuffer)(THIS_ DWORD Flags, DWORD** ppData) PURE; STDMETHOD(LockAttributeBuffer)(THIS_ DWORD Flags, DWORD** ppData) PURE;
STDMETHOD(UnlockAttributeBuffer)(THIS) PURE; STDMETHOD(UnlockAttributeBuffer)(THIS) PURE;
STDMETHOD(Optimize)(THIS_ DWORD Flags, CONST DWORD* pAdjacencyIn, DWORD* pAdjacencyOut, STDMETHOD(Optimize)(THIS_ DWORD Flags, CONST DWORD* pAdjacencyIn, DWORD* pAdjacencyOut,
@ -232,12 +230,12 @@ DECLARE_INTERFACE_(ID3DXMesh, ID3DXBaseMesh)
DECLARE_INTERFACE_(ID3DXPMesh, ID3DXBaseMesh) DECLARE_INTERFACE_(ID3DXPMesh, ID3DXBaseMesh)
{ {
// IUnknown /* IUnknown */
STDMETHOD(QueryInterface)(THIS_ REFIID iid, LPVOID *ppv) PURE; STDMETHOD(QueryInterface)(THIS_ REFIID iid, LPVOID *ppv) PURE;
STDMETHOD_(ULONG, AddRef)(THIS) PURE; STDMETHOD_(ULONG, AddRef)(THIS) PURE;
STDMETHOD_(ULONG, Release)(THIS) PURE; STDMETHOD_(ULONG, Release)(THIS) PURE;
// ID3DXBaseMesh /* ID3DXBaseMesh */
STDMETHOD(DrawSubset)(THIS_ DWORD AttribId) PURE; STDMETHOD(DrawSubset)(THIS_ DWORD AttribId) PURE;
STDMETHOD_(DWORD, GetNumFaces)(THIS) PURE; STDMETHOD_(DWORD, GetNumFaces)(THIS) PURE;
STDMETHOD_(DWORD, GetNumVertices)(THIS) PURE; STDMETHOD_(DWORD, GetNumVertices)(THIS) PURE;
@ -262,7 +260,7 @@ DECLARE_INTERFACE_(ID3DXPMesh, ID3DXBaseMesh)
STDMETHOD(ConvertAdjacencyToPointReps)(THIS_ CONST DWORD* pAdjacency, DWORD* pPRep) PURE; STDMETHOD(ConvertAdjacencyToPointReps)(THIS_ CONST DWORD* pAdjacency, DWORD* pPRep) PURE;
STDMETHOD(GenerateAdjacency)(THIS_ FLOAT Epsilon, DWORD* pAdjacency) PURE; STDMETHOD(GenerateAdjacency)(THIS_ FLOAT Epsilon, DWORD* pAdjacency) PURE;
// ID3DXPMesh /* ID3DXPMesh */
STDMETHOD(ClonePMeshFVF)(THIS_ DWORD Options, STDMETHOD(ClonePMeshFVF)(THIS_ DWORD Options,
DWORD FVF, LPDIRECT3DDEVICE8 pD3D, LPD3DXPMESH* ppCloneMesh) PURE; DWORD FVF, LPDIRECT3DDEVICE8 pD3D, LPD3DXPMESH* ppCloneMesh) PURE;
STDMETHOD(ClonePMesh)(THIS_ DWORD Options, STDMETHOD(ClonePMesh)(THIS_ DWORD Options,
@ -292,12 +290,12 @@ DECLARE_INTERFACE_(ID3DXPMesh, ID3DXBaseMesh)
DECLARE_INTERFACE_(ID3DXSPMesh, IUnknown) DECLARE_INTERFACE_(ID3DXSPMesh, IUnknown)
{ {
// IUnknown /* IUnknown */
STDMETHOD(QueryInterface)(THIS_ REFIID iid, LPVOID *ppv) PURE; STDMETHOD(QueryInterface)(THIS_ REFIID iid, LPVOID *ppv) PURE;
STDMETHOD_(ULONG, AddRef)(THIS) PURE; STDMETHOD_(ULONG, AddRef)(THIS) PURE;
STDMETHOD_(ULONG, Release)(THIS) PURE; STDMETHOD_(ULONG, Release)(THIS) PURE;
// ID3DXSPMesh /* ID3DXSPMesh */
STDMETHOD_(DWORD, GetNumFaces)(THIS) PURE; STDMETHOD_(DWORD, GetNumFaces)(THIS) PURE;
STDMETHOD_(DWORD, GetNumVertices)(THIS) PURE; STDMETHOD_(DWORD, GetNumVertices)(THIS) PURE;
STDMETHOD_(DWORD, GetFVF)(THIS) PURE; STDMETHOD_(DWORD, GetFVF)(THIS) PURE;
@ -323,18 +321,18 @@ DECLARE_INTERFACE_(ID3DXSPMesh, IUnknown)
#define UNUSED16 (0xffff) #define UNUSED16 (0xffff)
#define UNUSED32 (0xffffffff) #define UNUSED32 (0xffffffff)
// ID3DXMesh::Optimize options - upper byte only, lower 3 bytes used from _D3DXMESH option flags /* ID3DXMesh::Optimize options - upper byte only, lower 3 bytes used from _D3DXMESH option flags */
enum _D3DXMESHOPT { enum _D3DXMESHOPT {
D3DXMESHOPT_COMPACT = 0x01000000, D3DXMESHOPT_COMPACT = 0x01000000,
D3DXMESHOPT_ATTRSORT = 0x02000000, D3DXMESHOPT_ATTRSORT = 0x02000000,
D3DXMESHOPT_VERTEXCACHE = 0x04000000, D3DXMESHOPT_VERTEXCACHE = 0x04000000,
D3DXMESHOPT_STRIPREORDER = 0x08000000, D3DXMESHOPT_STRIPREORDER = 0x08000000,
D3DXMESHOPT_IGNOREVERTS = 0x10000000, // optimize faces only, don't touch vertices D3DXMESHOPT_IGNOREVERTS = 0x10000000, /* optimize faces only, don't touch vertices */
D3DXMESHOPT_SHAREVB = 0x1000, // same as D3DXMESH_VB_SHARE D3DXMESHOPT_SHAREVB = 0x1000 /* same as D3DXMESH_VB_SHARE */
}; };
// Subset of the mesh that has the same attribute and bone combination. /* Subset of the mesh that has the same attribute and bone combination.
// This subset can be rendered in a single draw call * This subset can be rendered in a single draw call */
typedef struct _D3DXBONECOMBINATION typedef struct _D3DXBONECOMBINATION
{ {
DWORD AttribId; DWORD AttribId;
@ -351,12 +349,12 @@ typedef struct _D3DXBONECOMBINATION
DECLARE_INTERFACE_(ID3DXSkinMesh, IUnknown) DECLARE_INTERFACE_(ID3DXSkinMesh, IUnknown)
{ {
// IUnknown /* IUnknown */
STDMETHOD(QueryInterface)(THIS_ REFIID iid, LPVOID *ppv) PURE; STDMETHOD(QueryInterface)(THIS_ REFIID iid, LPVOID *ppv) PURE;
STDMETHOD_(ULONG, AddRef)(THIS) PURE; STDMETHOD_(ULONG, AddRef)(THIS) PURE;
STDMETHOD_(ULONG, Release)(THIS) PURE; STDMETHOD_(ULONG, Release)(THIS) PURE;
// ID3DXMesh /* ID3DXMesh */
STDMETHOD_(DWORD, GetNumFaces)(THIS) PURE; STDMETHOD_(DWORD, GetNumFaces)(THIS) PURE;
STDMETHOD_(DWORD, GetNumVertices)(THIS) PURE; STDMETHOD_(DWORD, GetNumVertices)(THIS) PURE;
STDMETHOD_(DWORD, GetFVF)(THIS) PURE; STDMETHOD_(DWORD, GetFVF)(THIS) PURE;
@ -371,7 +369,7 @@ DECLARE_INTERFACE_(ID3DXSkinMesh, IUnknown)
STDMETHOD(UnlockIndexBuffer)(THIS) PURE; STDMETHOD(UnlockIndexBuffer)(THIS) PURE;
STDMETHOD(LockAttributeBuffer)(THIS_ DWORD flags, DWORD** ppData) PURE; STDMETHOD(LockAttributeBuffer)(THIS_ DWORD flags, DWORD** ppData) PURE;
STDMETHOD(UnlockAttributeBuffer)(THIS) PURE; STDMETHOD(UnlockAttributeBuffer)(THIS) PURE;
// ID3DXSkinMesh /* ID3DXSkinMesh */
STDMETHOD_(DWORD, GetNumBones)(THIS) PURE; STDMETHOD_(DWORD, GetNumBones)(THIS) PURE;
STDMETHOD(GetOriginalMesh)(THIS_ LPD3DXMESH* ppMesh) PURE; STDMETHOD(GetOriginalMesh)(THIS_ LPD3DXMESH* ppMesh) PURE;
STDMETHOD(SetBoneInfluence)(THIS_ DWORD bone, DWORD numInfluences, CONST DWORD* vertices, CONST FLOAT* weights) PURE; STDMETHOD(SetBoneInfluence)(THIS_ DWORD bone, DWORD numInfluences, CONST DWORD* vertices, CONST FLOAT* weights) PURE;
@ -411,7 +409,7 @@ DECLARE_INTERFACE_(ID3DXSkinMesh, IUnknown)
#ifdef __cplusplus #ifdef __cplusplus
extern "C" { extern "C" {
#endif //__cplusplus #endif /* __cplusplus */
HRESULT WINAPI HRESULT WINAPI
D3DXCreateMesh( D3DXCreateMesh(
@ -439,7 +437,7 @@ HRESULT WINAPI
CONST FLOAT *pVertexWeights, CONST FLOAT *pVertexWeights,
LPD3DXSPMESH* ppSMesh); LPD3DXSPMESH* ppSMesh);
// clean a mesh up for simplification, try to make manifold /* clean a mesh up for simplification, try to make manifold */
HRESULT WINAPI HRESULT WINAPI
D3DXCleanMesh( D3DXCleanMesh(
LPD3DXMESH pMeshIn, LPD3DXMESH pMeshIn,
@ -606,7 +604,7 @@ HRESULT WINAPI
LPD3DXMESH pMeshIn, LPD3DXMESH pMeshIn,
CONST DWORD* pAdjacencyIn, CONST DWORD* pAdjacencyIn,
FLOAT NumSegs, FLOAT NumSegs,
BOOL QuadraticInterpNormals, // if false use linear intrep for normals, if true use quadratic BOOL QuadraticInterpNormals, /* if false use linear intrep for normals, if true use quadratic */
LPD3DXMESH *ppMeshOut, LPD3DXMESH *ppMeshOut,
LPD3DXBUFFER *ppAdjacencyOut); LPD3DXBUFFER *ppAdjacencyOut);
@ -634,10 +632,10 @@ HRESULT WINAPI
typedef struct _D3DXINTERSECTINFO typedef struct _D3DXINTERSECTINFO
{ {
DWORD FaceIndex; // index of face intersected DWORD FaceIndex; /* index of face intersected */
FLOAT U; // Barycentric Hit Coordinates FLOAT U; /* Barycentric Hit Coordinates */
FLOAT V; // Barycentric Hit Coordinates FLOAT V; /* Barycentric Hit Coordinates */
FLOAT Dist; // Ray-Intersection Parameter Distance FLOAT Dist; /* Ray-Intersection Parameter Distance */
} D3DXINTERSECTINFO, *LPD3DXINTERSECTINFO; } D3DXINTERSECTINFO, *LPD3DXINTERSECTINFO;
@ -646,13 +644,13 @@ HRESULT WINAPI
LPD3DXBASEMESH pMesh, LPD3DXBASEMESH pMesh,
CONST D3DXVECTOR3 *pRayPos, CONST D3DXVECTOR3 *pRayPos,
CONST D3DXVECTOR3 *pRayDir, CONST D3DXVECTOR3 *pRayDir,
BOOL *pHit, // True if any faces were intersected BOOL *pHit, /* True if any faces were intersected */
DWORD *pFaceIndex, // index of closest face intersected DWORD *pFaceIndex, /* index of closest face intersected */
FLOAT *pU, // Barycentric Hit Coordinates FLOAT *pU, /* Barycentric Hit Coordinates */
FLOAT *pV, // Barycentric Hit Coordinates FLOAT *pV, /* Barycentric Hit Coordinates */
FLOAT *pDist, // Ray-Intersection Parameter Distance FLOAT *pDist, /* Ray-Intersection Parameter Distance */
LPD3DXBUFFER *ppAllHits, // Array of D3DXINTERSECTINFOs for all hits (not just closest) LPD3DXBUFFER *ppAllHits, /* Array of D3DXINTERSECTINFOs for all hits (not just closest) */
DWORD *pCountOfHits); // Number of entries in AllHits array DWORD *pCountOfHits); /* Number of entries in AllHits array */
HRESULT WINAPI HRESULT WINAPI
D3DXIntersectSubset( D3DXIntersectSubset(
@ -660,13 +658,13 @@ HRESULT WINAPI
DWORD AttribId, DWORD AttribId,
CONST D3DXVECTOR3 *pRayPos, CONST D3DXVECTOR3 *pRayPos,
CONST D3DXVECTOR3 *pRayDir, CONST D3DXVECTOR3 *pRayDir,
BOOL *pHit, // True if any faces were intersected BOOL *pHit, /* True if any faces were intersected */
DWORD *pFaceIndex, // index of closest face intersected DWORD *pFaceIndex, /* index of closest face intersected */
FLOAT *pU, // Barycentric Hit Coordinates FLOAT *pU, /* Barycentric Hit Coordinates */
FLOAT *pV, // Barycentric Hit Coordinates FLOAT *pV, /* Barycentric Hit Coordinates */
FLOAT *pDist, // Ray-Intersection Parameter Distance FLOAT *pDist, /* Ray-Intersection Parameter Distance */
LPD3DXBUFFER *ppAllHits, // Array of D3DXINTERSECTINFOs for all hits (not just closest) LPD3DXBUFFER *ppAllHits, /* Array of D3DXINTERSECTINFOs for all hits (not just closest) */
DWORD *pCountOfHits); // Number of entries in AllHits array DWORD *pCountOfHits); /* Number of entries in AllHits array */
HRESULT WINAPI D3DXSplitMesh HRESULT WINAPI D3DXSplitMesh
@ -684,14 +682,14 @@ HRESULT WINAPI D3DXSplitMesh
BOOL D3DXIntersectTri BOOL D3DXIntersectTri
( (
CONST D3DXVECTOR3 *p0, // Triangle vertex 0 position CONST D3DXVECTOR3 *p0, /* Triangle vertex 0 position */
CONST D3DXVECTOR3 *p1, // Triangle vertex 1 position CONST D3DXVECTOR3 *p1, /* Triangle vertex 1 position */
CONST D3DXVECTOR3 *p2, // Triangle vertex 2 position CONST D3DXVECTOR3 *p2, /* Triangle vertex 2 position */
CONST D3DXVECTOR3 *pRayPos, // Ray origin CONST D3DXVECTOR3 *pRayPos, /* Ray origin */
CONST D3DXVECTOR3 *pRayDir, // Ray direction CONST D3DXVECTOR3 *pRayDir, /* Ray direction */
FLOAT *pU, // Barycentric Hit Coordinates FLOAT *pU, /* Barycentric Hit Coordinates */
FLOAT *pV, // Barycentric Hit Coordinates FLOAT *pV, /* Barycentric Hit Coordinates */
FLOAT *pDist); // Ray-Intersection Parameter Distance FLOAT *pDist); /* Ray-Intersection Parameter Distance */
BOOL WINAPI BOOL WINAPI
D3DXSphereBoundProbe( D3DXSphereBoundProbe(
@ -753,8 +751,8 @@ D3DXConvertMeshSubsetToStrips
#ifdef __cplusplus #ifdef __cplusplus
} }
#endif //__cplusplus #endif /* __cplusplus */
#endif //__D3DX8MESH_H__ #endif /* __D3DX8MESH_H__ */

243
gfx/include/d3d8/d3dx8shape.h
View File

@ -1,40 +1,40 @@
/////////////////////////////////////////////////////////////////////////// /*
// *
// Copyright (C) Microsoft Corporation. All Rights Reserved. * Copyright (C) Microsoft Corporation. All Rights Reserved.
// *
// File: d3dx8shapes.h * File: d3dx8shapes.h
// Content: D3DX simple shapes * Content: D3DX simple shapes
// *
/////////////////////////////////////////////////////////////////////////// */
#include "d3dx8.h" #include "d3dx8.h"
#ifndef __D3DX8SHAPES_H__ #ifndef __D3DX8SHAPES_H__
#define __D3DX8SHAPES_H__ #define __D3DX8SHAPES_H__
/////////////////////////////////////////////////////////////////////////// /*
// Functions: * Functions:
/////////////////////////////////////////////////////////////////////////// */
#ifdef __cplusplus #ifdef __cplusplus
extern "C" { extern "C" {
#endif //__cplusplus #endif /* __cplusplus */
/*
//------------------------------------------------------------------------- * D3DXCreatePolygon:
// D3DXCreatePolygon: * ------------------
// ------------------ * Creates a mesh containing an n-sided polygon. The polygon is centered
// Creates a mesh containing an n-sided polygon. The polygon is centered * at the origin.
// at the origin. *
// * Parameters:
// Parameters: *
// * pDevice The D3D device with which the mesh is going to be used.
// pDevice The D3D device with which the mesh is going to be used. * Length Length of each side.
// Length Length of each side. * Sides Number of sides the polygon has. (Must be >= 3)
// Sides Number of sides the polygon has. (Must be >= 3) * ppMesh The mesh object which will be created
// ppMesh The mesh object which will be created * ppAdjacency Returns a buffer containing adjacency info. Can be NULL.
// ppAdjacency Returns a buffer containing adjacency info. Can be NULL. *-------------------------------------------------------------------------
//------------------------------------------------------------------------- */
HRESULT WINAPI HRESULT WINAPI
D3DXCreatePolygon( D3DXCreatePolygon(
LPDIRECT3DDEVICE8 pDevice, LPDIRECT3DDEVICE8 pDevice,
@ -44,21 +44,21 @@ HRESULT WINAPI
LPD3DXBUFFER* ppAdjacency); LPD3DXBUFFER* ppAdjacency);
//------------------------------------------------------------------------- /*
// D3DXCreateBox: * D3DXCreateBox:
// -------------- * --------------
// Creates a mesh containing an axis-aligned box. The box is centered at * Creates a mesh containing an axis-aligned box. The box is centered at
// the origin. * the origin.
// *
// Parameters: * Parameters:
// *
// pDevice The D3D device with which the mesh is going to be used. * pDevice The D3D device with which the mesh is going to be used.
// Width Width of box (along X-axis) * Width Width of box (along X-axis)
// Height Height of box (along Y-axis) * Height Height of box (along Y-axis)
// Depth Depth of box (along Z-axis) * Depth Depth of box (along Z-axis)
// ppMesh The mesh object which will be created * ppMesh The mesh object which will be created
// ppAdjacency Returns a buffer containing adjacency info. Can be NULL. * ppAdjacency Returns a buffer containing adjacency info. Can be NULL.
//------------------------------------------------------------------------- */
HRESULT WINAPI HRESULT WINAPI
D3DXCreateBox( D3DXCreateBox(
LPDIRECT3DDEVICE8 pDevice, LPDIRECT3DDEVICE8 pDevice,
@ -69,23 +69,24 @@ HRESULT WINAPI
LPD3DXBUFFER* ppAdjacency); LPD3DXBUFFER* ppAdjacency);
//------------------------------------------------------------------------- /*
// D3DXCreateCylinder: * D3DXCreateCylinder:
// ------------------- * -------------------
// Creates a mesh containing a cylinder. The generated cylinder is * Creates a mesh containing a cylinder. The generated cylinder is
// centered at the origin, and its axis is aligned with the Z-axis. * centered at the origin, and its axis is aligned with the Z-axis.
// *
// Parameters: * Parameters:
// *
// pDevice The D3D device with which the mesh is going to be used. * pDevice The D3D device with which the mesh is going to be used.
// Radius1 Radius at -Z end (should be >= 0.0f) * Radius1 Radius at -Z end (should be >= 0.0f)
// Radius2 Radius at +Z end (should be >= 0.0f) * Radius2 Radius at +Z end (should be >= 0.0f)
// Length Length of cylinder (along Z-axis) * Length Length of cylinder (along Z-axis)
// Slices Number of slices about the main axis * Slices Number of slices about the main axis
// Stacks Number of stacks along the main axis * Stacks Number of stacks along the main axis
// ppMesh The mesh object which will be created * ppMesh The mesh object which will be created
// ppAdjacency Returns a buffer containing adjacency info. Can be NULL. * ppAdjacency Returns a buffer containing adjacency info. Can be NULL.
//------------------------------------------------------------------------- *-------------------------------------------------------------------------
*/
HRESULT WINAPI HRESULT WINAPI
D3DXCreateCylinder( D3DXCreateCylinder(
LPDIRECT3DDEVICE8 pDevice, LPDIRECT3DDEVICE8 pDevice,
@ -98,21 +99,22 @@ HRESULT WINAPI
LPD3DXBUFFER* ppAdjacency); LPD3DXBUFFER* ppAdjacency);
//------------------------------------------------------------------------- /*-------------------------------------------------------------------------
// D3DXCreateSphere: * D3DXCreateSphere:
// ----------------- * -----------------
// Creates a mesh containing a sphere. The sphere is centered at the * Creates a mesh containing a sphere. The sphere is centered at the
// origin. * origin.
// *
// Parameters: * Parameters:
// *
// pDevice The D3D device with which the mesh is going to be used. * pDevice The D3D device with which the mesh is going to be used.
// Radius Radius of the sphere (should be >= 0.0f) * Radius Radius of the sphere (should be >= 0.0f)
// Slices Number of slices about the main axis * Slices Number of slices about the main axis
// Stacks Number of stacks along the main axis * Stacks Number of stacks along the main axis
// ppMesh The mesh object which will be created * ppMesh The mesh object which will be created
// ppAdjacency Returns a buffer containing adjacency info. Can be NULL. * ppAdjacency Returns a buffer containing adjacency info. Can be NULL.
//------------------------------------------------------------------------- *-------------------------------------------------------------------------
*/
HRESULT WINAPI HRESULT WINAPI
D3DXCreateSphere( D3DXCreateSphere(
LPDIRECT3DDEVICE8 pDevice, LPDIRECT3DDEVICE8 pDevice,
@ -123,22 +125,23 @@ HRESULT WINAPI
LPD3DXBUFFER* ppAdjacency); LPD3DXBUFFER* ppAdjacency);
//------------------------------------------------------------------------- /*-------------------------------------------------------------------------
// D3DXCreateTorus: * D3DXCreateTorus:
// ---------------- * ----------------
// Creates a mesh containing a torus. The generated torus is centered at * Creates a mesh containing a torus. The generated torus is centered at
// the origin, and its axis is aligned with the Z-axis. * the origin, and its axis is aligned with the Z-axis.
// *
// Parameters: * Parameters:
// *
// pDevice The D3D device with which the mesh is going to be used. * pDevice The D3D device with which the mesh is going to be used.
// InnerRadius Inner radius of the torus (should be >= 0.0f) * InnerRadius Inner radius of the torus (should be >= 0.0f)
// OuterRadius Outer radius of the torue (should be >= 0.0f) * OuterRadius Outer radius of the torue (should be >= 0.0f)
// Sides Number of sides in a cross-section (must be >= 3) * Sides Number of sides in a cross-section (must be >= 3)
// Rings Number of rings making up the torus (must be >= 3) * Rings Number of rings making up the torus (must be >= 3)
// ppMesh The mesh object which will be created * ppMesh The mesh object which will be created
// ppAdjacency Returns a buffer containing adjacency info. Can be NULL. * ppAdjacency Returns a buffer containing adjacency info. Can be NULL.
//------------------------------------------------------------------------- *-------------------------------------------------------------------------
*/
HRESULT WINAPI HRESULT WINAPI
D3DXCreateTorus( D3DXCreateTorus(
LPDIRECT3DDEVICE8 pDevice, LPDIRECT3DDEVICE8 pDevice,
@ -150,17 +153,18 @@ HRESULT WINAPI
LPD3DXBUFFER* ppAdjacency); LPD3DXBUFFER* ppAdjacency);
//------------------------------------------------------------------------- /*-------------------------------------------------------------------------
// D3DXCreateTeapot: * D3DXCreateTeapot:
// ----------------- * -----------------
// Creates a mesh containing a teapot. * Creates a mesh containing a teapot.
// *
// Parameters: * Parameters:
// *
// pDevice The D3D device with which the mesh is going to be used. * pDevice The D3D device with which the mesh is going to be used.
// ppMesh The mesh object which will be created * ppMesh The mesh object which will be created
// ppAdjacency Returns a buffer containing adjacency info. Can be NULL. * ppAdjacency Returns a buffer containing adjacency info. Can be NULL.
//------------------------------------------------------------------------- *-------------------------------------------------------------------------
*/
HRESULT WINAPI HRESULT WINAPI
D3DXCreateTeapot( D3DXCreateTeapot(
LPDIRECT3DDEVICE8 pDevice, LPDIRECT3DDEVICE8 pDevice,
@ -168,22 +172,23 @@ HRESULT WINAPI
LPD3DXBUFFER* ppAdjacency); LPD3DXBUFFER* ppAdjacency);
//------------------------------------------------------------------------- /*-------------------------------------------------------------------------
// D3DXCreateText: * D3DXCreateText:
// --------------- * ---------------
// Creates a mesh containing the specified text using the font associated * Creates a mesh containing the specified text using the font associated
// with the device context. * with the device context.
// *
// Parameters: * Parameters:
// *
// pDevice The D3D device with which the mesh is going to be used. * pDevice The D3D device with which the mesh is going to be used.
// hDC Device context, with desired font selected * hDC Device context, with desired font selected
// pText Text to generate * pText Text to generate
// Deviation Maximum chordal deviation from true font outlines * Deviation Maximum chordal deviation from true font outlines
// Extrusion Amount to extrude text in -Z direction * Extrusion Amount to extrude text in -Z direction
// ppMesh The mesh object which will be created * ppMesh The mesh object which will be created
// pGlyphMetrics Address of buffer to receive glyph metric data (or NULL) * pGlyphMetrics Address of buffer to receive glyph metric data (or NULL)
//------------------------------------------------------------------------- *-------------------------------------------------------------------------
*/
HRESULT WINAPI HRESULT WINAPI
D3DXCreateTextA( D3DXCreateTextA(
LPDIRECT3DDEVICE8 pDevice, LPDIRECT3DDEVICE8 pDevice,
@ -215,6 +220,6 @@ HRESULT WINAPI
#ifdef __cplusplus #ifdef __cplusplus
} }
#endif //__cplusplus #endif /* __cplusplus */
#endif //__D3DX8SHAPES_H__ #endif /* __D3DX8SHAPES_H__ */

27
gfx/include/d3d8/d3dx8tex.h
View File

@ -1,11 +1,10 @@
////////////////////////////////////////////////////////////////////////////// /*
// *
// Copyright (C) Microsoft Corporation. All Rights Reserved. * Copyright (C) Microsoft Corporation. All Rights Reserved.
// *
// File: d3dx8tex.h * File: d3dx8tex.h
// Content: D3DX texturing APIs * Content: D3DX texturing APIs
// */
//////////////////////////////////////////////////////////////////////////////
#include "d3dx8.h" #include "d3dx8.h"
@ -224,10 +223,10 @@ extern "C" {
////////////////////////////////////////////////////////////////////////////// /*
// Image File APIs /////////////////////////////////////////////////////////// * Image File APIs
////////////////////////////////////////////////////////////////////////////// */
;
//---------------------------------------------------------------------------- //----------------------------------------------------------------------------
// GetImageInfoFromFile/Resource: // GetImageInfoFromFile/Resource:
// ------------------------------ // ------------------------------
@ -1587,6 +1586,6 @@ HRESULT WINAPI
#ifdef __cplusplus #ifdef __cplusplus
} }
#endif //__cplusplus #endif /* __cplusplus */
#endif //__D3DX8TEX_H__ #endif /* __D3DX8TEX_H__ */