Impaczus/rpcs3
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

d3d12: Comment out LLVM_BUILTIN_UNREACHABLE and display error msg in log

Browse Source
This commit is contained in:
Vincent Lejeune
2015-11-01 21:23:57 +01:00
parent e76abf875f
commit 0cc4b555d1
2 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
rpcs3/Emu/RSX/D3D12/D3D12Utils.cpp
+2
View File
@@ -6,6 +6,7 @@
#include <d3dcompiler.h> #include <d3dcompiler.h>
#include "D3D12GSRender.h" #include "D3D12GSRender.h"
#include "d3dx12.h" #include "d3dx12.h"
#include "Utilities/Log.h"
#define STRINGIFY(x) #x #define STRINGIFY(x) #x
extern PFN_D3D12_SERIALIZE_ROOT_SIGNATURE wrapD3D12SerializeRootSignature; 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) void unreachable_internal(const char *msg, const char *file, unsigned line)
{ {
LOG_ERROR(RSX, "file %s line %d : %s", file, line, msg);
abort(); abort();
#ifdef LLVM_BUILTIN_UNREACHABLE #ifdef LLVM_BUILTIN_UNREACHABLE
LLVM_BUILTIN_UNREACHABLE; LLVM_BUILTIN_UNREACHABLE;
rpcs3/Emu/RSX/D3D12/D3D12Utils.h
+2 -2
View File
@@ -58,8 +58,8 @@ LLVM_ATTRIBUTE_NORETURN void unreachable_internal(const char *msg = nullptr, con
#ifndef NDEBUG #ifndef NDEBUG
#define unreachable(msg) \ #define unreachable(msg) \
unreachable_internal(msg, __FILE__, __LINE__) unreachable_internal(msg, __FILE__, __LINE__)
#elif defined(LLVM_BUILTIN_UNREACHABLE) //#elif defined(LLVM_BUILTIN_UNREACHABLE)
#define unreachable(msg) LLVM_BUILTIN_UNREACHABLE //#define unreachable(msg) LLVM_BUILTIN_UNREACHABLE
#else #else
#define unreachable(msg) unreachable_internal() #define unreachable(msg) unreachable_internal()
#endif #endif