ecsv avatar ecsv committed efb8cbd

Disable (not working) texture dumping to reduce the conversion effort

Comments (0)

Files changed (4)

projects/unix/Makefile

 	$(SRCDIR)/GlideHQ/tc-1.1+/wrapper.c \
 	$(SRCDIR)/GlideHQ/tc-1.1+/texstore.c
 
-CFLAGS += -DTEXTURE_FILTER
+CPPFLAGS += -DTEXTURE_FILTER # -DDUMP_CACHE
 LDLIBS += -lboost_filesystem$(BOOST_SUFFIX) -lboost_system$(BOOST_SUFFIX)
 endif
 

src/GlideHQ/TxFilter.cpp

   if (!(_options & DUMP_TEX))
     return 0;
 
+#ifdef DUMP_CACHE
   DBG_INFO(80, L"gfmt = %02x n64fmt = %02x\n", gfmt, n64fmt);
   DBG_INFO(80, L"hirestex: r_crc64:%08X %08X\n",
            (uint32)(r_crc64 >> 32), (uint32)(r_crc64 & 0xffffffff));
       return 1;
     }
   }
+#endif
 
   return 0;
 }

src/GlideHQ/TxHiResCache.cpp

 #pragma warning(disable: 4786)
 #endif
 
-/* dump processed hirestextures to disk 
- * (0:disable, 1:enable) */
-#define DUMP_CACHE 1
-
 /* handle oversized textures by
  *   0: minification
  *   1: Glide64 style tiling
 
 TxHiResCache::~TxHiResCache()
 {
-#if DUMP_CACHE
+#ifdef DUMP_CACHE
   if ((_options & DUMP_HIRESTEXCACHE) && !_haveCache && !_abortLoad) {
     /* dump cache to disk */
     std::wstring filename = _ident + L"_HIRESTEXTURES.dat";
     return;
   }
 
-#if DUMP_CACHE
+#ifdef DUMP_CACHE
   /* read in hires texture cache */
   if (_options & DUMP_HIRESTEXCACHE) {
     /* find it on disk */

src/GlideHQ/TxTexCache.cpp

 #pragma warning(disable: 4786)
 #endif
 
-/* dump cache to disk (0:disable, 1:enable) */
-#define DUMP_CACHE 1
-
 #include "TxTexCache.h"
 #include "TxDbg.h"
 #include <zlib.h>
 
 TxTexCache::~TxTexCache()
 {
-#if DUMP_CACHE
+#ifdef DUMP_CACHE
   if (_options & DUMP_TEXCACHE) {
     /* dump cache to disk */
     std::wstring filename = _ident + L"_MEMORYCACHE.dat";
   if (_cachepath.empty() || _ident.empty() || !_cacheSize)
     _options &= ~DUMP_TEXCACHE;
 
-#if DUMP_CACHE
+#ifdef DUMP_CACHE
   if (_options & DUMP_TEXCACHE) {
     /* find it on disk */
     std::wstring filename = _ident + L"_MEMORYCACHE.dat";
Tip: Filter by directory path e.g. /media app.js to search for public/media/app.js.
Tip: Use camelCasing e.g. ProjME to search for ProjectModifiedEvent.java.
Tip: Filter by extension type e.g. /repo .js to search for all .js files in the /repo directory.
Tip: Separate your search with spaces e.g. /ssh pom.xml to search for src/ssh/pom.xml.
Tip: Use ↑ and ↓ arrow keys to navigate and return to view the file.
Tip: You can also navigate files with Ctrl+j (next) and Ctrl+k (previous) and view the file with Ctrl+o.
Tip: You can also navigate files with Alt+j (next) and Alt+k (previous) and view the file with Alt+o.