ShuriZma
/
flycast
mirror of https://github.com/flyinghead/flycast.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #34 from scribam/msvc-fixes 

msvc build fixes
This commit is contained in:
flyinghead 2020-01-28 22:43:06 +01:00 committed by GitHub
parent aac665e617 4161ca9b07
commit a45bd364ba
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 4 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
core/hw/sh4/modules/serial.cpp
View File

@ -9,7 +9,7 @@
#include <unistd.h>
#include <sys/ioctl.h>
#else
#include <windows.h>
#include <io.h>
#endif
#include "types.h"
#include "hw/sh4/sh4_mmr.h"

10
core/rend/vulkan/vmallocator.cpp
View File

@ -23,10 +23,7 @@
#include "vmallocator.h"
#include "vulkan_context.h"
#if HOST_CPU == CPU_ARM
__attribute__((pcs("aapcs-vfp")))
#endif
static void vmaAllocateDeviceMemoryCallback(
VKAPI_ATTR static void VKAPI_CALL vmaAllocateDeviceMemoryCallback(
VmaAllocator allocator,
uint32_t memoryType,
VkDeviceMemory memory,
@ -35,10 +32,7 @@ static void vmaAllocateDeviceMemoryCallback(
DEBUG_LOG(RENDERER, "VMAAllocator: %llu bytes allocated (type %d)", (unsigned long long)size, memoryType);
}
#if HOST_CPU == CPU_ARM
__attribute__((pcs("aapcs-vfp")))
#endif
static void vmaFreeDeviceMemoryCallback(
VKAPI_ATTR static void VKAPI_CALL vmaFreeDeviceMemoryCallback(
VmaAllocator allocator,
uint32_t memoryType,
VkDeviceMemory memory,

5
core/rend/vulkan/vulkan_context.cpp
View File

@ -35,11 +35,8 @@ VulkanContext *VulkanContext::contextInstance;
static const char *PipelineCacheFileName = DATA_PATH "vulkan_pipeline.cache";
#if HOST_CPU == CPU_ARM
__attribute__((pcs("aapcs-vfp")))
#endif
#ifndef __ANDROID__
static VkBool32 debugUtilsMessengerCallback(VkDebugUtilsMessageSeverityFlagBitsEXT messageSeverity, VkDebugUtilsMessageTypeFlagsEXT messageTypes,
VKAPI_ATTR static VkBool32 VKAPI_CALL debugUtilsMessengerCallback(VkDebugUtilsMessageSeverityFlagBitsEXT messageSeverity, VkDebugUtilsMessageTypeFlagsEXT messageTypes,
VkDebugUtilsMessengerCallbackDataEXT const * pCallbackData, void * /*pUserData*/)
{
std::string msg = vk::to_string(static_cast<vk::DebugUtilsMessageSeverityFlagBitsEXT>(messageSeverity)) + ": "