From e9bd02dd747295366f34fe2d8846784aad2c50fd Mon Sep 17 00:00:00 2001
From: baldurk <baldurk@baldurk.org>
Date: Tue, 26 Apr 2016 22:15:05 +0200
Subject: [PATCH] Remove some fatal errors that don't really need to be fatal

---
 renderdoc/driver/d3d11/d3d11_analyse.cpp       |  2 +-
 renderdoc/driver/d3d11/d3d11_resources.cpp     | 14 ++++++++++++--
 renderdoc/driver/shaders/dxbc/dxbc_debug.cpp   |  2 +-
 renderdoc/driver/shaders/dxbc/dxbc_inspect.cpp |  3 ++-
 renderdoc/driver/vulkan/vk_resources.cpp       |  3 ++-
 5 files changed, 18 insertions(+), 6 deletions(-)

diff --git a/renderdoc/driver/d3d11/d3d11_analyse.cpp b/renderdoc/driver/d3d11/d3d11_analyse.cpp
index 213d8e377..7186a8ae4 100644
--- a/renderdoc/driver/d3d11/d3d11_analyse.cpp
+++ b/renderdoc/driver/d3d11/d3d11_analyse.cpp
@@ -144,7 +144,7 @@ void D3D11DebugManager::FillCBufferVariables(const string &prefix, size_t &offse
 				type = eVar_Double;
 				break;
 			default:
-				RDCFATAL("Unexpected type in constant buffer");
+				RDCERR("Unexpected type in constant buffer");
 		}
 		
 		bool columnMajor = invars[v].type.descriptor.varClass == CLASS_MATRIX_COLUMNS;
diff --git a/renderdoc/driver/d3d11/d3d11_resources.cpp b/renderdoc/driver/d3d11/d3d11_resources.cpp
index 308200028..3d1c5c300 100644
--- a/renderdoc/driver/d3d11/d3d11_resources.cpp
+++ b/renderdoc/driver/d3d11/d3d11_resources.cpp
@@ -339,8 +339,13 @@ UINT GetFormatBPP(DXGI_FORMAT f)
 			ret *= 2; // 4 channels, half a byte each
 			break;
 
+		case DXGI_FORMAT_UNKNOWN:
+			ret = 0;
+			RDCWARN("Getting BPP of DXGI_FORMAT_UNKNOWN");
+			break;
+
 		default:
-			RDCFATAL("Unrecognised DXGI Format: %d", f);
+			RDCERR("Unrecognised DXGI Format: %d", f);
 			break;
 	}
 
@@ -1395,8 +1400,13 @@ DXGI_FORMAT GetTypelessFormat(DXGI_FORMAT f)
 			RDCERR("No Typeless DXGI Format for %d", f);
 			return DXGI_FORMAT_UNKNOWN;
 
+		case DXGI_FORMAT_UNKNOWN:
+			RDCWARN("Getting Typeless format of DXGI_FORMAT_UNKNOWN");
+			return DXGI_FORMAT_UNKNOWN;
+
 		default:
-			RDCFATAL("Unrecognised DXGI Format: %d", f);
+			RDCERR("Unrecognised DXGI Format: %d", f);
+			return DXGI_FORMAT_UNKNOWN;
 	}
 }
 
diff --git a/renderdoc/driver/shaders/dxbc/dxbc_debug.cpp b/renderdoc/driver/shaders/dxbc/dxbc_debug.cpp
index d6032da6e..6d69fafb4 100644
--- a/renderdoc/driver/shaders/dxbc/dxbc_debug.cpp
+++ b/renderdoc/driver/shaders/dxbc/dxbc_debug.cpp
@@ -630,7 +630,7 @@ void State::SetDst(const ASMOperand &dstoper, const ASMOperation &op, const Shad
 		case TYPE_INPUT:
 		case TYPE_CONSTANT_BUFFER:
 		{
-			RDCFATAL("Attempt to write to read-only operand (input, cbuffer, etc).\n"
+			RDCERR("Attempt to write to read-only operand (input, cbuffer, etc).\n"
 					"This is likely a bug in the asm extraction as such code isn't likely to be produced by fxc.");
 			break;
 		}
diff --git a/renderdoc/driver/shaders/dxbc/dxbc_inspect.cpp b/renderdoc/driver/shaders/dxbc/dxbc_inspect.cpp
index d58354578..407857911 100644
--- a/renderdoc/driver/shaders/dxbc/dxbc_inspect.cpp
+++ b/renderdoc/driver/shaders/dxbc/dxbc_inspect.cpp
@@ -229,7 +229,8 @@ int TypeByteSize(VariableType t)
 		case VARTYPE_INTERFACE_POINTER:
 			return 1;
 		default:
-			RDCFATAL("Trying to take size of undefined type %d", t);
+			RDCERR("Trying to take size of undefined type %d", t);
+			return 1;
 	}
 }
 
diff --git a/renderdoc/driver/vulkan/vk_resources.cpp b/renderdoc/driver/vulkan/vk_resources.cpp
index af67a04a8..b0b2fd7ce 100644
--- a/renderdoc/driver/vulkan/vk_resources.cpp
+++ b/renderdoc/driver/vulkan/vk_resources.cpp
@@ -564,7 +564,8 @@ uint32_t GetByteSize(uint32_t Width, uint32_t Height, uint32_t Depth, VkFormat F
 			astc[0] = 12; astc[1] = 12;
 			break;
 		default:
-			RDCFATAL("Unrecognised Vulkan Format: %d", Format);
+			ret = 1;
+			RDCERR("Unrecognised Vulkan Format: %d", Format);
 			break;
 	}