Skip to content

Commit d3f7637

Browse files
committed
CLI updates
1 parent 6732bc3 commit d3f7637

File tree

5 files changed

+418
-142
lines changed

5 files changed

+418
-142
lines changed

Compressonator/Applications/CompressonatorCLI/Source/CompressonatorCLI.cpp

Lines changed: 13 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
//=====================================================================
2-
// Copyright 2019 (c), Advanced Micro Devices, Inc. All rights reserved.
2+
// Copyright 2020 (c), Advanced Micro Devices, Inc. All rights reserved.
33
//
44
// Permission is hereby granted, free of charge, to any person obtaining a copy
55
// of this software and associated documentation files(the "Software"), to deal
@@ -69,12 +69,12 @@ void AboutCompressonator()
6969
printf("------------------------------------------------\n");
7070
// current build release
7171
if (VERSION_MINOR_MAJOR)
72-
printf("CompressonatorCLI V%d.%d.%d Copyright AMD 2019\n", VERSION_MAJOR_MAJOR, VERSION_MAJOR_MINOR, VERSION_MINOR_MAJOR);
72+
printf("CompressonatorCLI V%d.%d.%d Copyright AMD 2020\n", VERSION_MAJOR_MAJOR, VERSION_MAJOR_MINOR, VERSION_MINOR_MAJOR);
7373
else
7474
{
7575
// Keep track of Customer patches from last release to current
7676
// This is what is shown when you build the exe outside of the automated Build System (such as Jenkins)
77-
printf("CompressonatorCLI V3.2.0 Copyright AMD 2019\n");
77+
printf("CompressonatorCLI V4.0.0 Copyright AMD 2020\n");
7878
}
7979
printf("------------------------------------------------\n");
8080
printf("\n");
@@ -89,7 +89,7 @@ void PrintUsage()
8989
printf("-nomipmap Turns off Mipmap generation\n");
9090
printf("-mipsize <size> The size in pixels used to determine\n");
9191
printf(" how many mip levels to generate\n");
92-
printf("-miplevels <Level> Sets Mips Level for output,\n");
92+
printf("-miplevels <Level> Sets Mips Level for output, range is 1 to 20\n");
9393
printf(" (mipSize overides this option): default is 1\n");
9494
printf("Compression options:\n\n");
9595
printf("-fs <format> Optionally specifies the source texture format to use\n");
@@ -100,7 +100,7 @@ void PrintUsage()
100100
printf(" be compatible \n");
101101
printf(" with the sources format,decompress formats are typically\n");
102102
printf(" set to ARGB_8888 or ARGB_32F\n");
103-
printf("-EncodeWith Compression with CPU or HPC\n");
103+
printf("-EncodeWith Compression with CPU, HPC, OCL or DXC\n");
104104
#ifdef _WIN32
105105
printf("-DecodeWith GPU based decompression using OpenGL, DirectX or Vulkan\n");
106106
#endif
@@ -241,12 +241,13 @@ void PrintUsage()
241241
printf(" between 2 images with same size. Analysis_Result.xml file will be generated.\n");
242242
printf("\n\n");
243243
printf("-diff_image <image1> <image2> Generate difference between 2 images with same size \n");
244-
printf(
245-
" A .bmp file will be generated. Please use compressonator GUI to increase the contrast to view the diff "
246-
"pixels.\n");
244+
printf(" A .bmp file will be generated. Please use compressonator GUI to increase the contrast to view the diff pixels.\n");
247245
printf("-log Logs process information to a process_results.txt file containing\n");
248246
printf(" file info, performance data, SSIM, PSNR and MSE. \n");
247+
printf("-logcsv Logs process information to a process_results.csv file containing\n");
248+
printf(" file info, performance data, SSIM, PSNR and MSE. \n");
249249
printf("-logfile <filename> Logs process information to a user defined text file\n");
250+
printf("-logcsvfile <filename> Logs process information to a user defined csv file\n");
250251
printf("\n\n");
251252
printf("-imageprops <image> Print image properties of image files specifies. \n");
252253
printf("\n\n");
@@ -264,6 +265,9 @@ void PrintUsage()
264265
printf("CompressonatorCLI.exe -fd BC7 -NumTheads 16 image.bmp result.dds\n");
265266
printf("CompressonatorCLI.exe -fd BC7 -ff PNG -fx KTX ./source_dir/ ./dist_dir/\n");
266267
printf("CompressonatorCLI.exe -fd BC6H image.exr result.exr\n\n");
268+
printf("Example compression using GPU:\n\n");
269+
printf("CompressonatorCLI.exe -fd BC1 -EncodeWith OCL image.bmp result.dds \n");
270+
printf("CompressonatorCLI.exe -fd BC1 -EncodeWith DXC image.bmp result.dds \n");
267271
printf("Example decompression from compressed image using CPU:\n\n");
268272
printf("CompressonatorCLI.exe result.dds image.bmp\n\n");
269273
printf("Example decompression from compressed image using GPU:\n\n");
@@ -294,6 +298,7 @@ void PrintUsage()
294298
printf("Specifies settings :\n\n");
295299
printf("CompressonatorCLI.exe -meshopt -optVCacheSize 32 -optOverdrawACMRThres 1.03 -optVFetch 0 source.gltf dest.gltf\n");
296300
#endif
301+
printf("For additional help go to Documents folder and type index.htlm\n");
297302
}
298303

