From 0cc4b555d1f08001721622511b20b4a9e4cb84a3 Mon Sep 17 00:00:00 2001 From: Vincent Lejeune Date: Sun, 1 Nov 2015 21:23:57 +0100 Subject: [PATCH] d3d12: Comment out LLVM_BUILTIN_UNREACHABLE and display error msg in log --- rpcs3/Emu/RSX/D3D12/D3D12Utils.cpp | 2 ++ rpcs3/Emu/RSX/D3D12/D3D12Utils.h | 4 ++-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/rpcs3/Emu/RSX/D3D12/D3D12Utils.cpp b/rpcs3/Emu/RSX/D3D12/D3D12Utils.cpp index 5733d47970..e54507c51d 100644 --- a/rpcs3/Emu/RSX/D3D12/D3D12Utils.cpp +++ b/rpcs3/Emu/RSX/D3D12/D3D12Utils.cpp @@ -6,6 +6,7 @@ #include #include "D3D12GSRender.h" #include "d3dx12.h" +#include "Utilities/Log.h" #define STRINGIFY(x) #x extern PFN_D3D12_SERIALIZE_ROOT_SIGNATURE wrapD3D12SerializeRootSignature; @@ -265,6 +266,7 @@ void D3D12GSRender::initConvertShader() void unreachable_internal(const char *msg, const char *file, unsigned line) { + LOG_ERROR(RSX, "file %s line %d : %s", file, line, msg); abort(); #ifdef LLVM_BUILTIN_UNREACHABLE LLVM_BUILTIN_UNREACHABLE; diff --git a/rpcs3/Emu/RSX/D3D12/D3D12Utils.h b/rpcs3/Emu/RSX/D3D12/D3D12Utils.h index a82186e9f3..e4cf19b432 100644 --- a/rpcs3/Emu/RSX/D3D12/D3D12Utils.h +++ b/rpcs3/Emu/RSX/D3D12/D3D12Utils.h @@ -58,8 +58,8 @@ LLVM_ATTRIBUTE_NORETURN void unreachable_internal(const char *msg = nullptr, con #ifndef NDEBUG #define unreachable(msg) \ unreachable_internal(msg, __FILE__, __LINE__) -#elif defined(LLVM_BUILTIN_UNREACHABLE) -#define unreachable(msg) LLVM_BUILTIN_UNREACHABLE +//#elif defined(LLVM_BUILTIN_UNREACHABLE) +//#define unreachable(msg) LLVM_BUILTIN_UNREACHABLE #else #define unreachable(msg) unreachable_internal() #endif