From d1d71dd2b3b5409b3b0b50e582a6f0b066232e8c Mon Sep 17 00:00:00 2001
From: castano <castano@95f4ed2b-212e-0410-8b90-d31948207fce>
Date: Tue, 4 Sep 2007 21:48:49 +0000
Subject: [PATCH] Fix a couple of errors. Disable cone mapping, it is not ready
 yet.

---
 src/nvimage/DirectDrawSurface.cpp |  7 ++++++-
 src/nvimage/DirectDrawSurface.h   |  1 +
 src/nvimage/nvtt/InputOptions.h   |  5 ++++-
 src/nvimage/nvtt/dxtlib.cpp       | 18 ++++++++++++++----
 4 files changed, 25 insertions(+), 6 deletions(-)

diff --git a/src/nvimage/DirectDrawSurface.cpp b/src/nvimage/DirectDrawSurface.cpp
index fc9ef8d..8966e02 100644
--- a/src/nvimage/DirectDrawSurface.cpp
+++ b/src/nvimage/DirectDrawSurface.cpp
@@ -307,7 +307,7 @@ namespace nv
 		s << header.caps;
 		s << header.notused;
 		
-		if (header.pf.flags == 0)
+		if (header.hasDX10Header())
 		{
 			s << header.header10;
 		}
@@ -586,6 +586,11 @@ void DDSHeader::swapBytes()
 	this->header10.reserved = POSH_LittleU32(this->header10.reserved);
 }
 
+bool DDSHeader::hasDX10Header() const
+{
+	return this->pf.flags == 0;
+}
+
 
 
 DirectDrawSurface::DirectDrawSurface(const char * name) : stream(new StdInputStream(name))
diff --git a/src/nvimage/DirectDrawSurface.h b/src/nvimage/DirectDrawSurface.h
index 56b933a..41a7614 100644
--- a/src/nvimage/DirectDrawSurface.h
+++ b/src/nvimage/DirectDrawSurface.h
@@ -99,6 +99,7 @@ namespace nv
 		
 		void swapBytes();
 		
+		bool hasDX10Header() const;
 	};
 
 
diff --git a/src/nvimage/nvtt/InputOptions.h b/src/nvimage/nvtt/InputOptions.h
index 9ceff59..fbd7899 100644
--- a/src/nvimage/nvtt/InputOptions.h
+++ b/src/nvimage/nvtt/InputOptions.h
@@ -68,8 +68,11 @@ namespace nvtt
 		bool normalMap;
 		bool normalizeMipmaps;
 		bool convertToNormalMap;
-		nv::Vector4 heightFactors;
+		nv::Vector4 heightFactors;		// Used for cone mapping too.
 		nv::Vector4 bumpFrequencyScale;
+
+		// Cone map options.
+		bool convertToConeMap;
 	};
 
 	// Internal image structure.
diff --git a/src/nvimage/nvtt/dxtlib.cpp b/src/nvimage/nvtt/dxtlib.cpp
index 525e225..e118d12 100644
--- a/src/nvimage/nvtt/dxtlib.cpp
+++ b/src/nvimage/nvtt/dxtlib.cpp
@@ -159,8 +159,15 @@ static void outputHeader(const InputOptions::Private & inputOptions, const Outpu
 		// Swap bytes if necessary.
 		header.swapBytes();
 		
-		nvStaticCheck(sizeof(DDSHeader) == 128);
-		outputOptions.outputHandler->writeData(&header, 128);
+		nvStaticCheck(sizeof(DDSHeader) == 128 + 20);
+		if (header.hasDX10Header())
+		{
+			outputOptions.outputHandler->writeData(&header, 128 + 20);
+		}
+		else
+		{
+			outputOptions.outputHandler->writeData(&header, 128);
+		}
 		
 		// Revert swap.
 		header.swapBytes();
@@ -416,6 +423,10 @@ bool nvtt::compress(const InputOptions & inputOptions, const OutputOptions & out
 				{
 					floatImage = createNormalMap(mipmap.data.ptr(), (FloatImage::WrapMode)inputOptions.m.wrapMode, inputOptions.m.heightFactors, inputOptions.m.bumpFrequencyScale);
 				}
+				/*else if (inputOptions.m.convertToConeMap)
+				{
+					floatImage = createConeMap(mipmap.data, inputOptions.m.heightFactors);
+				}*/
 				else
 				{
 					lastImage = img = mipmap.data.ptr();
@@ -512,9 +523,8 @@ const char * nvtt::errorString(Error e)
 		case Error_CudaError:
 			return "CUDA error";
 		case Error_Unknown:
+		default:
 			return "Unknown error";
 	}
-
-	return NULL;
 }