Changeset 308

Show
Ignore:
Timestamp:
10/17/08 14:49:20 (4 years ago)
Author:
smjg
Message:

tidied up d3dx10tex.d

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • trunk/win32/directx/d3dx10tex.d

    r307 r308  
    1313 
    1414enum D3DX10_FILTER_FLAG { 
    15     D3DX10_FILTER_NONE             = 1 << 0, 
    16     D3DX10_FILTER_POINT                = 2 << 0, 
    17     D3DX10_FILTER_LINEAR           = 3 << 0, 
    18     D3DX10_FILTER_TRIANGLE         = 4 << 0, 
    19     D3DX10_FILTER_BOX              = 5 << 0, 
    20     D3DX10_FILTER_MIRROR_U         = 1 << 16, 
    21     D3DX10_FILTER_MIRROR_V         = 2 << 16, 
    22     D3DX10_FILTER_MIRROR_W         = 4 << 16, 
    23     D3DX10_FILTER_MIRROR           = 7 << 16, 
    24     D3DX10_FILTER_DITHER           = 1 << 19, 
    25     D3DX10_FILTER_DITHER_DIFFUSION = 2 << 19, 
    26     D3DX10_FILTER_SRGB_IN          = 1 << 21, 
    27     D3DX10_FILTER_SRGB_OUT         = 2 << 21, 
    28     D3DX10_FILTER_SRGB             = 3 << 21 
     15    D3DX10_FILTER_NONE             = 0x000001, 
     16    D3DX10_FILTER_POINT            = 0x000002, 
     17    D3DX10_FILTER_LINEAR           = 0x000003, 
     18    D3DX10_FILTER_TRIANGLE         = 0x000004, 
     19    D3DX10_FILTER_BOX              = 0x000005, 
     20    D3DX10_FILTER_MIRROR_U         = 0x010000, 
     21    D3DX10_FILTER_MIRROR_V         = 0x020000, 
     22    D3DX10_FILTER_MIRROR_W         = 0x040000, 
     23    D3DX10_FILTER_MIRROR           = 0x070000, 
     24    D3DX10_FILTER_DITHER           = 0x080000, 
     25    D3DX10_FILTER_DITHER_DIFFUSION = 0x100000, 
     26    D3DX10_FILTER_SRGB_IN          = 0x200000, 
     27    D3DX10_FILTER_SRGB_OUT         = 0x400000, 
     28    D3DX10_FILTER_SRGB             = 0x600000 
    2929} 
    3030 
    3131enum D3DX10_NORMALMAP_FLAG { 
    32     D3DX10_NORMALMAP_MIRROR_U          = 1 << 16, 
    33     D3DX10_NORMALMAP_MIRROR_V          = 2 << 16, 
    34     D3DX10_NORMALMAP_MIRROR                = 3 << 16, 
    35     D3DX10_NORMALMAP_INVERTSIGN            = 8 << 16, 
    36     D3DX10_NORMALMAP_COMPUTE_OCCLUSION = 16 << 16 
     32    D3DX10_NORMALMAP_MIRROR_U          = 0x010000, 
     33    D3DX10_NORMALMAP_MIRROR_V          = 0x020000, 
     34    D3DX10_NORMALMAP_MIRROR            = 0x030000, 
     35    D3DX10_NORMALMAP_INVERTSIGN        = 0x080000, 
     36    D3DX10_NORMALMAP_COMPUTE_OCCLUSION = 0x100000 
    3737} 
    3838 
    3939enum D3DX10_CHANNEL_FLAG { 
    40     D3DX10_CHANNEL_RED         = 1 << 0, 
    41     D3DX10_CHANNEL_BLUE            = 1 << 1, 
    42     D3DX10_CHANNEL_GREEN       = 1 << 2, 
    43     D3DX10_CHANNEL_ALPHA       = 1 << 3, 
    44     D3DX10_CHANNEL_LUMINANCE   = 1 << 4 
     40    D3DX10_CHANNEL_RED       =  1, 
     41    D3DX10_CHANNEL_BLUE      =  2, 
     42    D3DX10_CHANNEL_GREEN     =  4, 
     43    D3DX10_CHANNEL_ALPHA     =  8, 
     44    D3DX10_CHANNEL_LUMINANCE = 16 
    4545} 
    4646 
    4747enum D3DX10_IMAGE_FILE_FORMAT { 
    48     D3DX10_IFF_BMP = 0, 
    49     D3DX10_IFF_JPG = 1, 
    50     D3DX10_IFF_PNG = 3, 
    51     D3DX10_IFF_DDS = 4, 
    52     D3DX10_IFF_TIFF    = 10, 
    53     D3DX10_IFF_GIF = 11, 
    54     D3DX10_IFF_WMP = 12, 
    55     D3DX10_IFF_FORCE_DWORD = 0x7fffffff 
     48    D3DX10_IFF_BMP         = 0, 
     49    D3DX10_IFF_JPG         = 1, 
     50    D3DX10_IFF_PNG         = 3, 
     51    D3DX10_IFF_DDS         = 4, 
     52    D3DX10_IFF_TIFF        = 10, 
     53    D3DX10_IFF_GIF         = 11, 
     54    D3DX10_IFF_WMP         = 12, 
     55    D3DX10_IFF_FORCE_DWORD = 0x7fffffff 
    5656} 
    5757 
    5858enum D3DX10_SAVE_TEXTURE_FLAG { 
    59     D3DX10_STF_USEINPUTBLOB = 0x0001 
     59    D3DX10_STF_USEINPUTBLOB = 1 
    6060} 
    6161 
    6262struct D3DX10_IMAGE_INFO { 
    63     UINT Width; 
    64     UINT Height; 
    65     UINT Depth; 
    66     UINT ArraySize; 
    67     UINT MipLevels; 
    68     UINT MiscFlags; 
     63    UINT        Width; 
     64    UINT        Height; 
     65    UINT        Depth; 
     66    UINT        ArraySize; 
     67    UINT        MipLevels; 
     68    UINT        MiscFlags; 
    6969    DXGI_FORMAT Format; 
    7070    D3D10_RESOURCE_DIMENSION ResourceDimension; 
    …… 
    7373 
    7474struct D3DX10_IMAGE_LOAD_INFO { 
    75     UINT   Width; 
    76     UINT   Height; 
    77     UINT   Depth; 
    78     UINT   FirstMipLevel; 
    79     UINT   MipLevels; 
    80     D3D10_USAGE    Usage; 
    81     UINT   BindFlags; 
    82     UINT   CpuAccessFlags; 
    83     UINT   MiscFlags; 
    84     DXGI_FORMAT    Format; 
    85     UINT   Filter; 
    86     UINT   MipFilter; 
    87     D3DX10_IMAGE_INFO* pSrcInfo; 
     75    UINT               Width; 
     76    UINT               Height; 
     77    UINT               Depth; 
     78    UINT               FirstMipLevel; 
     79    UINT               MipLevels; 
     80    D3D10_USAGE        Usage; 
     81    UINT               BindFlags; 
     82    UINT               CpuAccessFlags; 
     83    UINT               MiscFlags; 
     84    DXGI_FORMAT        Format; 
     85    UINT               Filter; 
     86    UINT               MipFilter; 
     87    D3DX10_IMAGE_INFO* pSrcInfo; 
    8888} 
    8989 
    90 HRESULT D3DX10GetImageInfoFromFileA(LPCSTR pSrcFile, ID3DX10ThreadPump pPump, D3DX10_IMAGE_INFO* pSrcInfo, HRESULT* pHResult); 
    91 HRESULT D3DX10GetImageInfoFromFileW(LPCWSTR pSrcFile, ID3DX10ThreadPump pPump, D3DX10_IMAGE_INFO* pSrcInfo, HRESULT* pHResult); 
     90HRESULT D3DX10GetImageInfoFromFileA(LPCSTR pSrcFile, ID3DX10ThreadPump pPump, 
     91  D3DX10_IMAGE_INFO* pSrcInfo, HRESULT* pHResult); 
     92HRESULT D3DX10GetImageInfoFromFileW(LPCWSTR pSrcFile, ID3DX10ThreadPump pPump, 
     93  D3DX10_IMAGE_INFO* pSrcInfo, HRESULT* pHResult); 
    9294 
    93 version(Unicode) { 
    94     alias D3DX10GetImageInfoFromFileW D3DX10GetImageInfoFromFile; 
    95 } else { 
    96     alias D3DX10GetImageInfoFromFileA D3DX10GetImageInfoFromFile; 
    97 } 
     95HRESULT D3DX10GetImageInfoFromResourceA(HMODULE hSrcModule, 
     96  LPCSTR pSrcResource, ID3DX10ThreadPump pPump, D3DX10_IMAGE_INFO* pSrcInfo, 
     97  HRESULT* pHResult); 
     98HRESULT D3DX10GetImageInfoFromResourceW(HMODULE hSrcModule, 
     99  LPCWSTR pSrcResource, ID3DX10ThreadPump pPump, D3DX10_IMAGE_INFO* pSrcInfo, 
     100  HRESULT* pHResult); 
    98101 
    99 HRESULT D3DX10GetImageInfoFromResourceA(HMODULE hSrcModule, LPCSTR pSrcResource, ID3DX10ThreadPump pPump, D3DX10_IMAGE_INFO* pSrcInfo, HRESULT* pHResult); 
    100 HRESULT D3DX10GetImageInfoFromResourceW(HMODULE hSrcModule, LPCWSTR pSrcResource, ID3DX10ThreadPump pPump, D3DX10_IMAGE_INFO* pSrcInfo, HRESULT* pHResult); 
     102HRESULT D3DX10GetImageInfoFromMemory(LPCVOID pSrcData, SIZE_T SrcDataSize, 
     103 ID3DX10ThreadPump pPump, D3DX10_IMAGE_INFO* pSrcInfo, HRESULT* pHResult); 
    101104 
    102 version(Unicode) { 
    103     alias D3DX10GetImageInfoFromResourceW D3DX10GetImageInfoFromResource; 
    104 } else { 
    105     alias D3DX10GetImageInfoFromResourceA D3DX10GetImageInfoFromResource; 
    106 } 
     105HRESULT D3DX10CreateShaderResourceViewFromFileA(ID3D10Device pDevice, 
     106  LPCSTR pSrcFile, D3DX10_IMAGE_LOAD_INFO* pLoadInfo, ID3DX10ThreadPump pPump, 
     107  ID3D10ShaderResourceView* ppShaderResourceView, HRESULT* pHResult); 
     108HRESULT D3DX10CreateShaderResourceViewFromFileW(ID3D10Device pDevice, 
     109  LPCWSTR pSrcFile, D3DX10_IMAGE_LOAD_INFO* pLoadInfo, ID3DX10ThreadPump pPump, 
     110  ID3D10ShaderResourceView* ppShaderResourceView, HRESULT* pHResult); 
    107111 
    108 HRESULT D3DX10GetImageInfoFromMemory(LPCVOID pSrcData, SIZE_T SrcDataSize, ID3DX10ThreadPump pPump, D3DX10_IMAGE_INFO* pSrcInfo, HRESULT* pHResult); 
    109 HRESULT D3DX10CreateShaderResourceViewFromFileA(ID3D10Device pDevice, LPCSTR pSrcFile, D3DX10_IMAGE_LOAD_INFO* pLoadInfo, ID3DX10ThreadPump pPump, ID3D10ShaderResourceView* ppShaderResourceView, HRESULT* pHResult); 
    110 HRESULT D3DX10CreateShaderResourceViewFromFileW(ID3D10Device pDevice, LPCWSTR pSrcFile, D3DX10_IMAGE_LOAD_INFO* pLoadInfo, ID3DX10ThreadPump pPump, ID3D10ShaderResourceView* ppShaderResourceView, HRESULT* pHResult); 
     112HRESULT D3DX10CreateTextureFromFileA(ID3D10Device pDevice, LPCSTR pSrcFile, 
     113  D3DX10_IMAGE_LOAD_INFO* pLoadInfo, ID3DX10ThreadPump pPump, 
     114  ID3D10Resource* ppTexture, HRESULT* pHResult); 
     115HRESULT D3DX10CreateTextureFromFileW(ID3D10Device pDevice, LPCWSTR pSrcFile, 
     116  D3DX10_IMAGE_LOAD_INFO* pLoadInfo, ID3DX10ThreadPump pPump, 
     117  ID3D10Resource* ppTexture, HRESULT* pHResult); 
    111118 
    112 version(Unicode) { 
    113     alias D3DX10CreateShaderResourceViewFromFileW D3DX10CreateShaderResourceViewFromFile; 
    114 } else { 
    115     alias D3DX10CreateShaderResourceViewFromFileA D3DX10CreateShaderResourceViewFromFile; 
    116 } 
     119HRESULT D3DX10CreateShaderResourceViewFromResourceA(ID3D10Device pDevice, 
     120  HMODULE hSrcModule, LPCSTR pSrcResource, D3DX10_IMAGE_LOAD_INFO* pLoadInfo, 
     121  ID3DX10ThreadPump pPump, ID3D10ShaderResourceView* ppShaderResourceView, 
     122  HRESULT* pHResult); 
     123HRESULT D3DX10CreateShaderResourceViewFromResourceW(ID3D10Device pDevice, 
     124  HMODULE hSrcModule, LPCWSTR pSrcResource, D3DX10_IMAGE_LOAD_INFO* pLoadInfo, 
     125  ID3DX10ThreadPump pPump, ID3D10ShaderResourceView* ppShaderResourceView, 
     126  HRESULT* pHResult); 
    117127 
    118 HRESULT D3DX10CreateTextureFromFileA(ID3D10Device pDevice, LPCSTR pSrcFile, D3DX10_IMAGE_LOAD_INFO* pLoadInfo, ID3DX10ThreadPump pPump, ID3D10Resource* ppTexture, HRESULT* pHResult); 
    119 HRESULT D3DX10CreateTextureFromFileW(ID3D10Device pDevice, LPCWSTR pSrcFile, D3DX10_IMAGE_LOAD_INFO* pLoadInfo, ID3DX10ThreadPump pPump, ID3D10Resource* ppTexture, HRESULT* pHResult); 
     128HRESULT D3DX10CreateTextureFromResourceA(ID3D10Device pDevice, 
     129  HMODULE hSrcModule, LPCSTR pSrcResource, D3DX10_IMAGE_LOAD_INFO* pLoadInfo, 
     130  ID3DX10ThreadPump pPump, ID3D10Resource* ppTexture, HRESULT* pHResult); 
     131HRESULT D3DX10CreateTextureFromResourceW(ID3D10Device pDevice, 
     132  HMODULE hSrcModule, LPCWSTR pSrcResource, D3DX10_IMAGE_LOAD_INFO* pLoadInfo, 
     133  ID3DX10ThreadPump pPump, ID3D10Resource* ppTexture, HRESULT* pHResult); 
    120134 
    121 version(Unicode) { 
    122     alias D3DX10CreateTextureFromFileW D3DX10CreateTextureFromFile; 
    123 } else { 
    124     alias D3DX10CreateTextureFromFileA D3DX10CreateTextureFromFile; 
    125 } 
     135HRESULT D3DX10CreateShaderResourceViewFromMemory(ID3D10Device pDevice, 
     136  LPCVOID pSrcData, SIZE_T SrcDataSize, D3DX10_IMAGE_LOAD_INFO* pLoadInfo, 
     137  ID3DX10ThreadPump pPump, ID3D10ShaderResourceView* ppShaderResourceView, 
     138  HRESULT* pHResult); 
    126139 
    127 HRESULT D3DX10CreateShaderResourceViewFromResourceA(ID3D10Device pDevice, HMODULE hSrcModule, LPCSTR pSrcResource, D3DX10_IMAGE_LOAD_INFO* pLoadInfo, ID3DX10ThreadPump pPump, ID3D10ShaderResourceView* ppShaderResourceView, HRESULT* pHResult); 
    128 HRESULT D3DX10CreateShaderResourceViewFromResourceW(ID3D10Device pDevice, HMODULE hSrcModule, LPCWSTR pSrcResource, D3DX10_IMAGE_LOAD_INFO* pLoadInfo, ID3DX10ThreadPump pPump, ID3D10ShaderResourceView* ppShaderResourceView, HRESULT* pHResult); 
    129  
    130 version(Unicode) { 
    131     alias D3DX10CreateShaderResourceViewFromResourceW D3DX10CreateShaderResourceViewFromResource; 
    132 } else { 
    133     alias D3DX10CreateShaderResourceViewFromResourceA D3DX10CreateShaderResourceViewFromResource; 
    134 } 
    135  
    136 HRESULT D3DX10CreateTextureFromResourceA(ID3D10Device pDevice, HMODULE hSrcModule, LPCSTR pSrcResource, D3DX10_IMAGE_LOAD_INFO* pLoadInfo, ID3DX10ThreadPump pPump, ID3D10Resource* ppTexture, HRESULT* pHResult); 
    137 HRESULT D3DX10CreateTextureFromResourceW(ID3D10Device pDevice, HMODULE hSrcModule, LPCWSTR pSrcResource, D3DX10_IMAGE_LOAD_INFO* pLoadInfo, ID3DX10ThreadPump pPump, ID3D10Resource* ppTexture, HRESULT* pHResult); 
    138  
    139 version(Unicode) { 
    140     alias D3DX10CreateTextureFromResourceW D3DX10CreateTextureFromResource; 
    141 } else { 
    142     alias D3DX10CreateTextureFromResourceA D3DX10CreateTextureFromResource; 
    143 } 
    144  
    145 HRESULT D3DX10CreateShaderResourceViewFromMemory(ID3D10Device pDevice, LPCVOID pSrcData, SIZE_T SrcDataSize, D3DX10_IMAGE_LOAD_INFO* pLoadInfo, ID3DX10ThreadPump pPump, ID3D10ShaderResourceView* ppShaderResourceView, HRESULT* pHResult); 
    146 HRESULT D3DX10CreateTextureFromMemory(ID3D10Device pDevice, LPCVOID pSrcData, SIZE_T SrcDataSize, D3DX10_IMAGE_LOAD_INFO* pLoadInfo, ID3DX10ThreadPump pPump, ID3D10Resource* ppTexture, HRESULT* pHResult); 
     140HRESULT D3DX10CreateTextureFromMemory(ID3D10Device pDevice, LPCVOID pSrcData, 
     141  SIZE_T SrcDataSize, D3DX10_IMAGE_LOAD_INFO* pLoadInfo, 
     142  ID3DX10ThreadPump pPump, ID3D10Resource* ppTexture, HRESULT* pHResult); 
    147143 
    148144struct D3DX10_TEXTURE_LOAD_INFO { 
    149145    D3D10_BOX* pSrcBox; 
    150146    D3D10_BOX* pDstBox; 
    151     UINT SrcFirstMip; 
    152     UINT DstFirstMip; 
    153     UINT NumMips; 
    154     UINT SrcFirstElement; 
    155     UINT DstFirstElement; 
    156     UINT NumElements; 
    157     UINT Filter; 
    158     UINT MipFilter; 
     147    UINT       SrcFirstMip; 
     148    UINT       DstFirstMip; 
     149    UINT       NumMips; 
     150    UINT       SrcFirstElement; 
     151    UINT       DstFirstElement; 
     152    UINT       NumElements; 
     153    UINT       Filter; 
     154    UINT       MipFilter; 
    159155} 
    160156 
    161 HRESULT D3DX10LoadTextureFromTexture(ID3D10Resource pSrcTexture, D3DX10_TEXTURE_LOAD_INFO* pLoadInfo, ID3D10Resource pDstTexture); 
     157HRESULT D3DX10LoadTextureFromTexture(ID3D10Resource pSrcTexture, 
     158  D3DX10_TEXTURE_LOAD_INFO* pLoadInfo, ID3D10Resource pDstTexture); 
     159 
    162160HRESULT D3DX10FilterTexture(ID3D10Resource pTexture, UINT SrcLevel, UINT MipFilter); 
    163 HRESULT D3DX10SaveTextureToFileA(ID3D10Resource pSrcTexture, D3DX10_IMAGE_FILE_FORMAT DestFormat, LPCSTR pDestFile); 
    164 HRESULT D3DX10SaveTextureToFileW(ID3D10Resource pSrcTexture, D3DX10_IMAGE_FILE_FORMAT DestFormat, LPCWSTR pDestFile); 
     161 
     162HRESULT D3DX10SaveTextureToFileA(ID3D10Resource pSrcTexture, 
     163  D3DX10_IMAGE_FILE_FORMAT DestFormat, LPCSTR pDestFile); 
     164HRESULT D3DX10SaveTextureToFileW(ID3D10Resource pSrcTexture, 
     165  D3DX10_IMAGE_FILE_FORMAT DestFormat, LPCWSTR pDestFile); 
     166 
     167HRESULT D3DX10SaveTextureToMemory(ID3D10Resource pSrcTexture, 
     168  D3DX10_IMAGE_FILE_FORMAT DestFormat, ID3D10Blob* ppDestBuf, UINT Flags); 
     169 
     170HRESULT D3DX10ComputeNormalMap(ID3D10Texture2D pSrcTexture, UINT Flags, 
     171  UINT Channel, FLOAT Amplitude, ID3D10Texture2D pDestTexture); 
     172 
     173HRESULT D3DX10SHProjectCubeMap(UINT Order, ID3D10Texture2D pCubeMap, 
     174  FLOAT* pROut, FLOAT* pGOut, FLOAT* pBOut); 
    165175 
    166176version(Unicode) { 
     177    alias D3DX10GetImageInfoFromFileW D3DX10GetImageInfoFromFile; 
     178    alias D3DX10GetImageInfoFromResourceW D3DX10GetImageInfoFromResource; 
     179    alias D3DX10CreateShaderResourceViewFromFileW D3DX10CreateShaderResourceViewFromFile; 
     180    alias D3DX10CreateTextureFromFileW D3DX10CreateTextureFromFile; 
     181    alias D3DX10CreateShaderResourceViewFromResourceW D3DX10CreateShaderResourceViewFromResource; 
     182    alias D3DX10CreateTextureFromResourceW D3DX10CreateTextureFromResource; 
    167183    alias D3DX10SaveTextureToFileW D3DX10SaveTextureToFile; 
    168184} else { 
     185    alias D3DX10GetImageInfoFromFileA D3DX10GetImageInfoFromFile; 
     186    alias D3DX10GetImageInfoFromResourceA D3DX10GetImageInfoFromResource; 
     187    alias D3DX10CreateShaderResourceViewFromFileA D3DX10CreateShaderResourceViewFromFile; 
     188    alias D3DX10CreateTextureFromFileA D3DX10CreateTextureFromFile; 
     189    alias D3DX10CreateShaderResourceViewFromResourceA D3DX10CreateShaderResourceViewFromResource; 
     190    alias D3DX10CreateTextureFromResourceA D3DX10CreateTextureFromResource; 
    169191    alias D3DX10SaveTextureToFileA D3DX10SaveTextureToFile; 
    170192} 
    171  
    172 HRESULT D3DX10SaveTextureToMemory(ID3D10Resource pSrcTexture, D3DX10_IMAGE_FILE_FORMAT DestFormat, ID3D10Blob* ppDestBuf, UINT Flags); 
    173 HRESULT D3DX10ComputeNormalMap(ID3D10Texture2D pSrcTexture, UINT Flags, UINT Channel, FLOAT Amplitude, ID3D10Texture2D pDestTexture); 
    174 HRESULT D3DX10SHProjectCubeMap(UINT Order, ID3D10Texture2D pCubeMap, FLOAT* pROut, FLOAT* pGOut, FLOAT* pBOut); 
    175