Merge pull request #343 from stefantalpalaru/cpuflags
SIMD: disable compile time checks
diff --git a/README.md b/README.md
index 068959c..564c033 100644
--- a/README.md
+++ b/README.md
@@ -57,6 +57,9 @@
The encoder optionally uses Zstandard's single source file compressor (in zstd/zstd.c) to support compressing supercompressed KTX2 files. The stand-alone transcoder (in the "transcoder" directory) is a single .cpp source file library which has no 3rd party code dependencies apart from zstd/zstddeclib.c, which is also technically optional. It's only used for decompressing UASTC KTX2 files that use Zstandard.
+### Note about Visual Studio 2022 (compiling under Windows)
+The C/C++ compiler that ships with MSVC 2022 (Platform Toolset v143) is buggy, and it's been this way for years. I've reported the bugs and I've had others verify that yes, it produces buggy code. I've been doing my best to work around the 2022 compiler bugs, but it's probably not worth the effort. Either use the LLVM (clang-cl) Platform Toolset, or switch to Platform Toolset v142 (Visual Studio 2019's compiler). I test with various versions of gcc and clang, and MSVC 2019.
+
### Command Line Compression Tool
The command line tool used to create, validate, and transcode/unpack .basis/.KTX2 files is named "basisu". Run basisu without any parameters for help.
@@ -77,6 +80,14 @@
For Visual Studio 2019, you can now either use the CMakeLists.txt file or the included `basisu.sln` file. Earlier versions of Visual Studio (particularly 2017) should work but aren't actively tested. We develop with the most up to date version of 2019.
+To test the codec:
+
+`basisu -test`
+
+To test the codec in OpenCL mode (must have OpenCL libs/headers/drivers installed, and have compiled OpenCL support in by specifying cmake -D OPENCL=TRUE):
+
+`basisu -test -opencl`
+
To compress a sRGB PNG/BMP/TGA/JPEG image to an ETC1S .KTX2 file:
`basisu -ktx2 x.png`
diff --git a/basisu.manifest b/basisu.manifest
new file mode 100644
index 0000000..9be64fb
--- /dev/null
+++ b/basisu.manifest
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<assembly manifestVersion="1.0" xmlns="urn:schemas-microsoft-com:asm.v1">
+ <assemblyIdentity type="win32" name="..." version="6.0.0.0"/>
+ <application>
+ <windowsSettings>
+ <activeCodePage xmlns="http://schemas.microsoft.com/SMI/2019/WindowsSettings">UTF-8</activeCodePage>
+ </windowsSettings>
+ </application>
+</assembly>
\ No newline at end of file
diff --git a/basisu.vcxproj b/basisu.vcxproj
index 182ed30..df25600 100644
--- a/basisu.vcxproj
+++ b/basisu.vcxproj
@@ -40,13 +40,13 @@
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
<UseDebugLibraries>true</UseDebugLibraries>
- <PlatformToolset>v143</PlatformToolset>
+ <PlatformToolset>v142</PlatformToolset>
<CharacterSet>MultiByte</CharacterSet>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
<UseDebugLibraries>false</UseDebugLibraries>
- <PlatformToolset>v143</PlatformToolset>
+ <PlatformToolset>v142</PlatformToolset>
<WholeProgramOptimization>true</WholeProgramOptimization>
<CharacterSet>MultiByte</CharacterSet>
</PropertyGroup>
@@ -152,6 +152,7 @@
<FloatingPointModel>Fast</FloatingPointModel>
<OmitFramePointers>true</OmitFramePointers>
<FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
+ <EnableEnhancedInstructionSet>AdvancedVectorExtensions</EnableEnhancedInstructionSet>
</ClCompile>
<Link>
<EnableCOMDATFolding>true</EnableCOMDATFolding>
@@ -228,6 +229,9 @@
<None Include="transcoder\basisu_transcoder_tables_dxt1_5.inc" />
<None Include="transcoder\basisu_transcoder_tables_dxt1_6.inc" />
</ItemGroup>
+ <ItemGroup>
+ <Manifest Include="basisu.manifest" />
+ </ItemGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets">
</ImportGroup>
diff --git a/basisu.vcxproj.filters b/basisu.vcxproj.filters
index ee34dce..62107b9 100644
--- a/basisu.vcxproj.filters
+++ b/basisu.vcxproj.filters
@@ -198,4 +198,7 @@
<UniqueIdentifier>{ab12ac82-9c39-494d-a36b-129dd1b2dec5}</UniqueIdentifier>
</Filter>
</ItemGroup>
+ <ItemGroup>
+ <Manifest Include="basisu.manifest" />
+ </ItemGroup>
</Project>
\ No newline at end of file
diff --git a/basisu_tool.cpp b/basisu_tool.cpp
index 9b2a43a..9f43e1c 100644
--- a/basisu_tool.cpp
+++ b/basisu_tool.cpp
@@ -32,6 +32,10 @@
#define MINIZ_NO_ZLIB_COMPATIBLE_NAMES
#include "encoder/basisu_miniz.h"
+#ifdef _WIN32
+#define WIN32_LEAN_AND_MEAN
+#include <windows.h>
+#endif
// Set BASISU_CATCH_EXCEPTIONS if you want exceptions to crash the app, otherwise main() catches them.
#ifndef BASISU_CATCH_EXCEPTIONS
#define BASISU_CATCH_EXCEPTIONS 0
@@ -40,7 +44,7 @@
using namespace basisu;
using namespace buminiz;
-#define BASISU_TOOL_VERSION "1.16.3"
+#define BASISU_TOOL_VERSION "1.16.4"
enum tool_mode
{
@@ -4499,6 +4503,9 @@
int main(int argc, const char** argv)
{
+#ifdef _WIN32
+ SetConsoleOutputCP(CP_UTF8);
+#endif
#ifdef _DEBUG
printf("DEBUG\n");
#endif
