diff --git a/data/shaders/offscreen/mirror.frag b/data/shaders/offscreen/mirror.frag index 396f43db..9c784dc2 100644 --- a/data/shaders/offscreen/mirror.frag +++ b/data/shaders/offscreen/mirror.frag @@ -1,7 +1,6 @@ #version 450 layout (binding = 1) uniform sampler2D samplerColor; -layout (binding = 2) uniform sampler2D samplerColorMap; layout (location = 0) in vec2 inUV; layout (location = 1) in vec4 inPos; @@ -21,8 +20,7 @@ void main() // For demonstration purposes only const float blurSize = 1.0 / 512.0; - vec4 color = texture(samplerColorMap, inUV); - outFragColor = color * 0.25; + outFragColor = vec4(vec3(0.0), 1.); if (gl_FrontFacing) { @@ -35,6 +33,6 @@ void main() reflection += texture(samplerColor, vec2(projCoord.s + x * blurSize, projCoord.t + y * blurSize)) / 49.0; } } - outFragColor += reflection * 1.5 * (color.r); + outFragColor += reflection; }; } \ No newline at end of file diff --git a/data/shaders/offscreen/mirror.frag.spv b/data/shaders/offscreen/mirror.frag.spv index abfc8dd8..dfe1a34b 100644 Binary files a/data/shaders/offscreen/mirror.frag.spv and b/data/shaders/offscreen/mirror.frag.spv differ diff --git a/examples/offscreen/offscreen.cpp b/examples/offscreen/offscreen.cpp index 1f6b6830..5389cfd2 100644 --- a/examples/offscreen/offscreen.cpp +++ b/examples/offscreen/offscreen.cpp @@ -19,7 +19,6 @@ #include #include "vulkanexamplebase.h" -#include "VulkanTexture.hpp" #include "VulkanModel.hpp" #include "VulkanBuffer.hpp" @@ -34,10 +33,6 @@ class VulkanExample : public VulkanExampleBase public: bool debugDisplay = false; - struct { - vks::Texture2D colorMap; - } textures; - // Vertex layout for the models vks::VertexLayout vertexLayout = vks::VertexLayout({ vks::VERTEX_COMPONENT_POSITION, @@ -124,9 +119,6 @@ public: // Clean up used Vulkan resources // Note : Inherited destructor cleans up resources stored in base class - // Textures - textures.colorMap.destroy(); - // Frame buffer // Color attachment @@ -453,20 +445,6 @@ public: { models.plane.loadFromFile(getAssetPath() + "models/plane.obj", vertexLayout, 0.5f, vulkanDevice, queue); models.example.loadFromFile(getAssetPath() + "models/chinesedragon.dae", vertexLayout, 0.3f, vulkanDevice, queue); - - // Textures - if (vulkanDevice->features.textureCompressionBC) { - textures.colorMap.loadFromFile(getAssetPath() + "textures/darkmetal_bc3_unorm.ktx", VK_FORMAT_BC3_UNORM_BLOCK, vulkanDevice, queue); - } - else if (vulkanDevice->features.textureCompressionASTC_LDR) { - textures.colorMap.loadFromFile(getAssetPath() + "textures/darkmetal_astc_8x8_unorm.ktx", VK_FORMAT_ASTC_8x8_UNORM_BLOCK, vulkanDevice, queue); - } - else if (vulkanDevice->features.textureCompressionETC2) { - textures.colorMap.loadFromFile(getAssetPath() + "textures/darkmetal_etc2_unorm.ktx", VK_FORMAT_ETC2_R8G8B8_UNORM_BLOCK, vulkanDevice, queue); - } - else { - vks::tools::exitFatal("Device does not support any compressed texture format!", VK_ERROR_FEATURE_NOT_PRESENT); - } } void generateQuad() @@ -591,12 +569,6 @@ public: VK_DESCRIPTOR_TYPE_COMBINED_IMAGE_SAMPLER, 1, &offscreenPass.descriptor), - // Binding 2 : Fragment shader texture sampler - vks::initializers::writeDescriptorSet( - descriptorSets.mirror, - VK_DESCRIPTOR_TYPE_COMBINED_IMAGE_SAMPLER, - 2, - &textures.colorMap.descriptor) }; vkUpdateDescriptorSets(device, writeDescriptorSets.size(), writeDescriptorSets.data(), 0, NULL); @@ -625,7 +597,6 @@ public: allocInfo.pSetLayouts = &descriptorSetLayouts.shaded; // Model - // No texture VK_CHECK_RESULT(vkAllocateDescriptorSets(device, &allocInfo, &descriptorSets.model)); std::vector modelWriteDescriptorSets =