franklinblanco
/
yuzu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

vk_texture_cache: Make use of Common::BitCast where applicable 

Also clarify the TODO comment a little more on the lacking
implementations for std::bit_cast.
This commit is contained in:
Lioncash 2021-04-12 06:04:55 -04:00
parent 26d60014d0
commit 4198c92ed0
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/video_core/renderer_vulkan/vk_texture_cache.cpp
View File

@ -7,6 +7,8 @@
#include <span> #include <span>
#include <vector> #include <vector>
#include "common/bit_cast.h"
#include "video_core/engines/fermi_2d.h" #include "video_core/engines/fermi_2d.h"
#include "video_core/renderer_vulkan/blit_image.h" #include "video_core/renderer_vulkan/blit_image.h"
#include "video_core/renderer_vulkan/maxwell_to_vk.h" #include "video_core/renderer_vulkan/maxwell_to_vk.h"
@ -1062,14 +1064,13 @@ vk::ImageView ImageView::MakeDepthStencilView(VkImageAspectFlags aspect_mask) {
Sampler::Sampler(TextureCacheRuntime& runtime, const Tegra::Texture::TSCEntry& tsc) { Sampler::Sampler(TextureCacheRuntime& runtime, const Tegra::Texture::TSCEntry& tsc) {
const auto& device = runtime.device; const auto& device = runtime.device;
const bool arbitrary_borders = runtime.device.IsExtCustomBorderColorSupported(); const bool arbitrary_borders = runtime.device.IsExtCustomBorderColorSupported();
const std::array<float, 4> color = tsc.BorderColor(); const auto color = tsc.BorderColor();
// C++20 bit_cast
VkClearColorValue border_color;
std::memcpy(&border_color, &color, sizeof(color));
const VkSamplerCustomBorderColorCreateInfoEXT border_ci{ const VkSamplerCustomBorderColorCreateInfoEXT border_ci{
.sType = VK_STRUCTURE_TYPE_SAMPLER_CUSTOM_BORDER_COLOR_CREATE_INFO_EXT, .sType = VK_STRUCTURE_TYPE_SAMPLER_CUSTOM_BORDER_COLOR_CREATE_INFO_EXT,
.pNext = nullptr, .pNext = nullptr,
.customBorderColor = border_color, // TODO: Make use of std::bit_cast once libc++ supports it.
.customBorderColor = Common::BitCast<VkClearColorValue>(color),
.format = VK_FORMAT_UNDEFINED, .format = VK_FORMAT_UNDEFINED,
}; };
const void* pnext = nullptr; const void* pnext = nullptr;