From 075dc94f801a46f72a7dd98ef1ee86e9886d9058 Mon Sep 17 00:00:00 2001
From: Dynamitos <dynamitos@hey.com>
Date: Sun, 6 Jul 2025 21:34:38 +0200
Subject: [PATCH] Creating texture views with the correct view type

---
 res/shaders/lib/LightEnv.slang         |  2 +-
 src/Engine/Graphics/Vulkan/Texture.cpp | 10 +++++++++-
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/res/shaders/lib/LightEnv.slang b/res/shaders/lib/LightEnv.slang
index 11f6b74..8231b94 100644
--- a/res/shaders/lib/LightEnv.slang
+++ b/res/shaders/lib/LightEnv.slang
@@ -343,7 +343,7 @@ struct CookTorrance : IBRDF
         float3 k_s = FresnelSchlickRoughness(max(dot(normal, viewDir_WS), 0.0), F0, roughness);
         float3 k_d = 1 - k_s;
         k_d *= 1 - metallic;
-        float3 irradiance = pLightEnv.irradianceMap.Sample(pLightEnv.irradianceSampler, normal).rgb;
+        float3 irradiance = pLightEnv.irradianceMap.SampleLevel(pLightEnv.irradianceSampler, normal, 4).rgb;
         float3 diffuse = irradiance * baseColor;
         return (k_d * diffuse) * ambientOcclusion;
     }
diff --git a/src/Engine/Graphics/Vulkan/Texture.cpp b/src/Engine/Graphics/Vulkan/Texture.cpp
index c615c5b..47f89f1 100644
--- a/src/Engine/Graphics/Vulkan/Texture.cpp
+++ b/src/Engine/Graphics/Vulkan/Texture.cpp
@@ -62,12 +62,20 @@ void TextureView::setLayout(Gfx::SeImageLayout layout) { source->layout = layout
 
 Gfx::OTextureView TextureHandle::createTextureView(uint32 baseMipLevel, uint32 levelCount, uint32 baseArrayLayer, uint32 layerCount) {
     VkImageView view;
+    VkImageViewType type = viewType;
+    if (type == VK_IMAGE_VIEW_TYPE_CUBE || type == VK_IMAGE_VIEW_TYPE_CUBE_ARRAY) {
+        if (layerCount == 1) {
+            type = VK_IMAGE_VIEW_TYPE_2D;
+        } else if (layerCount % 6 != 0) {
+            type = VK_IMAGE_VIEW_TYPE_2D_ARRAY;
+        }
+    }
     VkImageViewCreateInfo createInfo = {
         .sType = VK_STRUCTURE_TYPE_IMAGE_VIEW_CREATE_INFO,
         .pNext = nullptr,
         .flags = 0,
         .image = image,
-        .viewType = viewType,
+        .viewType = type,
         .format = cast(format),
         .subresourceRange =
             {