lux/yuzu
1
0
Fork 0
mirror of https://git.h3cjp.net/H3cJP/yuzu.git synced 2024-11-15 13:32:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #6188 from lioncash/bits

Browse source 
vk_texture_cache: Make use of bit_cast where applicable
This commit is contained in:
bunnei 2021-04-13 16:44:49 -07:00 committed by GitHub
parent 154eb3cfbe 4198c92ed0
commit 62b560e8e3
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
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;