From 9f1b3362eab7996db22dbe12522927380e8e8adb Mon Sep 17 00:00:00 2001
From: baldurk <baldurk@baldurk.org>
Date: Sun, 7 Sep 2014 20:13:15 +0100
Subject: [PATCH] Better handling of cubemaps, requiring dx10 header to pass
 array size

---
 renderdoc/driver/d3d11/d3d11_analyse.cpp | 18 +++++++++++-------
 1 file changed, 11 insertions(+), 7 deletions(-)

diff --git a/renderdoc/driver/d3d11/d3d11_analyse.cpp b/renderdoc/driver/d3d11/d3d11_analyse.cpp
index bb92aced1..c4aeeb070 100644
--- a/renderdoc/driver/d3d11/d3d11_analyse.cpp
+++ b/renderdoc/driver/d3d11/d3d11_analyse.cpp
@@ -1831,6 +1831,8 @@ bool D3D11DebugManager::SaveTexture(ResourceId id, uint32_t saveMip, wstring pat
 
 		header.dwCaps2 = desc.ArraySize > 1 ? DDSCAPS2_VOLUME : 0;
 
+		bool dx10Header = false;
+
 		headerDXT10.dxgiFormat = GetTypedFormat(desc.Format);
 		headerDXT10.resourceDimension = D3D10_RESOURCE_DIMENSION_TEXTURE2D;
 		headerDXT10.arraySize = desc.ArraySize;
@@ -1838,9 +1840,11 @@ bool D3D11DebugManager::SaveTexture(ResourceId id, uint32_t saveMip, wstring pat
 		if(desc.MiscFlags & D3D11_RESOURCE_MISC_TEXTURECUBE)
 		{
 			header.dwCaps2 = DDSCAPS2_CUBEMAP;
-			headerDXT10.arraySize /= 6;
 		}
 
+		if(headerDXT10.arraySize > 1)
+			dx10Header = true; // need to specify dx10 header to give array size
+
 		if(IsBlockFormat(desc.Format))
 		{
 			int blockSize = GetFormatBPP(desc.Format) / 8;
@@ -1856,9 +1860,6 @@ bool D3D11DebugManager::SaveTexture(ResourceId id, uint32_t saveMip, wstring pat
 			header.dwPitchOrLinearSize = (desc.Width * GetFormatBPP(desc.Format) + 7) / 8;
 		}
 
-
-		bool dx10Header = false;
-
 		// special case a couple of formats to write out non-DX10 style, for
 		// backwards compatibility
 		switch(desc.Format)
@@ -1931,13 +1932,16 @@ bool D3D11DebugManager::SaveTexture(ResourceId id, uint32_t saveMip, wstring pat
 			default:
 			{
 				// just write out DX10 header
-				header.ddspf.dwFlags = DDPF_FOURCC;
-				header.ddspf.dwFourCC = MAKE_FOURCC('D', 'X', '1', '0');
-
 				dx10Header = true;
 				break;
 			}
 		}
+
+		if(dx10Header)
+		{
+			header.ddspf.dwFlags = DDPF_FOURCC;
+			header.ddspf.dwFourCC = MAKE_FOURCC('D', 'X', '1', '0');
+		}
 		
 		FILE *f = FileIO::fopen(path.c_str(), L"wb");