drewcassidy/nvidia-texture-tools
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fixes issue 93.

Browse Source
This commit is contained in:
castano 2014-06-11 19:46:17 +00:00
parent 6ade0e27b7
commit f705b2eaa1
1 changed files with 17 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
src/nvtt/tools/compress.cpp
View File

@ -322,7 +322,10 @@ int main(int argc, char *argv[])
const uint rev = version % 100; const uint rev = version % 100;
printf("NVIDIA Texture Tools %u.%u.%u - Copyright NVIDIA Corporation 2007\n\n", major, minor, rev); if (!silent)
{
printf("NVIDIA Texture Tools %u.%u.%u - Copyright NVIDIA Corporation 2007\n\n", major, minor, rev);
}
if (input.isNull()) if (input.isNull())
{ {
@ -577,14 +580,17 @@ int main(int argc, char *argv[])
nvtt::Context context; nvtt::Context context;
context.enableCudaAcceleration(!nocuda); context.enableCudaAcceleration(!nocuda);
printf("CUDA acceleration "); if (!silent)
if (context.isCudaAccelerationEnabled())
{ {
printf("ENABLED\n\n"); printf("CUDA acceleration ");
} if (context.isCudaAccelerationEnabled())
else {
{ printf("ENABLED\n\n");
printf("DISABLED\n\n"); }
else
{
printf("DISABLED\n\n");
}
} }
outputHandler.setTotal(context.estimateSize(inputOptions, compressionOptions)); outputHandler.setTotal(context.estimateSize(inputOptions, compressionOptions));
@ -619,7 +625,9 @@ int main(int argc, char *argv[])
} }
timer.stop(); timer.stop();
printf("\rtime taken: %.3f seconds\n", timer.elapsed()); if (!silent) {
printf("\rtime taken: %.3f seconds\n", timer.elapsed());
}
return EXIT_SUCCESS; return EXIT_SUCCESS;
} }