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

Disable test code from nvdecompress. Update vc12 projects and fix vc12 build. Fixes bug #232.

Browse Source
This commit is contained in:
Ignacio 2015-12-11 12:15:22 -08:00
parent 7596650a2d
commit 9b79638f79
3 changed files with 13 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
project/vc12/nvcore/nvcore.vcxproj
View File

@ -157,6 +157,7 @@
<ClInclude Include="..\..\..\src\nvcore\Debug.h" /> <ClInclude Include="..\..\..\src\nvcore\Debug.h" />
<ClInclude Include="..\..\..\src\nvcore\DefsVcWin32.h" /> <ClInclude Include="..\..\..\src\nvcore\DefsVcWin32.h" />
<ClInclude Include="..\..\..\src\nvcore\FileSystem.h" /> <ClInclude Include="..\..\..\src\nvcore\FileSystem.h" />
<ClInclude Include="..\..\..\src\nvcore\ForEach.h" />
<ClInclude Include="..\..\..\src\nvcore\Memory.h" /> <ClInclude Include="..\..\..\src\nvcore\Memory.h" />
<ClInclude Include="..\..\..\src\nvcore\nvcore.h" /> <ClInclude Include="..\..\..\src\nvcore\nvcore.h" />
<ClInclude Include="..\..\..\src\nvcore\Ptr.h" /> <ClInclude Include="..\..\..\src\nvcore\Ptr.h" />

16
src/nvcore/ForEach.h
View File

@ -10,20 +10,26 @@ These foreach macros are very non-standard and somewhat confusing, but I like th
#include "nvcore.h" #include "nvcore.h"
#if NV_CC_GNUC || NV_CC_CPP11 // If typeof or decltype is available: #if NV_CC_GNUC // If typeof or decltype is available:
#if !NV_CC_CPP11 #if !NV_CC_CPP11
# define NV_DECLTYPE typeof // Using a non-standard extension over typeof that behaves as C++11 decltype # define NV_DECLTYPE typeof // Using a non-standard extension over typeof that behaves as C++11 decltype
#else #else
# define NV_DECLTYPE decltype # define NV_DECLTYPE decltype
#endif #endif
/*
Ideally we would like to write this:
#define NV_FOREACH(i, container) \
for(NV_DECLTYPE(container)::PseudoIndex i((container).start()); !(container).isDone(i); (container).advance(i))
But gcc versions prior to 4.7 required an intermediate type. See:
https://gcc.gnu.org/bugzilla/show_bug.cgi?id=6709
*/
#define NV_FOREACH(i, container) \ #define NV_FOREACH(i, container) \
typedef NV_DECLTYPE(container) NV_STRING_JOIN2(cont,__LINE__); \ typedef NV_DECLTYPE(container) NV_STRING_JOIN2(cont,__LINE__); \
for(NV_STRING_JOIN2(cont,__LINE__)::PseudoIndex i((container).start()); !(container).isDone(i); (container).advance(i)) for(NV_STRING_JOIN2(cont,__LINE__)::PseudoIndex i((container).start()); !(container).isDone(i); (container).advance(i))
/*
#define NV_FOREACH(i, container) \
for(typename typeof(container)::PseudoIndex i((container).start()); !(container).isDone(i); (container).advance(i))
*/
#else // If typeof not available: #else // If typeof not available:

2
src/nvtt/tools/decompress.cpp
View File

@ -45,7 +45,7 @@ int main(int argc, char *argv[])
bool faces = false; bool faces = false;
bool savePNG = false; bool savePNG = false;
bool rgbm = false; bool rgbm = false;
bool histogram = true; bool histogram = false;
nv::Path input; nv::Path input;
nv::Path output; nv::Path output;