NVTT: Fixed GCC warnings.

3rdparty/nvtt/bc6h/bits.h

@@ -9,13 +9,12 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 
 See the License for the specific language governing permissions and limitations under the License.
 */
-#pragma once
 #ifndef _ZOH_BITS_H
 #define _ZOH_BITS_H
 
 // read/write a bitstream
 
-#include "nvcore/Debug.h"
+#include "nvcore/debug.h"
 
 namespace ZOH {
 

3rdparty/nvtt/bc6h/tile.h

@@ -9,12 +9,11 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 
 See the License for the specific language governing permissions and limitations under the License.
 */
-#pragma once
 #ifndef _ZOH_TILE_H
 #define _ZOH_TILE_H
 
 #include "zoh_utils.h"
-#include "nvmath/Vector.h"
+#include "nvmath/vector.h"
 #include <math.h>
 
 namespace ZOH {

3rdparty/nvtt/bc6h/zoh_utils.cpp

@@ -13,7 +13,7 @@ See the License for the specific language governing permissions and limitations
 // Utility and common routines
 
 #include "zoh_utils.h"
-#include "nvmath/Vector.inl"
+#include "nvmath/vector.inl"
 #include <math.h>
 
 using namespace nv;

3rdparty/nvtt/bc6h/zoh_utils.h

@@ -11,11 +11,10 @@ See the License for the specific language governing permissions and limitations
 */
 
 // utility class holding common routines
-#pragma once
 #ifndef _ZOH_UTILS_H
 #define _ZOH_UTILS_H
 
-#include "nvmath/Vector.h"
+#include "nvmath/vector.h"
 
 namespace ZOH {
 

3rdparty/nvtt/bc6h/zohone.cpp

@@ -18,8 +18,8 @@ See the License for the specific language governing permissions and limitations
 #include "zoh.h"
 #include "zoh_utils.h"
 
-#include "nvmath/Vector.inl"
-#include "nvmath/Fitting.h"
+#include "nvmath/vector.inl"
+#include "nvmath/fitting.h"
 
 #include <string.h> // strlen
 #include <float.h> // FLT_MAX

3rdparty/nvtt/bc6h/zohtwo.cpp

@@ -42,8 +42,8 @@ See the License for the specific language governing permissions and limitations
 #include "zoh.h"
 #include "zoh_utils.h"
 
-#include "nvmath/Fitting.h"
-#include "nvmath/Vector.inl"
+#include "nvmath/fitting.h"
+#include "nvmath/vector.inl"
 
 #include <string.h> // strlen
 #include <float.h> // FLT_MAX

3rdparty/nvtt/bc7/avpcl.cpp

@@ -14,9 +14,9 @@ See the License for the specific language governing permissions and limitations
 
 #include "tile.h"
 #include "avpcl.h"
-#include "nvcore/Debug.h"
-#include "nvmath/Vector.inl"
-#include <cstring>
+#include "nvcore/debug.h"
+#include "nvmath/vector.inl"
+#include <string.h>
 #include <float.h>
 
 using namespace nv;

3rdparty/nvtt/bc7/avpcl_mode0.cpp

@@ -17,13 +17,13 @@ See the License for the specific language governing permissions and limitations
 #include "bits.h"
 #include "tile.h"
 #include "avpcl.h"
-#include "nvcore/Debug.h"
-#include "nvmath/Vector.inl"
-#include "nvmath/Matrix.inl"
-#include "nvmath/Fitting.h"
+#include "nvcore/debug.h"
+#include "nvmath/vector.inl"
+#include "nvmath/matrix.inl"
+#include "nvmath/fitting.h"
 #include "avpcl_utils.h"
 #include "endpts.h"
-#include <cstring>
+#include <string.h>
 #include <float.h>
 
 #include "shapes_three.h"

3rdparty/nvtt/bc7/avpcl_mode1.cpp

@@ -17,13 +17,13 @@ See the License for the specific language governing permissions and limitations
 #include "bits.h"
 #include "tile.h"
 #include "avpcl.h"
-#include "nvcore/Debug.h"
-#include "nvmath/Vector.inl"
-#include "nvmath/Matrix.inl"
-#include "nvmath/Fitting.h"
+#include "nvcore/debug.h"
+#include "nvmath/vector.inl"
+#include "nvmath/matrix.inl"
+#include "nvmath/fitting.h"
 #include "avpcl_utils.h"
 #include "endpts.h"
-#include <cstring>
+#include <string.h>
 #include <float.h>
 
 #include "shapes_two.h"

3rdparty/nvtt/bc7/avpcl_mode2.cpp

@@ -17,13 +17,13 @@ See the License for the specific language governing permissions and limitations
 #include "bits.h"
 #include "tile.h"
 #include "avpcl.h"
-#include "nvcore/Debug.h"
-#include "nvmath/Vector.inl"
-#include "nvmath/Matrix.inl"
-#include "nvmath/Fitting.h"
+#include "nvcore/debug.h"
+#include "nvmath/vector.inl"
+#include "nvmath/matrix.inl"
+#include "nvmath/fitting.h"
 #include "avpcl_utils.h"
 #include "endpts.h"
-#include <cstring>
+#include <string.h>
 #include <float.h>
 
 #include "shapes_three.h"

3rdparty/nvtt/bc7/avpcl_mode3.cpp

@@ -17,13 +17,13 @@ See the License for the specific language governing permissions and limitations
 #include "bits.h"
 #include "tile.h"
 #include "avpcl.h"
-#include "nvcore/Debug.h"
-#include "nvmath/Vector.inl"
-#include "nvmath/Matrix.inl"
-#include "nvmath/Fitting.h"
+#include "nvcore/debug.h"
+#include "nvmath/vector.inl"
+#include "nvmath/matrix.inl"
+#include "nvmath/fitting.h"
 #include "avpcl_utils.h"
 #include "endpts.h"
-#include <cstring>
+#include <string.h>
 #include <float.h>
 
 #include "shapes_two.h"

3rdparty/nvtt/bc7/avpcl_mode4.cpp

@@ -17,13 +17,13 @@ See the License for the specific language governing permissions and limitations
 #include "bits.h"
 #include "tile.h"
 #include "avpcl.h"
-#include "nvcore/Debug.h"
-#include "nvmath/Vector.inl"
-#include "nvmath/Matrix.inl"
-#include "nvmath/Fitting.h"
+#include "nvcore/debug.h"
+#include "nvmath/vector.inl"
+#include "nvmath/matrix.inl"
+#include "nvmath/fitting.h"
 #include "avpcl_utils.h"
 #include "endpts.h"
-#include <cstring>
+#include <string.h>
 #include <float.h>
 
 using namespace nv;

3rdparty/nvtt/bc7/avpcl_mode5.cpp

@@ -17,13 +17,13 @@ See the License for the specific language governing permissions and limitations
 #include "bits.h"
 #include "tile.h"
 #include "avpcl.h"
-#include "nvcore/Debug.h"
-#include "nvmath/Vector.inl"
-#include "nvmath/Matrix.inl"
-#include "nvmath/Fitting.h"
+#include "nvcore/debug.h"
+#include "nvmath/vector.inl"
+#include "nvmath/matrix.inl"
+#include "nvmath/fitting.h"
 #include "avpcl_utils.h"
 #include "endpts.h"
-#include <cstring>
+#include <string.h>
 #include <float.h>
 
 using namespace nv;

3rdparty/nvtt/bc7/avpcl_mode6.cpp

@@ -17,13 +17,13 @@ See the License for the specific language governing permissions and limitations
 #include "bits.h"
 #include "tile.h"
 #include "avpcl.h"
-#include "nvcore/Debug.h"
-#include "nvmath/Vector.inl"
-#include "nvmath/Matrix.inl"
-#include "nvmath/Fitting.h"
+#include "nvcore/debug.h"
+#include "nvmath/vector.inl"
+#include "nvmath/matrix.inl"
+#include "nvmath/fitting.h"
 #include "avpcl_utils.h"
 #include "endpts.h"
-#include <cstring>
+#include <string.h>
 #include <float.h>
 
 using namespace nv;

3rdparty/nvtt/bc7/avpcl_mode7.cpp

@@ -17,13 +17,13 @@ See the License for the specific language governing permissions and limitations
 #include "bits.h"
 #include "tile.h"
 #include "avpcl.h"
-#include "nvcore/Debug.h"
-#include "nvmath/Vector.inl"
-#include "nvmath/Matrix.inl"
-#include "nvmath/Fitting.h"
+#include "nvcore/debug.h"
+#include "nvmath/vector.inl"
+#include "nvmath/matrix.inl"
+#include "nvmath/fitting.h"
 #include "avpcl_utils.h"
 #include "endpts.h"
-#include <cstring>
+#include <string.h>
 #include <float.h>
 
 #include "shapes_two.h"

3rdparty/nvtt/bc7/avpcl_utils.cpp

@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations
 
 #include "avpcl_utils.h"
 #include "avpcl.h"
-#include "nvmath/Vector.inl"
+#include "nvmath/vector.inl"
 #include <math.h>
 
 using namespace nv;

3rdparty/nvtt/bc7/avpcl_utils.h

@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations
 #ifndef _AVPCL_UTILS_H
 #define _AVPCL_UTILS_H
 
-#include "nvmath/Vector.h"
+#include "nvmath/vector.h"
 
 namespace AVPCL {
 
@@ -58,4 +58,4 @@ public:
 
 }
 
-#endif
+#endif

3rdparty/nvtt/bc7/bits.h

@@ -15,7 +15,7 @@ See the License for the specific language governing permissions and limitations
 
 // read/write a bitstream
 
-#include "nvcore/Debug.h"
+#include "nvcore/debug.h"
 
 namespace AVPCL {
 
@@ -73,4 +73,4 @@ private:
 
 }
 
-#endif
+#endif

3rdparty/nvtt/bc7/endpts.h

@@ -15,7 +15,7 @@ See the License for the specific language governing permissions and limitations
 
 // endpoint definitions and routines to search through endpoint space
 
-#include "nvmath/Vector.h"
+#include "nvmath/vector.h"
 
 namespace AVPCL {
 

3rdparty/nvtt/bc7/tile.h

@@ -13,7 +13,7 @@ See the License for the specific language governing permissions and limitations
 #ifndef _AVPCL_TILE_H
 #define _AVPCL_TILE_H
 
-#include "nvmath/Vector.h"
+#include "nvmath/vector.h"
 #include <math.h>
 #include "avpcl_utils.h"
 
@@ -38,4 +38,4 @@ public:
 
 }
 
-#endif
+#endif

3rdparty/nvtt/nvcore/defsgnuclinux.h

@@ -5,6 +5,10 @@
 #include <stdint.h> // uint8_t, int8_t, ... uintptr_t
 #include <stddef.h> // operator new, size_t, NULL
 
+#ifndef __STDC_VERSION__
+#	define __STDC_VERSION__ 0
+#endif
+
 // Function linkage
 #define DLL_IMPORT
 #if __GNUC__ >= 4

3rdparty/nvtt/nvcore/memory.h

@@ -4,6 +4,7 @@
 #define NV_CORE_MEMORY_H
 
 #include "nvcore.h"
+#include <malloc.h>
 
 namespace nv {
 

3rdparty/nvtt/nvcore/nvcore.h

@@ -3,6 +3,9 @@
 #ifndef NV_CORE_H
 #define NV_CORE_H
 
+#define NVCORE_SHARED 0
+#define NV_NO_ASSERT 0
+
 // Function linkage
 #if NVCORE_SHARED
 #ifdef NVCORE_EXPORTS
@@ -17,22 +20,9 @@
 #define NVCORE_CLASS
 #endif // NVCORE_SHARED
 
-
 // Platform definitions
 #include "posh.h"
 
-// OS:
-// NV_OS_WIN32
-// NV_OS_WIN64
-// NV_OS_MINGW
-// NV_OS_CYGWIN
-// NV_OS_LINUX
-// NV_OS_UNIX
-// NV_OS_DARWIN
-// NV_OS_XBOX
-// NV_OS_ORBIS
-// NV_OS_IOS
-
 #define NV_OS_STRING POSH_OS_STRING
 
 #if defined POSH_OS_LINUX
@@ -71,6 +61,53 @@
 #   error "Unsupported OS"
 #endif
 
+#ifndef NV_OS_WIN32
+#	define NV_OS_WIN32  0
+#endif // NV_OS_WIN32
+
+#ifndef NV_OS_WIN64
+#	define NV_OS_WIN64  0
+#endif // NV_OS_WIN64
+
+#ifndef NV_OS_MINGW
+#	define NV_OS_MINGW  0
+#endif // NV_OS_MINGW
+
+#ifndef NV_OS_CYGWIN
+#	define NV_OS_CYGWIN 0
+#endif // NV_OS_CYGWIN
+
+#ifndef NV_OS_LINUX
+#	define NV_OS_LINUX  0
+#endif // NV_OS_LINUX
+
+#ifndef NV_OS_FREEBSD
+#	define NV_OS_FREEBSD 0
+#endif // NV_OS_FREEBSD
+
+#ifndef NV_OS_OPENBSD
+#	define NV_OS_OPENBSD 0
+#endif // NV_OS_OPENBSD
+
+#ifndef NV_OS_UNIX
+#	define NV_OS_UNIX   0
+#endif // NV_OS_UNIX
+
+#ifndef NV_OS_DARWIN
+#	define NV_OS_DARWIN 0
+#endif // NV_OS_DARWIN
+
+#ifndef NV_OS_XBOX
+#	define NV_OS_XBOX   0
+#endif // NV_OS_XBOX
+
+#ifndef NV_OS_ORBIS
+#	define NV_OS_ORBIS  0
+#endif // NV_OS_ORBIS
+
+#ifndef NV_OS_IOS
+#	define NV_OS_IOS    0
+#endif // NV_OS_IOS
 
 // Threading:
 // some platforms don't implement __thread or similar for thread-local-storage
@@ -88,11 +125,6 @@
 
 
 // CPUs:
-// NV_CPU_X86
-// NV_CPU_X86_64
-// NV_CPU_PPC
-// NV_CPU_ARM
-// NV_CPU_AARCH64
 
 #define NV_CPU_STRING   POSH_CPU_STRING
 
@@ -111,11 +143,27 @@
 #   error "Unsupported CPU"
 #endif
 
+#ifndef NV_CPU_X86
+#	define NV_CPU_X86     0
+#endif // NV_CPU_X86
+
+#ifndef NV_CPU_X86_64
+#	define NV_CPU_X86_64  0
+#endif // NV_CPU_X86_64
+
+#ifndef NV_CPU_PPC
+#	define NV_CPU_PPC     0
+#endif // NV_CPU_PPC
+
+#ifndef NV_CPU_ARM
+#	define NV_CPU_ARM     0
+#endif // NV_CPU_ARM
+
+#ifndef NV_CPU_AARCH64
+#	define NV_CPU_AARCH64 0
+#endif // NV_CPU_AARCH64
 
 // Compiler:
-// NV_CC_GNUC
-// NV_CC_MSVC
-// NV_CC_CLANG
 
 #if defined POSH_COMPILER_CLANG
 #   define NV_CC_CLANG  1
@@ -124,6 +172,12 @@
 #elif defined POSH_COMPILER_GCC
 #   define NV_CC_GNUC   1
 #   define NV_CC_STRING "gcc"
+#	pragma GCC diagnostic ignored "-Wshadow"
+#	pragma GCC diagnostic ignored "-Wmaybe-uninitialized"
+#	pragma GCC diagnostic ignored "-Wunused-function"
+#	pragma GCC diagnostic ignored "-Wunused-but-set-variable"
+#	pragma GCC diagnostic ignored "-Wunused-variable"
+#	pragma GCC diagnostic ignored "-Wunused-parameter"
 #elif defined POSH_COMPILER_MSVC
 #   define NV_CC_MSVC   1
 #   define NV_CC_STRING "msvc"
@@ -131,6 +185,18 @@
 #   error "Unsupported compiler"
 #endif
 
+#ifndef NV_CC_GNUC
+#	define NV_CC_GNUC  0
+#endif // NV_CC_GNUC
+
+#ifndef NV_CC_MSVC
+#	define NV_CC_MSVC  0
+#endif // NV_CC_MSVC
+
+#ifndef NV_CC_CLANG
+#	define NV_CC_CLANG 0
+#endif // NV_CC_CLANG
+
 #if NV_CC_MSVC
 #define NV_CC_CPP11 (__cplusplus > 199711L || _MSC_VER >= 1800) // Visual Studio 2013 has all the features we use, but doesn't advertise full C++11 support yet.
 #else
@@ -198,8 +264,6 @@ typedef uint32      uint;
     private: \
     void *operator new(size_t size); \
     void *operator new[](size_t size)
-    //static void *operator new(size_t size); \
-    //static void *operator new[](size_t size);
 
 // String concatenation macros.
 #define NV_STRING_JOIN2(arg1, arg2) NV_DO_STRING_JOIN2(arg1, arg2)
@@ -276,19 +340,19 @@ NV_COMPILER_CHECK(sizeof(uint32) == 4);
 // Platform includes
 #if NV_CC_MSVC
 #   if NV_OS_WIN32
-#       include "DefsVcWin32.h"
+#       include "defsvcwin32.h"
 #   elif NV_OS_XBOX
-#       include "DefsVcXBox.h"
+#       include "defsvcxbox.h"
 #   else
 #       error "MSVC: Platform not supported"
 #   endif
 #elif NV_CC_GNUC
 #   if NV_OS_LINUX
-#       include "DefsGnucLinux.h"
+#       include "defsgnuclinux.h"
 #   elif NV_OS_DARWIN || NV_OS_FREEBSD || NV_OS_OPENBSD
-#       include "DefsGnucDarwin.h"
+#       include "defsgnucdarwin.h"
 #   elif NV_OS_MINGW
-#       include "DefsGnucWin32.h"
+#       include "defsgnucwin32.h"
 #   elif NV_OS_CYGWIN
 #       error "GCC: Cygwin not supported"
 #   else

3rdparty/nvtt/nvmath/matrix.inl

@@ -4,7 +4,7 @@
 #ifndef NV_MATH_MATRIX_INL
 #define NV_MATH_MATRIX_INL
 
-#include "Matrix.h"
+#include "matrix.h"
 
 namespace nv
 {

3rdparty/nvtt/nvmath/nvmath.h

@@ -35,7 +35,11 @@ namespace nv
 
     inline bool isFinite(const float f)
     {
+#if NV_CC_MSVC
         return _finite(f) != 0;
+#elif NV_CC_GNUC
+        return finitef(f);
+#endif //
     }
 
     // Eliminates negative zeros from a float array.

3rdparty/nvtt/nvmath/plane.inl

@@ -4,8 +4,8 @@
 #ifndef NV_MATH_PLANE_INL
 #define NV_MATH_PLANE_INL
 
-#include "Plane.h"
-#include "Vector.inl"
+#include "plane.h"
+#include "vector.inl"
 
 namespace nv
 {

3rdparty/nvtt/nvtt.cpp

@@ -12,7 +12,7 @@
 #include "bc7/avpcl.h"
 #include "nvmath/vector.inl"
 
-NVCORE_API int nvAbort(const char *, const char *, int , const char *, const char *, ...) __attribute__((format (printf, 5, 6)))
+NVCORE_API int nvAbort(const char *, const char *, int , const char *, const char *, ...)
 {
 	abort();
 	return 0;