Monogameupgrade

.github/FUNDING.yml

@@ -0,0 +1,3 @@
+# These are supported funding model platforms
+
+github: castano

.github/workflows/build.yml

@@ -0,0 +1,33 @@
+name: build
+
+on: [push, pull_request]
+
+jobs:
+  vs2017:
+    runs-on: windows-2019
+    steps:
+    - uses: actions/checkout@v2
+    - uses: microsoft/setup-msbuild@v1.0.0
+    - name: Build Debug/x64
+      run: msbuild .\project\vc2017\nvtt.sln /property:Configuration=Debug /property:Platform=x64
+    - name: Build Debug/Win32
+      run: msbuild .\project\vc2017\nvtt.sln /property:Configuration=Debug /property:Platform=Win32
+    - name: Build Release/x64
+      run: msbuild .\project\vc2017\nvtt.sln /property:Configuration=Release /property:Platform=x64
+    - name: Build Release/Win32
+      run: msbuild .\project\vc2017\nvtt.sln /property:Configuration=Release /property:Platform=Win32
+
+  unix:
+    strategy:
+      matrix:
+        os: [ubuntu, macos]
+    name: ${{matrix.os}}
+    runs-on: ${{matrix.os}}-latest
+    steps:
+    - uses: actions/checkout@v2
+    - name: make
+      run: |
+        ./configure --debug
+        make VERBOSE=1
+        ./configure --release
+        make VERBOSE=1

.gitignore

@@ -9,6 +9,12 @@
 **/Debug-CUDA/
 **/Release-CUDA/
 *.vcxproj.user
+*.csproj.user
 *.opensdf
 *.sdf
 *.suo
+build
+.vs
+project/nvtt.sublime-workspace
+project/vc12/packages/**/*
+

.travis.yml

@@ -0,0 +1,13 @@
+# NOTE: We use TeamCity for official builds.
+
+language: csharp
+os:
+ - osx
+compiler:
+  - clang
+  - gcc
+script:
+- if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then mkdir build ; fi
+- if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then cd build ; fi
+- if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then cmake -DCMAKE_OSX_ARCHITECTURES="x86_64;arm64" -DNVTT_SHARED="TRUE"  .. ; fi
+- if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then make ; fi

CMakeLists.txt

