Skip to content

Commit ea9b9ed

Browse files
committed
auto
1 parent f4bb3d7 commit ea9b9ed

14 files changed

Lines changed: 100 additions & 78 deletions

File tree

Framework/Renderer/Vulkan/VulkanTexture.cpp

Lines changed: 1 addition & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -98,27 +98,7 @@ void UImGui::VulkanTexture::load(TextureData& dt, void* data, FVector2 size, uin
9898
return;
9999
}
100100

101-
const vk::SamplerCreateInfo samplerCreateInfo
102-
{
103-
.sType = vk::StructureType::eSamplerCreateInfo,
104-
.magFilter = dt.bFiltered ? vk::Filter::eLinear : vk::Filter::eNearest,
105-
.minFilter = dt.bFiltered ? vk::Filter::eLinear : vk::Filter::eNearest,
106-
.mipmapMode = vk::SamplerMipmapMode::eLinear,
107-
.addressModeU = vk::SamplerAddressMode::eRepeat,
108-
.addressModeV = vk::SamplerAddressMode::eRepeat,
109-
.addressModeW = vk::SamplerAddressMode::eRepeat,
110-
.maxAnisotropy = 1.0f,
111-
.minLod = -1000,
112-
.maxLod = 1000,
113-
};
114-
result = device.createSampler(&samplerCreateInfo, nullptr, &texDt->sampler);
115-
if (result != vk::Result::eSuccess)
116-
{
117-
Logger::log("Couldn't create image sampler for Vulkan texture at location: ", ULOG_LOG_TYPE_WARNING, dt.filename);
118-
return;
119-
}
120-
121-
texDt->descriptorSet = ImGui_ImplVulkan_AddTexture(texDt->sampler, texDt->imageView, VK_IMAGE_LAYOUT_SHADER_READ_ONLY_OPTIMAL);
101+
texDt->descriptorSet = ImGui_ImplVulkan_AddTexture(texDt->imageView, VK_IMAGE_LAYOUT_SHADER_READ_ONLY_OPTIMAL);
122102

123103
const vk::BufferCreateInfo bufferCreateInfo =
124104
{
@@ -296,7 +276,6 @@ void UImGui::VulkanTexture::clear(TextureData& dt) noexcept
296276

297277
device.freeMemory(texDt->uploadBufferMemory, nullptr);
298278
device.destroyBuffer(texDt->uploadBuffer, nullptr);
299-
device.destroySampler(texDt->sampler, nullptr);
300279
device.destroyImageView(texDt->imageView, nullptr);
301280
device.destroyImage(texDt->image, nullptr);
302281
device.freeMemory(texDt->imageMemory, nullptr);

Framework/Renderer/Vulkan/VulkanTexture.hpp

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,6 @@ namespace UImGui
3434
vk::ImageView imageView{};
3535
vk::Image image{};
3636
vk::DeviceMemory imageMemory{};
37-
vk::Sampler sampler{};
3837
vk::Buffer uploadBuffer{};
3938
vk::DeviceMemory uploadBufferMemory{};
4039
};

0 commit comments

Comments
 (0)