299304
bool ProgressCallback(float fProgress, CMP_DWORD_PTR pUser1, CMP_DWORD_PTR pUser2)

Compressonator/Applications/CompressonatorCLI/Source/CompressonatorCLI_Documentation.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
#define AMDCOMPRESS_DOC_H
33

44
//=====================================================================
5-
// Copyright 2019 (c), Advanced Micro Devices, Inc. All rights reserved.
5+
// Copyright 2020 (c), Advanced Micro Devices, Inc. All rights reserved.
66
//
77
// Permission is hereby granted, free of charge, to any person obtaining a copy
88
// of this software and associated documentation files(the "Software"), to deal

Compressonator/Applications/CompressonatorCLI/VS2015/Compressonator.vcxproj

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -106,7 +106,7 @@
106106
<FloatingPointModel>Precise</FloatingPointModel>
107107
<OpenMPSupport>
108108
</OpenMPSupport>
109-
<AdditionalIncludeDirectories>$(Compressonator_RootDev)\CMP_Framework;$(Compressonator_RootDev)\CMP_Framework\Common\half;$(Compressonator_RootDev)\CMP_CompressonatorLib;./;../../_Plugins/Common/gltf;../../_Plugins/Common/json;../../_Plugins/CMesh/mesh_optimizer;../../_Libs/CMP_MeshCompressor/Draco/src;$(Compressonator_RootDev)/Applications/_Plugins/Common/;$(Compressonator_RootDev)/Applications/_Libs/CMP_Math;$(Compressonator_RootDev)/Applications/_Libs/CMP_MeshOptimizer/;$(Compressonator_RootDev)/Applications/_Libs/GPU_Decode;$(Compressonator_RootDev)GPU_Decode/;$(Compressonator_RootDev)/Applications/_Plugins/CImage/BMP/;$(Compressonator_RootDev)/Header/Codec/ASTC/ARM/;$(Compressonator_RootDev)/Header/Codec/ASTC/;$(Compressonator_APPSDK)/include/;$(Compressonator_GLEW)/include/;$(Compressonator_BOOST)/;$(Compressonator_BOOST)/Include/shared/;$(Compressonator_BOOST)/Include/um/;$(Compressonator_BOOST)/Include/winrt/;$(Compressonator_OPENEXR)/$(SolutionName)/$(Platform)/include/OpenEXR/;$(Compressonator_ILMBASE)/$(SolutionName)/$(Platform)/include/OpenEXR/;$(Compressonator_QT)/include/;$(Compressonator_QT)/include/QtGui/;$(Compressonator_QT)/include/QtCore/;$(Compressonator_RootDev)/Source/;$(Compressonator_RootDev)/CMP_Core/shaders;$(Compressonator_RootDev)/CMP_Core/source</AdditionalIncludeDirectories>
109+
<AdditionalIncludeDirectories>./;$(Compressonator_RootDev)/;$(Compressonator_RootDev)\CMP_Framework;$(Compressonator_RootDev)\CMP_Framework\Common\half;$(Compressonator_RootDev)\CMP_CompressonatorLib;$(Compressonator_RootDev)/Applications/_Plugins/Common/gltf;$(Compressonator_RootDev)/Applications/_Plugins/Common/json;$(Compressonator_RootDev)/Applications/_Plugins/CMesh/mesh_optimizer;$(Compressonator_RootDev)/Applications/_Libs/CMP_MeshCompressor/Draco/src;$(Compressonator_RootDev)/Applications/_Plugins/Common/;$(Compressonator_RootDev)/Applications/_Libs/CMP_Math;$(Compressonator_RootDev)/Applications/_Libs/CMP_MeshOptimizer/;$(Compressonator_RootDev)/Applications/_Libs/GPU_Decode;$(Compressonator_RootDev)GPU_Decode/;$(Compressonator_RootDev)/Applications/_Plugins/CImage/BMP/;$(Compressonator_RootDev)/Header/Codec/ASTC/ARM/;$(Compressonator_RootDev)/Header/Codec/ASTC/;$(Compressonator_APPSDK)/include/;$(Compressonator_GLEW)/include/;$(Compressonator_BOOST)/;$(Compressonator_BOOST)/Include/shared/;$(Compressonator_BOOST)/Include/um/;$(Compressonator_BOOST)/Include/winrt/;$(Compressonator_OPENEXR)/$(SolutionName)/$(Platform)/include/OpenEXR/;$(Compressonator_ILMBASE)/$(SolutionName)/$(Platform)/include/OpenEXR/;$(Compressonator_QT)/include/;$(Compressonator_QT)/include/QtGui/;$(Compressonator_QT)/include/QtCore/;$(Compressonator_RootDev)/Source/;$(Compressonator_RootDev)/CMP_Core/shaders;$(Compressonator_RootDev)/CMP_Core/source</AdditionalIncludeDirectories>
110110
<RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
111111
</ClCompile>
112112
<Link>
@@ -133,7 +133,7 @@
133133
<FloatingPointModel>Precise</FloatingPointModel>
134134
<OpenMPSupport>
135135
</OpenMPSupport>
136-
<AdditionalIncludeDirectories>$(Compressonator_RootDev)\CMP_Framework;$(Compressonator_RootDev)\CMP_Framework\Common\half;$(Compressonator_RootDev)\CMP_CompressonatorLib;./;../../_Plugins/Common/gltf;../../_Plugins/Common/json;../../_Plugins/CMesh/mesh_optimizer;../../_Libs/CMP_MeshCompressor/Draco/src;$(Compressonator_RootDev)/Applications/_Plugins/Common/;$(Compressonator_RootDev)/Applications/_Libs/CMP_Math;$(Compressonator_RootDev)/Applications/_Libs/CMP_MeshOptimizer/;$(Compressonator_RootDev)/Applications/_Libs/GPU_Decode;$(Compressonator_RootDev)GPU_Decode/;$(Compressonator_RootDev)/Applications/_Plugins/CImage/BMP/;$(Compressonator_RootDev)/Header/Codec/ASTC/ARM/;$(Compressonator_RootDev)/Header/Codec/ASTC/;$(Compressonator_APPSDK)/include/;$(Compressonator_GLEW)/include/;$(Compressonator_BOOST)/;$(Compressonator_BOOST)/Include/shared/;$(Compressonator_BOOST)/Include/um/;$(Compressonator_BOOST)/Include/winrt/;$(Compressonator_OPENEXR)/$(SolutionName)/$(Platform)/include/OpenEXR/;$(Compressonator_ILMBASE)/$(SolutionName)/$(Platform)/include/OpenEXR/;$(Compressonator_QT)/include/;$(Compressonator_QT)/include/QtGui/;$(Compressonator_QT)/include/QtCore/;$(Compressonator_RootDev)/Source/;$(Compressonator_RootDev)/CMP_Core/shaders;$(Compressonator_RootDev)/CMP_Core/source</AdditionalIncludeDirectories>
136+
<AdditionalIncludeDirectories>./;$(Compressonator_RootDev)/;$(Compressonator_RootDev)\CMP_Framework;$(Compressonator_RootDev)\CMP_Framework\Common\half;$(Compressonator_RootDev)\CMP_CompressonatorLib;$(Compressonator_RootDev)/Applications/_Plugins/Common/gltf;$(Compressonator_RootDev)/Applications/_Plugins/Common/json;$(Compressonator_RootDev)/Applications/_Plugins/CMesh/mesh_optimizer;$(Compressonator_RootDev)/Applications/_Libs/CMP_MeshCompressor/Draco/src;$(Compressonator_RootDev)/Applications/_Plugins/Common/;$(Compressonator_RootDev)/Applications/_Libs/CMP_Math;$(Compressonator_RootDev)/Applications/_Libs/CMP_MeshOptimizer/;$(Compressonator_RootDev)/Applications/_Libs/GPU_Decode;$(Compressonator_RootDev)GPU_Decode/;$(Compressonator_RootDev)/Applications/_Plugins/CImage/BMP/;$(Compressonator_RootDev)/Header/Codec/ASTC/ARM/;$(Compressonator_RootDev)/Header/Codec/ASTC/;$(Compressonator_APPSDK)/include/;$(Compressonator_GLEW)/include/;$(Compressonator_BOOST)/;$(Compressonator_BOOST)/Include/shared/;$(Compressonator_BOOST)/Include/um/;$(Compressonator_BOOST)/Include/winrt/;$(Compressonator_OPENEXR)/$(SolutionName)/$(Platform)/include/OpenEXR/;$(Compressonator_ILMBASE)/$(SolutionName)/$(Platform)/include/OpenEXR/;$(Compressonator_QT)/include/;$(Compressonator_QT)/include/QtGui/;$(Compressonator_QT)/include/QtCore/;$(Compressonator_RootDev)/Source/;$(Compressonator_RootDev)/CMP_Core/shaders;$(Compressonator_RootDev)/CMP_Core/source</AdditionalIncludeDirectories>
137137
<RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
138138
</ClCompile>
139139
<Link>
@@ -160,7 +160,7 @@
160160
<EnableEnhancedInstructionSet>StreamingSIMDExtensions2</EnableEnhancedInstructionSet>
161161
<FloatingPointModel>Fast</FloatingPointModel>
162162
<OpenMPSupport>true</OpenMPSupport>
163-
<AdditionalIncludeDirectories>$(Compressonator_RootDev)\CMP_Framework;$(Compressonator_RootDev)\CMP_Framework\Common\half;$(Compressonator_RootDev)\CMP_CompressonatorLib;./;../../_Plugins/Common/gltf;../../_Plugins/Common/json;../../_Plugins/CMesh/mesh_optimizer;../../_Libs/CMP_MeshCompressor/Draco/src;$(Compressonator_RootDev)/Applications/_Plugins/Common/;$(Compressonator_RootDev)/Applications/_Libs/CMP_Math;$(Compressonator_RootDev)/Applications/_Libs/CMP_MeshOptimizer/;$(Compressonator_RootDev)/Applications/_Libs/GPU_Decode;$(Compressonator_RootDev)GPU_Decode/;$(Compressonator_RootDev)/Applications/_Plugins/CImage/BMP/;$(Compressonator_RootDev)/Header/Codec/ASTC/ARM/;$(Compressonator_RootDev)/Header/Codec/ASTC/;$(Compressonator_APPSDK)/include/;$(Compressonator_GLEW)/include/;$(Compressonator_BOOST)/;$(Compressonator_BOOST)/Include/shared/;$(Compressonator_BOOST)/Include/um/;$(Compressonator_BOOST)/Include/winrt/;$(Compressonator_OPENEXR)/$(SolutionName)/$(Platform)/include/OpenEXR/;$(Compressonator_ILMBASE)/$(SolutionName)/$(Platform)/include/OpenEXR/;$(Compressonator_QT)/include/;$(Compressonator_QT)/include/QtGui/;$(Compressonator_QT)/include/QtCore/;$(Compressonator_RootDev)/Source/;$(Compressonator_RootDev)/CMP_Core/shaders;$(Compressonator_RootDev)/CMP_Core/source</AdditionalIncludeDirectories>
163+
<AdditionalIncludeDirectories>./;$(Compressonator_RootDev)/;$(Compressonator_RootDev)\CMP_Framework;$(Compressonator_RootDev)\CMP_Framework\Common\half;$(Compressonator_RootDev)\CMP_CompressonatorLib;$(Compressonator_RootDev)/Applications/_Plugins/Common/gltf;$(Compressonator_RootDev)/Applications/_Plugins/Common/json;$(Compressonator_RootDev)/Applications/_Plugins/CMesh/mesh_optimizer;$(Compressonator_RootDev)/Applications/_Libs/CMP_MeshCompressor/Draco/src;$(Compressonator_RootDev)/Applications/_Plugins/Common/;$(Compressonator_RootDev)/Applications/_Libs/CMP_Math;$(Compressonator_RootDev)/Applications/_Libs/CMP_MeshOptimizer/;$(Compressonator_RootDev)/Applications/_Libs/GPU_Decode;$(Compressonator_RootDev)GPU_Decode/;$(Compressonator_RootDev)/Applications/_Plugins/CImage/BMP/;$(Compressonator_RootDev)/Header/Codec/ASTC/ARM/;$(Compressonator_RootDev)/Header/Codec/ASTC/;$(Compressonator_APPSDK)/include/;$(Compressonator_GLEW)/include/;$(Compressonator_BOOST)/;$(Compressonator_BOOST)/Include/shared/;$(Compressonator_BOOST)/Include/um/;$(Compressonator_BOOST)/Include/winrt/;$(Compressonator_OPENEXR)/$(SolutionName)/$(Platform)/include/OpenEXR/;$(Compressonator_ILMBASE)/$(SolutionName)/$(Platform)/include/OpenEXR/;$(Compressonator_QT)/include/;$(Compressonator_QT)/include/QtGui/;$(Compressonator_QT)/include/QtCore/;$(Compressonator_RootDev)/Source/;$(Compressonator_RootDev)/CMP_Core/shaders;$(Compressonator_RootDev)/CMP_Core/source</AdditionalIncludeDirectories>
164164
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
165165
</ClCompile>
166166
<Link>
@@ -195,7 +195,7 @@
195195
<EnableEnhancedInstructionSet>StreamingSIMDExtensions2</EnableEnhancedInstructionSet>
196196
<FloatingPointModel>Fast</FloatingPointModel>
197197
<OpenMPSupport>true</OpenMPSupport>
198-
<AdditionalIncludeDirectories>$(Compressonator_RootDev)\CMP_Framework;$(Compressonator_RootDev)\CMP_Framework\Common\half;$(Compressonator_RootDev)\CMP_CompressonatorLib;./;../../_Plugins/Common/gltf;../../_Plugins/Common/json;../../_Plugins/CMesh/mesh_optimizer;../../_Libs/CMP_MeshCompressor/Draco/src;$(Compressonator_RootDev)/Applications/_Plugins/Common/;$(Compressonator_RootDev)/Applications/_Libs/CMP_Math;$(Compressonator_RootDev)/Applications/_Libs/CMP_MeshOptimizer/;$(Compressonator_RootDev)/Applications/_Libs/GPU_Decode;$(Compressonator_RootDev)GPU_Decode/;$(Compressonator_RootDev)/Applications/_Plugins/CImage/BMP/;$(Compressonator_RootDev)/Header/Codec/ASTC/ARM/;$(Compressonator_RootDev)/Header/Codec/ASTC/;$(Compressonator_APPSDK)/include/;$(Compressonator_GLEW)/include/;$(Compressonator_BOOST)/;$(Compressonator_BOOST)/Include/shared/;$(Compressonator_BOOST)/Include/um/;$(Compressonator_BOOST)/Include/winrt/;$(Compressonator_OPENEXR)/$(SolutionName)/$(Platform)/include/OpenEXR/;$(Compressonator_ILMBASE)/$(SolutionName)/$(Platform)/include/OpenEXR/;$(Compressonator_QT)/include/;$(Compressonator_QT)/include/QtGui/;$(Compressonator_QT)/include/QtCore/;$(Compressonator_RootDev)/Source/;$(Compressonator_RootDev)/CMP_Core/shaders;$(Compressonator_RootDev)/CMP_Core/source</AdditionalIncludeDirectories>
198+
<AdditionalIncludeDirectories>./;$(Compressonator_RootDev)/;$(Compressonator_RootDev)\CMP_Framework;$(Compressonator_RootDev)\CMP_Framework\Common\half;$(Compressonator_RootDev)\CMP_CompressonatorLib;$(Compressonator_RootDev)/Applications/_Plugins/Common/gltf;$(Compressonator_RootDev)/Applications/_Plugins/Common/json;$(Compressonator_RootDev)/Applications/_Plugins/CMesh/mesh_optimizer;$(Compressonator_RootDev)/Applications/_Libs/CMP_MeshCompressor/Draco/src;$(Compressonator_RootDev)/Applications/_Plugins/Common/;$(Compressonator_RootDev)/Applications/_Libs/CMP_Math;$(Compressonator_RootDev)/Applications/_Libs/CMP_MeshOptimizer/;$(Compressonator_RootDev)/Applications/_Libs/GPU_Decode;$(Compressonator_RootDev)GPU_Decode/;$(Compressonator_RootDev)/Applications/_Plugins/CImage/BMP/;$(Compressonator_RootDev)/Header/Codec/ASTC/ARM/;$(Compressonator_RootDev)/Header/Codec/ASTC/;$(Compressonator_APPSDK)/include/;$(Compressonator_GLEW)/include/;$(Compressonator_BOOST)/;$(Compressonator_BOOST)/Include/shared/;$(Compressonator_BOOST)/Include/um/;$(Compressonator_BOOST)/Include/winrt/;$(Compressonator_OPENEXR)/$(SolutionName)/$(Platform)/include/OpenEXR/;$(Compressonator_ILMBASE)/$(SolutionName)/$(Platform)/include/OpenEXR/;$(Compressonator_QT)/include/;$(Compressonator_QT)/include/QtGui/;$(Compressonator_QT)/include/QtCore/;$(Compressonator_RootDev)/Source/;$(Compressonator_RootDev)/CMP_Core/shaders;$(Compressonator_RootDev)/CMP_Core/source</AdditionalIncludeDirectories>
199199
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
200200
<BrowseInformation>true</BrowseInformation>
201201
</ClCompile>

0 commit comments

Comments
 (0)