DeprecatedForks/crossxtex
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

texconv/texassmble: code cleanup (eliminated 'goto')

Browse Source
This commit is contained in:
walbourn_cp 2014-10-06 14:08:06 -07:00
parent 48a430b382
commit ae5554f3c9
2 changed files with 85 additions and 154 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

125
Texassemble/texassemble.cpp
View File

@ -10,12 +10,14 @@
#include <stdlib.h>
#include <assert.h>
#include <memory>
#include <list>
#include <vector>
#include <dxgiformat.h>
#include "directxtex.h"
#include <vector>
using namespace DirectX;
enum OPTIONS // Note: dwOptions below assumes 32 or less options.
@ -40,8 +42,6 @@ static_assert( OPT_MAX <= 32, "dwOptions is a DWORD bitfield" );
struct SConversion
{
WCHAR szSrc [MAX_PATH];
SConversion *pNext;
};
struct SValue
@ -312,9 +312,6 @@ void PrintUsage()
int __cdecl wmain(_In_ int argc, _In_z_count_(argc) wchar_t* argv[])
{
// Parameters and defaults
HRESULT hr;
INT nReturn;
size_t width = 0;
size_t height = 0;
@ -325,7 +322,8 @@ int __cdecl wmain(_In_ int argc, _In_z_count_(argc) wchar_t* argv[])
WCHAR szOutputFile[MAX_PATH] = { 0 };
// Initialize COM (needed for WIC)
if( FAILED( hr = CoInitializeEx(nullptr, COINIT_MULTITHREADED) ) )
HRESULT hr = hr = CoInitializeEx(nullptr, COINIT_MULTITHREADED);
if( FAILED(hr) )
{
wprintf( L"Failed to initialize COM (%08X)\n", hr);
return 1;
@ -333,10 +331,7 @@ int __cdecl wmain(_In_ int argc, _In_z_count_(argc) wchar_t* argv[])
// Process command line
DWORD dwOptions = 0;
SConversion *pConversion = nullptr;
SConversion **ppConversion = &pConversion;
size_t images = 0;
std::list<SConversion> conversion;
for(int iArg = 1; iArg < argc; iArg++)
{
@ -425,28 +420,26 @@ int __cdecl wmain(_In_ int argc, _In_z_count_(argc) wchar_t* argv[])
}
else
{
SConversion *pConv = new SConversion;
if ( !pConv )
return 1;
SConversion conv;
wcscpy_s(conv.szSrc, MAX_PATH, pArg);
wcscpy_s(pConv->szSrc, MAX_PATH, pArg);
pConv->pNext = nullptr;
*ppConversion = pConv;
ppConversion = &pConv->pNext;
++images;
conversion.push_back(conv);
}
}
if( !pConversion || images < 2 )
if(conversion.empty())
{
wprintf( L"ERROR: Need at least 2 images to assemble\n\n");
PrintUsage();
return 0;
}
size_t images = conversion.size();
if( images < 2 )
{
wprintf( L"ERROR: Need at least 2 images to assemble\n\n");
return 1;
}
switch( dwOptions & ( (1 << OPT_CUBE) | (1 << OPT_VOLUME) | (1 << OPT_ARRAY) | (1 << OPT_CUBEARRAY) ) )
{
case (1 << OPT_VOLUME):
@ -478,16 +471,16 @@ int __cdecl wmain(_In_ int argc, _In_z_count_(argc) wchar_t* argv[])
PrintLogo();
// Convert images
std::vector<ScratchImage*> loadedImages;
std::vector<std::unique_ptr<ScratchImage>> loadedImages;
for( SConversion *pConv = pConversion; pConv; pConv = pConv->pNext )
for( auto pConv = conversion.begin(); pConv != conversion.end(); ++pConv )
{
WCHAR ext[_MAX_EXT];
WCHAR fname[_MAX_FNAME];
_wsplitpath_s( pConv->szSrc, nullptr, 0, nullptr, 0, fname, _MAX_FNAME, ext, _MAX_EXT );
// Load source image
if( pConv != pConversion )
if( pConv != conversion.begin() )
wprintf( L"\n");
else if ( !*szOutputFile )
{
@ -504,17 +497,16 @@ int __cdecl wmain(_In_ int argc, _In_z_count_(argc) wchar_t* argv[])
fflush(stdout);
TexMetadata info;
ScratchImage *image = new ScratchImage;
std::unique_ptr<ScratchImage> image( new (std::nothrow) ScratchImage );
if ( !image )
{
wprintf( L" ERROR: Memory allocation failed\n" );
goto LError;
return 1;
}
if ( _wcsicmp( ext, L".dds" ) == 0 )
{
hr = LoadFromDDSFile( pConv->szSrc, DDS_FLAGS_NONE, &info, *image );
hr = LoadFromDDSFile( pConv->szSrc, DDS_FLAGS_NONE, &info, *image.get() );
if ( FAILED(hr) )
{
wprintf( L" FAILED (%x)\n", hr);
@ -532,7 +524,7 @@ int __cdecl wmain(_In_ int argc, _In_z_count_(argc) wchar_t* argv[])
}
else if ( _wcsicmp( ext, L".tga" ) == 0 )
{
hr = LoadFromTGAFile( pConv->szSrc, &info, *image );
hr = LoadFromTGAFile( pConv->szSrc, &info, *image.get() );
if ( FAILED(hr) )
{
wprintf( L" FAILED (%x)\n", hr);
@ -549,7 +541,7 @@ int __cdecl wmain(_In_ int argc, _In_z_count_(argc) wchar_t* argv[])
static_assert( WIC_FLAGS_FILTER_CUBIC == TEX_FILTER_CUBIC, "WIC_FLAGS_* & TEX_FILTER_* should match" );
static_assert( WIC_FLAGS_FILTER_FANT == TEX_FILTER_FANT, "WIC_FLAGS_* & TEX_FILTER_* should match" );
hr = LoadFromWICFile( pConv->szSrc, dwFilter, &info, *image );
hr = LoadFromWICFile( pConv->szSrc, dwFilter, &info, *image.get() );
if ( FAILED(hr) )
{
wprintf( L" FAILED (%x)\n", hr);
@ -569,20 +561,17 @@ int __cdecl wmain(_In_ int argc, _In_z_count_(argc) wchar_t* argv[])
assert( img );
size_t nimg = image->GetImageCount();
ScratchImage *timage = new ScratchImage;
std::unique_ptr<ScratchImage> timage( new (std::nothrow) ScratchImage );
if ( !timage )
{
wprintf( L" ERROR: Memory allocation failed\n" );
delete image;
goto LError;
return 1;
}
hr = Decompress( img, nimg, info, DXGI_FORMAT_UNKNOWN /* picks good default */, *timage );
hr = Decompress( img, nimg, info, DXGI_FORMAT_UNKNOWN /* picks good default */, *timage.get() );
if ( FAILED(hr) )
{
wprintf( L" FAILED [decompress] (%x)\n", hr);
delete timage;
delete image;
continue;
}
@ -599,8 +588,7 @@ int __cdecl wmain(_In_ int argc, _In_z_count_(argc) wchar_t* argv[])
assert( info.miscFlags2 == tinfo.miscFlags2 );
assert( info.dimension == tinfo.dimension );
delete image;
image = timage;
image.swap( timage );
}
// --- Resize ------------------------------------------------------------------
@ -614,21 +602,18 @@ int __cdecl wmain(_In_ int argc, _In_z_count_(argc) wchar_t* argv[])
}
if ( info.width != width || info.height != height )
{
ScratchImage *timage = new ScratchImage;
std::unique_ptr<ScratchImage> timage( new (std::nothrow) ScratchImage );
if ( !timage )
{
wprintf( L" ERROR: Memory allocation failed\n" );
delete image;
goto LError;
return 1;
}
hr = Resize( image->GetImages(), image->GetImageCount(), image->GetMetadata(), width, height, dwFilter | dwFilterOpts, *timage );
hr = Resize( image->GetImages(), image->GetImageCount(), image->GetMetadata(), width, height, dwFilter | dwFilterOpts, *timage.get() );
if ( FAILED(hr) )
{
wprintf( L" FAILED [resize] (%x)\n", hr);
delete timage;
delete image;
goto LError;
return 1;
}
const TexMetadata& tinfo = timage->GetMetadata();
@ -645,8 +630,7 @@ int __cdecl wmain(_In_ int argc, _In_z_count_(argc) wchar_t* argv[])
assert( info.format == tinfo.format );
assert( info.dimension == tinfo.dimension );
delete image;
image = timage;
image.swap( timage );
}
// --- Convert -----------------------------------------------------------------
@ -656,21 +640,18 @@ int __cdecl wmain(_In_ int argc, _In_z_count_(argc) wchar_t* argv[])
}
else if ( info.format != format && !IsCompressed( format ) )
{
ScratchImage *timage = new ScratchImage;
std::unique_ptr<ScratchImage> timage( new (std::nothrow) ScratchImage );
if ( !timage )
{
wprintf( L" ERROR: Memory allocation failed\n" );
delete image;
goto LError;
return 1;
}
hr = Convert( image->GetImages(), image->GetImageCount(), image->GetMetadata(), format, dwFilter | dwFilterOpts, 0.5f, *timage );
hr = Convert( image->GetImages(), image->GetImageCount(), image->GetMetadata(), format, dwFilter | dwFilterOpts, 0.5f, *timage.get() );
if ( FAILED(hr) )
{
wprintf( L" FAILED [convert] (%x)\n", hr);
delete timage;
delete image;
goto LError;
return 1;
}
const TexMetadata& tinfo = timage->GetMetadata();
@ -687,11 +668,10 @@ int __cdecl wmain(_In_ int argc, _In_z_count_(argc) wchar_t* argv[])
assert( info.miscFlags2 == tinfo.miscFlags2 );
assert( info.dimension == tinfo.dimension );
delete image;
image = timage;
image.swap( timage );
}
loadedImages.push_back( image );
loadedImages.push_back( std::move( image ) );
}
// --- Create result ---------------------------------------------------------------
@ -701,7 +681,7 @@ int __cdecl wmain(_In_ int argc, _In_z_count_(argc) wchar_t* argv[])
for( auto it = loadedImages.cbegin(); it != loadedImages.cend(); ++it )
{
const Image* img = (*it)->GetImage(0,0,0);
const Image* img = it->get()->GetImage(0,0,0);
assert( img != 0 );
imageArray.push_back( *img );
}
@ -726,10 +706,9 @@ int __cdecl wmain(_In_ int argc, _In_z_count_(argc) wchar_t* argv[])
if ( FAILED(hr ) )
{
wprintf( L"FAILED building result image (%x)\n", hr);
goto LError;
return 1;
}
// Write texture
wprintf( L"\nWriting %s ", szOutputFile);
PrintInfo( result.GetMetadata() );
@ -747,21 +726,5 @@ int __cdecl wmain(_In_ int argc, _In_z_count_(argc) wchar_t* argv[])
wprintf( L"\n");
}
nReturn = 0;
goto LDone;
LError:
nReturn = 1;
LDone:
while(pConversion)
{
auto pConv = pConversion;
pConversion = pConversion->pNext;
delete pConv;
}
return nReturn;
return 0;
}

114
Texconv/texconv.cpp
View File

@ -11,12 +11,15 @@
#include <assert.h>
#include <memory>
#include <list>
#include <wrl.h>
#include <dxgiformat.h>
#include "directxtex.h"
using namespace DirectX;
using Microsoft::WRL::ComPtr;
enum OPTIONS // Note: dwOptions below assumes 32 or less options.
{
@ -58,8 +61,6 @@ struct SConversion
{
WCHAR szSrc [MAX_PATH];
WCHAR szDest[MAX_PATH];
SConversion *pNext;
};
struct SValue
@ -537,12 +538,12 @@ bool CreateDevice( _Outptr_ ID3D11Device** pDevice )
if ( SUCCEEDED(hr) )
{
IDXGIDevice* dxgiDevice = nullptr;
hr = (*pDevice)->QueryInterface( __uuidof( IDXGIDevice ), reinterpret_cast< void** >( &dxgiDevice ) );
ComPtr<IDXGIDevice> dxgiDevice;
hr = (*pDevice)->QueryInterface( __uuidof( IDXGIDevice ), reinterpret_cast< void** >( dxgiDevice.GetAddressOf() ) );
if ( SUCCEEDED(hr) )
{
IDXGIAdapter* pAdapter = nullptr;
hr = dxgiDevice->GetAdapter( &pAdapter );
ComPtr<IDXGIAdapter> pAdapter;
hr = dxgiDevice->GetAdapter( pAdapter.GetAddressOf() );
if ( SUCCEEDED(hr) )
{
DXGI_ADAPTER_DESC desc;
@ -551,10 +552,7 @@ bool CreateDevice( _Outptr_ ID3D11Device** pDevice )
{
wprintf( L"\n[Using DirectCompute on \"%s\"]\n", desc.Description );
}
pAdapter->Release();
}
dxgiDevice->Release();
}
return true;
@ -612,9 +610,6 @@ void FitPowerOf2( size_t origx, size_t origy, size_t& targetx, size_t& targety,
int __cdecl wmain(_In_ int argc, _In_z_count_(argc) wchar_t* argv[])
{
// Parameters and defaults
HRESULT hr;
INT nReturn;
size_t width = 0;
size_t height = 0;
size_t mipLevels = 0;
@ -635,7 +630,8 @@ int __cdecl wmain(_In_ int argc, _In_z_count_(argc) wchar_t* argv[])
szOutputDir[0] = 0;
// Initialize COM (needed for WIC)
if( FAILED( hr = CoInitializeEx(nullptr, COINIT_MULTITHREADED) ) )
HRESULT hr = CoInitializeEx(nullptr, COINIT_MULTITHREADED);
if( FAILED(hr) )
{
wprintf( L"Failed to initialize COM (%08X)\n", hr);
return 1;
@ -643,8 +639,7 @@ int __cdecl wmain(_In_ int argc, _In_z_count_(argc) wchar_t* argv[])
// Process command line
DWORD dwOptions = 0;
SConversion *pConversion = nullptr;
SConversion **ppConversion = &pConversion;
std::list<SConversion> conversion;
for(int iArg = 1; iArg < argc; iArg++)
{
@ -834,21 +829,16 @@ int __cdecl wmain(_In_ int argc, _In_z_count_(argc) wchar_t* argv[])
}
else
{
SConversion *pConv = new SConversion;
if ( !pConv )
return 1;
SConversion conv;
wcscpy_s(conv.szSrc, MAX_PATH, pArg);
wcscpy_s(pConv->szSrc, MAX_PATH, pArg);
conv.szDest[0] = 0;
pConv->szDest[0] = 0;
pConv->pNext = nullptr;
*ppConversion = pConv;
ppConversion = &pConv->pNext;
conversion.push_back(conv);
}
}
if(!pConversion)
if(conversion.empty())
{
PrintUsage();
return 0;
@ -886,15 +876,14 @@ int __cdecl wmain(_In_ int argc, _In_z_count_(argc) wchar_t* argv[])
// Convert images
bool nonpow2warn = false;
bool non4bc = false;
SConversion *pConv;
ID3D11Device* pDevice = nullptr;
ComPtr<ID3D11Device> pDevice;
for(pConv = pConversion; pConv; pConv = pConv->pNext)
for( auto pConv = conversion.begin(); pConv != conversion.end(); ++pConv )
{
// Load source image
if(pConv != pConversion)
if ( pConv != conversion.begin() )
wprintf( L"\n");
// Load source image
wprintf( L"reading %s", pConv->szSrc );
fflush(stdout);
@ -908,7 +897,7 @@ int __cdecl wmain(_In_ int argc, _In_z_count_(argc) wchar_t* argv[])
if ( !image )
{
wprintf( L" ERROR: Memory allocation failed\n" );
goto LError;
return 1;
}
if ( _wcsicmp( ext, L".dds" ) == 0 )
@ -1022,7 +1011,7 @@ int __cdecl wmain(_In_ int argc, _In_z_count_(argc) wchar_t* argv[])
if ( !timage )
{
wprintf( L" ERROR: Memory allocation failed\n" );
goto LError;
return 1;
}
hr = ConvertToSinglePlane( img, nimg, info, *timage );
@ -1062,7 +1051,7 @@ int __cdecl wmain(_In_ int argc, _In_z_count_(argc) wchar_t* argv[])
if ( !timage )
{
wprintf( L" ERROR: Memory allocation failed\n" );
goto LError;
return 1;
}
hr = Decompress( img, nimg, info, DXGI_FORMAT_UNKNOWN /* picks good default */, *timage );
@ -1104,7 +1093,7 @@ int __cdecl wmain(_In_ int argc, _In_z_count_(argc) wchar_t* argv[])
if ( !timage )
{
wprintf( L" ERROR: Memory allocation failed\n" );
goto LError;
return 1;
}
DWORD dwFlags = 0;
@ -1121,7 +1110,7 @@ int __cdecl wmain(_In_ int argc, _In_z_count_(argc) wchar_t* argv[])
if ( FAILED(hr) )
{
wprintf( L" FAILED [fliprotate] (%x)\n", hr);
goto LError;
return 1;
}
auto& tinfo = timage->GetMetadata();
@ -1150,14 +1139,14 @@ int __cdecl wmain(_In_ int argc, _In_z_count_(argc) wchar_t* argv[])
if ( !timage )
{
wprintf( L" ERROR: Memory allocation failed\n" );
goto LError;
return 1;
}
hr = Resize( image->GetImages(), image->GetImageCount(), image->GetMetadata(), twidth, theight, dwFilter | dwFilterOpts, *timage );
if ( FAILED(hr) )
{
wprintf( L" FAILED [resize] (%x)\n", hr);
goto LError;
return 1;
}
auto& tinfo = timage->GetMetadata();
@ -1185,14 +1174,14 @@ int __cdecl wmain(_In_ int argc, _In_z_count_(argc) wchar_t* argv[])
if ( !timage )
{
wprintf( L" ERROR: Memory allocation failed\n" );
goto LError;
return 1;
}
hr = Convert( image->GetImages(), image->GetImageCount(), image->GetMetadata(), tformat, dwFilter | dwFilterOpts | dwSRGB, 0.5f, *timage );
if ( FAILED(hr) )
{
wprintf( L" FAILED [convert] (%x)\n", hr);
goto LError;
return 1;
}
auto& tinfo = timage->GetMetadata();
@ -1225,7 +1214,7 @@ int __cdecl wmain(_In_ int argc, _In_z_count_(argc) wchar_t* argv[])
else
{
wprintf( L" ERROR: Cannot generate mips for non-power-of-2 volume textures\n" );
goto LError;
return 1;
}
}
else if ( !tMips || info.mipLevels != 1 )
@ -1241,7 +1230,7 @@ int __cdecl wmain(_In_ int argc, _In_z_count_(argc) wchar_t* argv[])
if ( !timage )
{
wprintf( L" ERROR: Memory allocation failed\n" );
goto LError;
return 1;
}
TexMetadata mdata = info;
@ -1250,7 +1239,7 @@ int __cdecl wmain(_In_ int argc, _In_z_count_(argc) wchar_t* argv[])
if ( FAILED(hr) )
{
wprintf( L" FAILED [copy to single level] (%x)\n", hr);
goto LError;
return 1;
}
if ( info.dimension == TEX_DIMENSION_TEXTURE3D )
@ -1262,7 +1251,7 @@ int __cdecl wmain(_In_ int argc, _In_z_count_(argc) wchar_t* argv[])
if ( FAILED(hr) )
{
wprintf( L" FAILED [copy to single level] (%x)\n", hr);
goto LError;
return 1;
}
}
}
@ -1275,7 +1264,7 @@ int __cdecl wmain(_In_ int argc, _In_z_count_(argc) wchar_t* argv[])
if ( FAILED(hr) )
{
wprintf( L" FAILED [copy to single level] (%x)\n", hr);
goto LError;
return 1;
}
}
}
@ -1292,7 +1281,7 @@ int __cdecl wmain(_In_ int argc, _In_z_count_(argc) wchar_t* argv[])
if ( FAILED(hr) )
{
wprintf( L" FAILED [copy compressed to single level] (%x)\n", hr);
goto LError;
return 1;
}
if ( mdata.dimension == TEX_DIMENSION_TEXTURE3D )
@ -1330,7 +1319,7 @@ int __cdecl wmain(_In_ int argc, _In_z_count_(argc) wchar_t* argv[])
if ( !timage )
{
wprintf( L" ERROR: Memory allocation failed\n" );
goto LError;
return 1;
}
if ( info.dimension == TEX_DIMENSION_TEXTURE3D )
@ -1344,7 +1333,7 @@ int __cdecl wmain(_In_ int argc, _In_z_count_(argc) wchar_t* argv[])
if ( FAILED(hr) )
{
wprintf( L" FAILED [mipmaps] (%x)\n", hr);
goto LError;
return 1;
}
auto& tinfo = timage->GetMetadata();
@ -1383,7 +1372,7 @@ int __cdecl wmain(_In_ int argc, _In_z_count_(argc) wchar_t* argv[])
if ( !timage )
{
wprintf( L" ERROR: Memory allocation failed\n" );
goto LError;
return 1;
}
hr = PremultiplyAlpha( img, nimg, info, dwSRGB, *timage );
@ -1447,7 +1436,7 @@ int __cdecl wmain(_In_ int argc, _In_z_count_(argc) wchar_t* argv[])
if ( !timage )
{
wprintf( L" ERROR: Memory allocation failed\n" );
goto LError;
return 1;
}
bool bc6hbc7=false;
@ -1470,7 +1459,7 @@ int __cdecl wmain(_In_ int argc, _In_z_count_(argc) wchar_t* argv[])
if ( !(dwOptions & (1 << OPT_NOGPU) ) )
{
if ( !CreateDevice( &pDevice ) )
if ( !CreateDevice( pDevice.GetAddressOf() ) )
wprintf( L"\nWARNING: DirectCompute is not available, using BC6H / BC7 CPU codec\n" );
}
else
@ -1497,7 +1486,7 @@ int __cdecl wmain(_In_ int argc, _In_z_count_(argc) wchar_t* argv[])
if ( bc6hbc7 && pDevice )
{
hr = Compress( pDevice, img, nimg, info, tformat, dwSRGB, alphaWeight, *timage );
hr = Compress( pDevice.Get(), img, nimg, info, tformat, dwSRGB, alphaWeight, *timage );
}
else
{
@ -1619,26 +1608,5 @@ int __cdecl wmain(_In_ int argc, _In_z_count_(argc) wchar_t* argv[])
if ( non4bc )
wprintf( L"\n WARNING: Direct3D requires BC image to be multiple of 4 in width & height\n" );
nReturn = 0;
goto LDone;
LError:
nReturn = 1;
LDone:
while(pConversion)
{
pConv = pConversion;
pConversion = pConversion->pNext;
delete pConv;
}
if ( pDevice )
{
pDevice->Release();
}
return nReturn;
return 0;
}