From c2b7b0b58ca8c4ec743c16781892132749b86eea Mon Sep 17 00:00:00 2001 From: nmzik Date: Fri, 18 Sep 2026 11:12:36 +0400 Subject: [PATCH] Revert "BC7-RGBA32_UINT views (Vulkan validation)" This reverts commit 165234b159156ca82aed1c3eb2de9ab60fbe3fa2. --- src/graphics/host_gpu/renderer/image/image.cpp | 10 +++------- tests/ShaderRecompilerComputeTests.cpp | 7 ------- 2 files changed, 3 insertions(+), 14 deletions(-) diff --git a/src/graphics/host_gpu/renderer/image/image.cpp b/src/graphics/host_gpu/renderer/image/image.cpp index 7b60f8bca..96b27e1e8 100644 --- a/src/graphics/host_gpu/renderer/image/image.cpp +++ b/src/graphics/host_gpu/renderer/image/image.cpp @@ -48,16 +48,12 @@ namespace { } [[nodiscard]] vk::ImageUsageFlags ImageUsageFlags(GraphicContext& graphics, const ImageInfo& info) { - auto usage = vk::ImageUsageFlagBits::eTransferSrc | vk::ImageUsageFlagBits::eTransferDst; if (info.IsBlock()) { - usage |= vk::ImageUsageFlagBits::eSampled; - if (graphics.supports_block_texel_view) { - // Uncompressed block views use storage access; ExtendedUsage permits their formats. - usage |= vk::ImageUsageFlagBits::eStorage; - } - return usage; + return vk::ImageUsageFlagBits::eTransferSrc | vk::ImageUsageFlagBits::eTransferDst | + vk::ImageUsageFlagBits::eSampled; } const auto properties = graphics.GetFormatProperties(info.pixel_format); + auto usage = vk::ImageUsageFlagBits::eTransferSrc | vk::ImageUsageFlagBits::eTransferDst; if (HasFormatFeature(properties, vk::FormatFeatureFlagBits::eSampledImage)) { usage |= vk::ImageUsageFlagBits::eSampled; } diff --git a/tests/ShaderRecompilerComputeTests.cpp b/tests/ShaderRecompilerComputeTests.cpp index ded176287..47f8bca9d 100644 --- a/tests/ShaderRecompilerComputeTests.cpp +++ b/tests/ShaderRecompilerComputeTests.cpp @@ -10442,13 +10442,6 @@ public: (vk::AccessFlagBits2::eShaderRead | vk::AccessFlagBits2::eShaderWrite), "a later sampled alias dropped an earlier storage write access"); - // Bind the raw block view through the existing uint storage descriptor layout. - auto block_bindings = graphics_bindings.vertex[0]; - block_bindings.images[0] = raw_blocks_again; - block_bindings.images[0].image_view = texture_cache.FindTexture( - raw_blocks_again.image_id, raw_blocks_again.desc); - descriptor_pipelines.push_back(RenderExecutorTestAccess::CommitBindings( - executor, scheduler.Current(), block_bindings)); RenderExecutorTestAccess::ResetBindings(executor); ShaderRecompiler::IR::Program vertex_sampled_program{};