@@ -5,43 +5,25 @@ ENABLE_TESTING()
 SET(NV_CMAKE_DIR "${NV_SOURCE_DIR}/cmake")
 SET(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${NV_CMAKE_DIR}")
 
-# GCC check (needs -std:c++11 flag)
-#if(CMAKE_COMPILER_IS_GNUCC)
-#	ADD_DEFINITIONS("-std=c++11")
-#ENDIF(CMAKE_COMPILER_IS_GNUCC)
-set (CMAKE_CXX_STANDARD 11)
-
-IF(WIN32)
-	# gnuwin32 paths:
-	SET(GNUWIN32_PATH "${NV_SOURCE_DIR}/extern/gnuwin32")
-	SET(CMAKE_INCLUDE_PATH ${CMAKE_INCLUDE_PATH} "${GNUWIN32_PATH}/include")
-	SET(CMAKE_LIBRARY_PATH ${CMAKE_LIBRARY_PATH} "${GNUWIN32_PATH}/lib")
-
-	# Set GLUT path:
-	SET(GLUT_ROOT_DIR "${NV_SOURCE_DIR}/extern/glut")
-
-	# Set FreeImage path:
-	SET(FREEIMAGE_ROOT_DIR "${NV_SOURCE_DIR}/extern/FreeImage")
-
-ENDIF(WIN32)
+# Compiler check (needs -std:c++11 flag)
+include(CheckCXXCompilerFlag)
+CHECK_CXX_COMPILER_FLAG("-std=c++17" COMPILER_SUPPORTS_CXX17)
+if(COMPILER_SUPPORTS_CXX17)
+    set(CMAKE_CXX_STANDARD 17)
+    set(CMAKE_CXX_STANDARD_REQUIRED ON)
+    set(CMAKE_CXX_EXTENSIONS OFF)
+else()
+    message(FATAL_ERROR "The compiler ${CMAKE_CXX_COMPILER} has no C++11 support. Please use a different C++ compiler.")
+endif()
 
 INCLUDE(${NV_CMAKE_DIR}/OptimalOptions.cmake)
-MESSAGE(STATUS "Setting optimal options")
-MESSAGE(STATUS "  Processor: ${NV_SYSTEM_PROCESSOR}")
-MESSAGE(STATUS "  Compiler Flags: ${CMAKE_CXX_FLAGS}")
 
 IF(CMAKE_BUILD_TYPE MATCHES "debug")
     SET(CMAKE_DEBUG_POSTFIX "_d" CACHE STRING "Postfix for debug build libraries.")
     ADD_DEFINITIONS(-D_DEBUG=1)
 ENDIF()
 
 
-IF(NVTT_SHARED)
-	SET(NVCORE_SHARED TRUE)
-	SET(NVMATH_SHARED TRUE)
-	SET(NVIMAGE_SHARED TRUE)
-ENDIF(NVTT_SHARED)
-
 ADD_SUBDIRECTORY(extern)
 
 ADD_SUBDIRECTORY(src)
@@ -62,10 +44,9 @@ ENDIF(CMAKE_SYSTEM_NAME STREQUAL "Linux")
 SET(CPACK_PACKAGE_NAME "nvidia-texture-tools")
 SET(CPACK_PACKAGE_VERSION_MAJOR "2")
 SET(CPACK_PACKAGE_VERSION_MINOR "1")
-SET(CPACK_PACKAGE_VERSION_PATCH "0")
-SET(CPACK_PACKAGE_VERSION "2.1.0")
-SET(CPACK_PACKAGE_CONTACT "Ignacio Castaño <castano@gmail.com>")
-#SET(CPACK_PACKAGE_VENDOR "NVIDIA Corporation")
+SET(CPACK_PACKAGE_VERSION_PATCH "2")
+SET(CPACK_PACKAGE_VERSION "2.1.2")
+SET(CPACK_PACKAGE_CONTACT "Ignacio Casta�o <castano@gmail.com>")
 SET(CPACK_PACKAGE_DESCRIPTION_SUMMARY "Texture processing tools with support for Direct3D 10 and 11 formats.")
 
 SET(CPACK_PACKAGE_DESCRIPTION_FILE "${NV_SOURCE_DIR}/README.md")
@@ -75,7 +56,7 @@ SET(CPACK_RESOURCE_FILE_LICENSE "${NV_SOURCE_DIR}/LICENSE")
 IF(WIN32)
 	SET(CPACK_NSIS_DISPLAY_NAME "${CPACK_PACKAGE_VENDOR}\\\\NVIDIA Texture Tools 2.1")
 	SET(CPACK_PACKAGE_INSTALL_DIRECTORY "${CPACK_PACKAGE_VENDOR}\\\\NVIDIA Texture Tools 2.1")
-	SET(CPACK_PACKAGE_ICON "${NV_SOURCE_DIR}\\\\project\\\\vc8\\\\nvcompress\\\\nvidia.ico")
+	SET(CPACK_PACKAGE_ICON "${NV_SOURCE_DIR}\\\\project\\\\vc2017\\\\nvcompress\\\\nvidia.ico")
 ENDIF(WIN32)
 
 INCLUDE(CPack)

ChangeLog

@@ -1,3 +1,7 @@
+NVIDIA Texture Tools version 2.1.2
+ * Use ICBC as the main BC1 compressor.
+ * Various fixes.
+
 NVIDIA Texture Tools version 2.1.1
  * Various fixes.
 

LICENSE

@@ -1,6 +1,6 @@
 NVIDIA Texture Tools is licensed under the MIT license.
 
-Copyright (c) 2009-2017 Ignacio Castaño
+Copyright (c) 2009-2020 Ignacio Castaño
 Copyright (c) 2007-2009 NVIDIA Corporation
 
 Permission is hereby granted, free of charge, to any person

README.md

@@ -1,5 +1,44 @@
-NVIDIA Texture Tools
-====================
+# NVTT is discontinued
+
+After more than 14 years maintaining and updating this library on my spare time, I've decided to officially discontinue it and focus my energy on other projects.
+
+When I released NVTT there was very little public information about compression for GPU texture formats. Existing codecs were closed-source, encumbered by patents, and not particularly efficient or high quality. A lot has changed since then. NVTT doesn't support the latest formats anymore, some of its codecs are outdated, and it's source code has aged. Today most IHVs maintain their own open source codecs and several companies develop high quality commercial products around texture compression. 
+
+If you are looking for alternative texture compression tools and processing algorithms I recommend you check these out:
+
+## Open Source Encoders
+
+* I still maintain [A High Quality SIMD BC1 Encoder](https://github.com/castano/icbc).
+* [rgbcx](https://github.com/richgel999/bc7enc/blob/master/rgbcx.h) is another high-performance (but scalar) BC1-5 encoder.
+* [stb_dxt](https://github.com/nothings/stb/blob/master/stb_dxt.h) is a single header library that provides low quality, but fast BC1-5 encoders.
+* [Binomial](https://www.binomial.info/) is an image and texture compression company that develops [Basis a universal texture codec](https://github.com/BinomialLLC/basis_universal) and also has [other open source codecs](https://github.com/BinomialLLC).
+* [Intel ISPC Texture Compressor](https://github.com/GameTechDev/ISPCTextureCompressor) is a set of set of open source SIMD texture encoders that are very fast, but low quality.
+* [AMD Compressonator](https://gpuopen.com/compressonator/) offers various open source encoders that also run on the GPU.
+* [Betsy](https://github.com/darksylinc/betsy/) is a compressor for various GPU formats using compute shaders.
+* For ETC encoders see Google's [Etc2Comp](https://github.com/google/etc2comp), Bartosz Taudul's [etcpak](https://github.com/wolfpld/etcpak) and Rich Geldreich's [rg-etc1](https://github.com/richgel999/rg-etc1).
+* [ARM ASTC Encoder](https://github.com/ARM-software/astc-encoder) is an excellent ASTC encoder.
+* This is [a good overview of the state of texture encoders in 2020](https://aras-p.info/blog/2020/12/08/Texture-Compression-in-2020/).
+
+## Image Processing and IO
+
+* [stb_image_resize](https://github.com/nothings/stb/blob/master/stb_image_resize.h) provides polyphase image resize filters that are similar to what NVTT supports.
+* [Dario Manesku's cube map filtering tool](https://github.com/dariomanesku/cmft) seems like a good alternative for the cube map filtering functions in NVTT.
+* [CubeMapGen](https://gpuopen.com/archived/cubemapgen/) is another source of information for cubemap filtering algorithms, but is now unsupported as well.
+* Deano Calver supports [three tiny libraries](https://deanoc.com/2019/09/tiny) that provide support for DDS and KTX file formats, and pixel format conversion.
+* [stb_image](https://github.com/nothings/stb/blob/master/stb_image.h) and [stb_image_write](https://github.com/nothings/stb/blob/master/stb_image_write.h) are two handy single header libraries to read and write images in various formats.
+* https://github.com/syoyo/tinyexr
+* https://lodev.org/lodepng/
+* [texturec](https://bkaradzic.github.io/bgfx/tools.html#texture-compiler-texturec) is a handy command line tool similar to `nvcompress`, built on top of [bimg](https://github.com/bkaradzic/bimg).
+* The venerable [ImageMagick](https://imagemagick.org/) still provides many valuable tools and utilities.
+
+## Commercial Libraries
+
+* [Oodle Texture](http://www.radgametools.com/oodletexture.htm) is a suite of commercial RDO texture codecs.
+* [NVIDIA Texture Tools exporter](https://developer.nvidia.com/nvidia-texture-tools-exporter) is based on a private fork of this project and offers additional GPU accelerated codecs, but it's not open source.
+
+-------------------------------
+
+# NVIDIA Texture Tools [![Actions Status](https://github.com/castano/nvidia-texture-tools/workflows/build/badge.svg)](https://github.com/castano/nvidia-texture-tools/actions) ![MIT](https://img.shields.io/badge/license-MIT-blue.svg) [![GitHub](https://img.shields.io/badge/repo-github-green.svg)](https://github.com/castano/nvidia-texture-tools)
 
 The NVIDIA Texture Tools is a collection of image processing and texture 
 manipulation tools, designed to be integrated in game tools and asset 
@@ -11,9 +50,7 @@ conversion, and DXT compression.
 
 ### How to build (Windows)
 
-Open `project/vc12/thekla.sln` using Visual Studio.
-
-Solutions for previous versions are also available, but they may not be up to date.
+Use the provided Visual Studio 2017 solution `project/vc2017/thekla.sln`.
 
 
 ### How to build (Linux/OSX)
@@ -32,13 +69,13 @@ $ sudo make install
 To use the NVIDIA Texture Tools in your own applications you just have to
 include the following header file:
 
-src/nvtt/nvtt.h
+[src/nvtt/nvtt.h](https://github.com/castano/nvidia-texture-tools/blob/master/src/nvtt/nvtt.h)
 
 And include the nvtt library in your projects. 
 
 The following file contains a simple example that shows how to use the library:
 
-src/nvtt/tools/compress.cpp
+[src/nvtt/tools/compress.cpp](https://github.com/castano/nvidia-texture-tools/blob/master/src/nvtt/tools/compress.cpp)
 
 Detailed documentation of the API can be found at:
 

VERSION

@@ -1 +1 @@
-2.1.1
+2.1.2