Skip to content

Commit

Permalink
Create Ycbcr samplers
Browse files Browse the repository at this point in the history
  • Loading branch information
@corporateshark
corporateshark committed Jul 4, 2024
1 parent 9ef5f1b commit 7500ba5
Show file tree
Hide file tree
Showing 2 changed files with 35 additions and 8 deletions.
37 changes: 30 additions & 7 deletions lvk/vulkan/VulkanClasses.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -771,11 +771,13 @@ VkImageView lvk::VulkanImage::createImageView(VkDevice device,
uint32_t baseLayer,
uint32_t numLayers,
const VkComponentMapping mapping,
const VkSamplerYcbcrConversionInfo* ycbcr,
const char* debugName) const {
LVK_PROFILER_FUNCTION_COLOR(LVK_PROFILER_COLOR_CREATE);

const VkImageViewCreateInfo ci = {
.sType = VK_STRUCTURE_TYPE_IMAGE_VIEW_CREATE_INFO,
.pNext = ycbcr,
.image = vkImage_,
.viewType = type,
.format = format,
Expand Down Expand Up @@ -1148,6 +1150,7 @@ lvk::VulkanSwapchain::VulkanSwapchain(VulkanContext& ctx, uint32_t width, uint32
0,
1,
{},
nullptr,
debugNameImageView);

swapchainTextures_[i] = ctx_.texturesPool_.create(std::move(image));
Expand Down Expand Up @@ -3193,8 +3196,9 @@ lvk::Holder<lvk::SamplerHandle> lvk::VulkanContext::createSampler(const SamplerS

Result result;

SamplerHandle handle =
createSampler(samplerStateDescToVkSamplerCreateInfo(desc, getVkPhysicalDeviceProperties().limits), &result, desc.debugName);
const VkSamplerCreateInfo info = samplerStateDescToVkSamplerCreateInfo(desc, getVkPhysicalDeviceProperties().limits);

SamplerHandle handle = createSampler(info, &result, Format_Invalid, desc.debugName);

if (!LVK_VERIFY(result.isOk())) {
Result::setResult(outResult, Result(Result::Code::RuntimeError, "Cannot create Sampler"));
Expand Down Expand Up @@ -3465,8 +3469,10 @@ lvk::Holder<lvk::TextureHandle> lvk::VulkanContext::createTexture(const TextureD
.a = VkComponentSwizzle(desc.swizzle.a),
};

const VkSamplerYcbcrConversionInfo* ycbcrInfo = isDisjoint ? getOrCreateYcbcrConversionInfo(desc.format) : nullptr;

image.imageView_ = image.createImageView(
vkDevice_, vkImageViewType, vkFormat, aspect, 0, VK_REMAINING_MIP_LEVELS, 0, numLayers, mapping, debugNameImageView);
vkDevice_, vkImageViewType, vkFormat, aspect, 0, VK_REMAINING_MIP_LEVELS, 0, numLayers, mapping, ycbcrInfo, debugNameImageView);

if (!LVK_VERIFY(image.imageView_ != VK_NULL_HANDLE)) {
Result::setResult(outResult, Result::Code::RuntimeError, "Cannot create VkImageView");
Expand Down Expand Up @@ -3580,7 +3586,7 @@ const VkSamplerYcbcrConversionInfo* lvk::VulkanContext::getOrCreateYcbcrConversi
const VkSamplerCreateInfo cinfo = samplerStateDescToVkSamplerCreateInfo({}, getVkPhysicalDeviceProperties().limits);

pimpl_->ycbcrConversionData_[format].info = info;
//pimpl_->ycbcrConversionData_[format].sampler = {this, this->createSampler(cinfo, nullptr, format, "YUV sampler")};
pimpl_->ycbcrConversionData_[format].sampler = {this, this->createSampler(cinfo, nullptr, format, "YUV sampler")};

return &pimpl_->ycbcrConversionData_[format].info;
}
Expand Down Expand Up @@ -5130,6 +5136,7 @@ lvk::Result lvk::VulkanContext::initContext(const HWDeviceDesc& desc) {
.unnormalizedCoordinates = VK_FALSE,
},
nullptr,
Format_Invalid,
"Sampler: default");

growDescriptorPool(currentMaxTextures_, currentMaxSamplers_);
Expand Down Expand Up @@ -5472,12 +5479,28 @@ void lvk::VulkanContext::checkAndUpdateDescriptorSets() {
awaitingCreation_ = false;
}

lvk::SamplerHandle lvk::VulkanContext::createSampler(const VkSamplerCreateInfo& ci, lvk::Result* outResult, const char* debugName) {
lvk::SamplerHandle lvk::VulkanContext::createSampler(const VkSamplerCreateInfo& ci,
lvk::Result* outResult,
lvk::Format yuvFormat,
const char* debugName) {
LVK_PROFILER_FUNCTION_COLOR(LVK_PROFILER_COLOR_CREATE);

VkSampler sampler = VK_NULL_HANDLE;
VkSamplerCreateInfo cinfo = ci;

if (yuvFormat != Format_Invalid) {
cinfo.pNext = getOrCreateYcbcrConversionInfo(yuvFormat);
// must be CLAMP_TO_EDGE
// https://vulkan.lunarg.com/doc/view/1.3.268.0/windows/1.3-extensions/vkspec.html#VUID-VkSamplerCreateInfo-addressModeU-01646
cinfo.addressModeU = VK_SAMPLER_ADDRESS_MODE_CLAMP_TO_EDGE;
cinfo.addressModeV = VK_SAMPLER_ADDRESS_MODE_CLAMP_TO_EDGE;
cinfo.addressModeW = VK_SAMPLER_ADDRESS_MODE_CLAMP_TO_EDGE;
cinfo.anisotropyEnable = VK_FALSE;
cinfo.unnormalizedCoordinates = VK_FALSE;
awaitingNewImmutableSamplers_ = true;
}

VK_ASSERT(vkCreateSampler(vkDevice_, &ci, nullptr, &sampler));
VkSampler sampler = VK_NULL_HANDLE;
VK_ASSERT(vkCreateSampler(vkDevice_, &cinfo, nullptr, &sampler));
VK_ASSERT(lvk::setDebugObjectName(vkDevice_, VK_OBJECT_TYPE_SAMPLER, (uint64_t)sampler, debugName));

SamplerHandle handle = samplersPool_.create(VkSampler(sampler));
Expand Down
6 changes: 5 additions & 1 deletion lvk/vulkan/VulkanClasses.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -75,6 +75,7 @@ struct VulkanImage final {
.g = VK_COMPONENT_SWIZZLE_IDENTITY,
.b = VK_COMPONENT_SWIZZLE_IDENTITY,
.a = VK_COMPONENT_SWIZZLE_IDENTITY},
const VkSamplerYcbcrConversionInfo* ycbcr = nullptr,
const char* debugName = nullptr) const;

void generateMipmap(VkCommandBuffer commandBuffer) const;
Expand Down Expand Up @@ -494,7 +495,10 @@ class VulkanContext final : public IContext {
VkMemoryPropertyFlags memFlags,
lvk::Result* outResult,
const char* debugName = nullptr);
SamplerHandle createSampler(const VkSamplerCreateInfo& ci, lvk::Result* outResult, const char* debugName = nullptr);
SamplerHandle createSampler(const VkSamplerCreateInfo& ci,
lvk::Result* outResult,
lvk::Format yuvFormat = Format_Invalid,
const char* debugName = nullptr);

bool hasSwapchain() const noexcept {
return swapchain_ != nullptr;
Expand Down

0 comments on commit 7500ba5

Please sign in to comment.