diff options
author | bunnei <bunneidev@gmail.com> | 2020-06-20 05:31:04 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2020-06-20 05:31:04 +0200 |
commit | 7d1dca4c981d04bcb18cd5ecc6a4fe3f71d85560 (patch) | |
tree | c806783957549f1127c7d8bfda28abefa5b3ab8d /src/video_core/renderer_vulkan | |
parent | Merge pull request #4113 from ogniK5377/boxcat-disable (diff) | |
parent | bootmanager: Remove references to OpenGL for macOS (diff) | |
download | yuzu-7d1dca4c981d04bcb18cd5ecc6a4fe3f71d85560.tar yuzu-7d1dca4c981d04bcb18cd5ecc6a4fe3f71d85560.tar.gz yuzu-7d1dca4c981d04bcb18cd5ecc6a4fe3f71d85560.tar.bz2 yuzu-7d1dca4c981d04bcb18cd5ecc6a4fe3f71d85560.tar.lz yuzu-7d1dca4c981d04bcb18cd5ecc6a4fe3f71d85560.tar.xz yuzu-7d1dca4c981d04bcb18cd5ecc6a4fe3f71d85560.tar.zst yuzu-7d1dca4c981d04bcb18cd5ecc6a4fe3f71d85560.zip |
Diffstat (limited to 'src/video_core/renderer_vulkan')
-rw-r--r-- | src/video_core/renderer_vulkan/renderer_vulkan.cpp | 4 | ||||
-rw-r--r-- | src/video_core/renderer_vulkan/vk_rasterizer.cpp | 2 |
2 files changed, 4 insertions, 2 deletions
diff --git a/src/video_core/renderer_vulkan/renderer_vulkan.cpp b/src/video_core/renderer_vulkan/renderer_vulkan.cpp index 59b441943..cd9673d1f 100644 --- a/src/video_core/renderer_vulkan/renderer_vulkan.cpp +++ b/src/video_core/renderer_vulkan/renderer_vulkan.cpp @@ -13,6 +13,7 @@ #include <fmt/format.h> #include "common/dynamic_library.h" +#include "common/file_util.h" #include "common/logging/log.h" #include "common/telemetry.h" #include "core/core.h" @@ -76,7 +77,8 @@ Common::DynamicLibrary OpenVulkanLibrary() { char* libvulkan_env = getenv("LIBVULKAN_PATH"); if (!libvulkan_env || !library.Open(libvulkan_env)) { // Use the libvulkan.dylib from the application bundle. - std::string filename = File::GetBundleDirectory() + "/Contents/Frameworks/libvulkan.dylib"; + const std::string filename = + FileUtil::GetBundleDirectory() + "/Contents/Frameworks/libvulkan.dylib"; library.Open(filename.c_str()); } #else diff --git a/src/video_core/renderer_vulkan/vk_rasterizer.cpp b/src/video_core/renderer_vulkan/vk_rasterizer.cpp index 184b2238a..a77fa35c3 100644 --- a/src/video_core/renderer_vulkan/vk_rasterizer.cpp +++ b/src/video_core/renderer_vulkan/vk_rasterizer.cpp @@ -870,7 +870,7 @@ void RasterizerVulkan::BeginTransformFeedback() { UNIMPLEMENTED_IF(binding.buffer_offset != 0); const GPUVAddr gpu_addr = binding.Address(); - const std::size_t size = binding.buffer_size; + const auto size = static_cast<VkDeviceSize>(binding.buffer_size); const auto [buffer, offset] = buffer_cache.UploadMemory(gpu_addr, size, 4, true); scheduler.Record([buffer = buffer, offset = offset, size](vk::CommandBuffer cmdbuf) { |