mirror of
https://github.com/simple64/simple64.git
synced 2026-11-13 17:48:42 +01:00
update parallel rdp
This commit is contained in:
1 parent
6705d5e44e
commit
19445a0df4
62 files changed
+110819
-53611
No files matched your search
@@ -25,11 +25,12 @@
|
||||
|
||||
namespace Vulkan
|
||||
{
|
||||
Sampler::Sampler(Device *device_, VkSampler sampler_, const SamplerCreateInfo &info)
|
||||
Sampler::Sampler(Device *device_, VkSampler sampler_, const SamplerCreateInfo &info, bool immutable_)
|
||||
: Cookie(device_)
|
||||
, device(device_)
|
||||
, sampler(sampler_)
|
||||
, create_info(info)
|
||||
, immutable(immutable_)
|
||||
{
|
||||
}
|
||||
|
||||
@@ -37,7 +38,9 @@ Sampler::~Sampler()
|
||||
{
|
||||
if (sampler)
|
||||
{
|
||||
if (internal_sync)
|
||||
if (immutable)
|
||||
device->get_device_table().vkDestroySampler(device->get_device(), sampler, nullptr);
|
||||
else if (internal_sync)
|
||||
device->destroy_sampler_nolock(sampler);
|
||||
else
|
||||
device->destroy_sampler(sampler);
|
||||
@@ -48,4 +51,76 @@ void SamplerDeleter::operator()(Sampler *sampler)
|
||||
{
|
||||
sampler->device->handle_pool.samplers.free(sampler);
|
||||
}
|
||||
|
||||
VkSamplerCreateInfo Sampler::fill_vk_sampler_info(const SamplerCreateInfo &sampler_info)
|
||||
{
|
||||
VkSamplerCreateInfo info = { VK_STRUCTURE_TYPE_SAMPLER_CREATE_INFO };
|
||||
|
||||
info.magFilter = sampler_info.mag_filter;
|
||||
info.minFilter = sampler_info.min_filter;
|
||||
info.mipmapMode = sampler_info.mipmap_mode;
|
||||
info.addressModeU = sampler_info.address_mode_u;
|
||||
info.addressModeV = sampler_info.address_mode_v;
|
||||
info.addressModeW = sampler_info.address_mode_w;
|
||||
info.mipLodBias = sampler_info.mip_lod_bias;
|
||||
info.anisotropyEnable = sampler_info.anisotropy_enable;
|
||||
info.maxAnisotropy = sampler_info.max_anisotropy;
|
||||
info.compareEnable = sampler_info.compare_enable;
|
||||
info.compareOp = sampler_info.compare_op;
|
||||
info.minLod = sampler_info.min_lod;
|
||||
info.maxLod = sampler_info.max_lod;
|
||||
info.borderColor = sampler_info.border_color;
|
||||
info.unnormalizedCoordinates = sampler_info.unnormalized_coordinates;
|
||||
return info;
|
||||
}
|
||||
|
||||
ImmutableSampler::ImmutableSampler(Util::Hash hash, Device *device_, const SamplerCreateInfo &sampler_info,
|
||||
const ImmutableYcbcrConversion *ycbcr_)
|
||||
: HashedObject<ImmutableSampler>(hash), device(device_), ycbcr(ycbcr_)
|
||||
{
|
||||
VkSamplerYcbcrConversionInfoKHR conv_info = { VK_STRUCTURE_TYPE_SAMPLER_YCBCR_CONVERSION_INFO };
|
||||
auto info = Sampler::fill_vk_sampler_info(sampler_info);
|
||||
|
||||
if (ycbcr)
|
||||
{
|
||||
conv_info.conversion = ycbcr->get_conversion();
|
||||
info.pNext = &conv_info;
|
||||
}
|
||||
|
||||
#ifdef VULKAN_DEBUG
|
||||
LOGI("Creating immutable sampler.\n");
|
||||
#endif
|
||||
|
||||
VkSampler vk_sampler = VK_NULL_HANDLE;
|
||||
if (device->get_device_table().vkCreateSampler(device->get_device(), &info, nullptr, &vk_sampler) != VK_SUCCESS)
|
||||
LOGE("Failed to create sampler.\n");
|
||||
|
||||
#ifdef GRANITE_VULKAN_FOSSILIZE
|
||||
register_sampler(vk_sampler, hash, info);
|
||||
#endif
|
||||
|
||||
sampler = SamplerHandle(device->handle_pool.samplers.allocate(device, vk_sampler, sampler_info, true));
|
||||
}
|
||||
|
||||
ImmutableYcbcrConversion::ImmutableYcbcrConversion(Util::Hash hash, Device *device_,
|
||||
const VkSamplerYcbcrConversionCreateInfo &info)
|
||||
: HashedObject<ImmutableYcbcrConversion>(hash), device(device_)
|
||||
{
|
||||
if (device->get_device_features().sampler_ycbcr_conversion_features.samplerYcbcrConversion)
|
||||
{
|
||||
if (device->get_device_table().vkCreateSamplerYcbcrConversionKHR(device->get_device(), &info, nullptr,
|
||||
&conversion) != VK_SUCCESS)
|
||||
{
|
||||
LOGE("Failed to create YCbCr conversion.\n");
|
||||
}
|
||||
}
|
||||
else
|
||||
LOGE("Ycbcr conversion is not supported on this device.\n");
|
||||
}
|
||||
|
||||
ImmutableYcbcrConversion::~ImmutableYcbcrConversion()
|
||||
{
|
||||
if (conversion)
|
||||
device->get_device_table().vkDestroySamplerYcbcrConversionKHR(device->get_device(), conversion, nullptr);
|
||||
}
|
||||
}
|
||||
Reference in new issue
Block a user