From b4a44c5e022513ac89f019f6eb2b9c2ba098e977 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Henrik=20Rydg=C3=A5rd?= <hrydgard@gmail.com>
Date: Wed, 13 Dec 2017 22:16:54 +0100
Subject: [PATCH] Another buildfix, sigh. Also extend the safe region a little
bit to the thing from a couple commits ago.
---
Common/Vulkan/VulkanDebug.cpp | 3 +--
Common/x64Emitter.h | 2 +-
2 files changed, 2 insertions(+), 3 deletions(-)
diff --git a/Common/Vulkan/VulkanDebug.cpp b/Common/Vulkan/VulkanDebug.cpp
index a57ee1251c..95dd02a087 100644
--- a/Common/Vulkan/VulkanDebug.cpp
+++ b/Common/Vulkan/VulkanDebug.cpp
@@ -17,7 +17,6 @@
#include <string>
#include <cassert>
-#include <iostream>
#include <sstream>
#include "Common/Vulkan/VulkanContext.h"
@@ -95,7 +94,7 @@ VkBool32 VKAPI_CALL Vulkan_Dbg(VkDebugReportFlagsEXT msgFlags, VkDebugReportObje
}
}
#else
- std::cout << message;
+ ILOG("%s", message.str().c_str());
#endif
// false indicates that layer should not bail-out of an
diff --git a/Common/x64Emitter.h b/Common/x64Emitter.h
index ab735ad06d..87ae096bb1 100644
--- a/Common/x64Emitter.h
+++ b/Common/x64Emitter.h
@@ -1077,7 +1077,7 @@ public:
return true;
#else
ptrdiff_t diff = GetCodePtr() - (const uint8_t *)ptr;
- return diff > -0x7FFFFFF0 && diff < 0x7FFFFFF0;
+ return diff > -0x7FFFFFE0 && diff < 0x7FFFFFE0;
#endif
}
};