[*] Backup of progress

include/inexor/vulkan-renderer/cubemap/cubemap.hpp

@@ -1,7 +1,25 @@
 #pragma once
 
+#include "inexor/vulkan-renderer/wrapper/device.hpp"
+#include "inexor/vulkan-renderer/wrapper/image.hpp"
+#include "inexor/vulkan-renderer/wrapper/offscreen_framebuffer.hpp"
+
+#include <memory>
+
 namespace inexor::vulkan_renderer::cubemap {
 
-class Cubemap {};
+/// @brief A wrapper class for cubemaps
+class Cubemap {
+
+private:
+    std::unique_ptr<wrapper::Image> m_cubemap_image;
+    std::unique_ptr<wrapper::OffscreenFramebuffer> m_offscreen_framebuffer;
+    VkSampler m_sampler{VK_NULL_HANDLE};
+
+public:
+    ///
+    ///
+    Cubemap(const wrapper::Device &device);
+};
 
 } // namespace inexor::vulkan_renderer::cubemap

include/inexor/vulkan-renderer/wrapper/gpu_texture.hpp

@@ -101,7 +101,7 @@ class GpuTexture {
     }
 
     [[nodiscard]] VkImage image() const {
-        return m_texture_image->get();
+        return m_texture_image->image();
     }
 
     [[nodiscard]] VkImageView image_view() const {

include/inexor/vulkan-renderer/wrapper/image.hpp

@@ -11,25 +11,104 @@ class Device;
 
 /// @brief RAII wrapper class for VkImage.
 class Image {
-    const wrapper::Device &m_device;
+    const Device &m_device;
     VmaAllocation m_allocation{VK_NULL_HANDLE};
     VmaAllocationInfo m_allocation_info{};
     VkImage m_image{VK_NULL_HANDLE};
     VkFormat m_format{VK_FORMAT_UNDEFINED};
     VkImageView m_image_view{VK_NULL_HANDLE};
     std::string m_name;
 
+    /// @brief Call vmaCreateImage and assign an internal debug marker name.
+    /// @param image_ci The image create info
+    void create_image(VkImageCreateInfo image_ci);
+
+    /// @brief Call vkCreateImageView and assign an internal debug marker name.
+    /// @param image_view_ci The image view create info
+    void create_image_view(VkImageViewCreateInfo image_view_ci);
+
 public:
-    /// @brief Default constructor.
-    /// @param device The const reference to a device RAII wrapper instance.
-    /// @param format The color format.
-    /// @param image_usage The image usage flags.
-    /// @param aspect_flags The aspect flags.
-    /// @param sample_count The sample count.
-    /// @param name The internal debug marker name of the VkImage.
-    /// @param image_extent The width and height of the image.
-    Image(const Device &device, VkFormat format, VkImageUsageFlags image_usage, VkImageAspectFlags aspect_flags,
-          VkSampleCountFlagBits sample_count, const std::string &name, VkExtent2D image_extent);
+    /// @brief This is the most verbose constructor. It offers all create structures as parameters.
+    /// @note More constructors with increasing amount of abstraction can be found below. Not that this constructor is
+    /// the most explicit because you have to fill out ``VkImageCreateInfo`` and ``VkImageViewCreateInfo`` manually.
+    /// @param device The device wrapper
+    /// @param image_ci The image create info
+    /// @param image_view_ci The image view create info
+    /// @param name The internal debug marker name of the image
+    /// @note std::move(name) is used since we must take ownership of the memory for assigning a Vulkan debug marker
+    Image(const Device &device, VkImageCreateInfo image_ci, VkImageViewCreateInfo image_view_ci, std::string name);
+
+    /// @brief Call the constructor above, but expose most parameters to the programmer.
+    /// @param device The device wrapper
+    /// @param flags The image creation flags
+    /// @param image_type The type of the image
+    /// @param format The image format
+    /// @param width The width of the image in pixels
+    /// @param height The height of the image in pixels
+    /// @param miplevel_count The number of mip levels
+    /// @param layer_count The number of layers in the image
+    /// @param sample_count The number of samples per pixel
+    /// @param usage_flags The image usage flags
+    /// @param view_type The view type of the image view
+    /// @param view_components The component bits of the image view
+    /// @param aspect_mask The aspect mask of the image view
+    /// @param name The internal debug marker name of the image
+    /// @note std::move(name) is used since we must take ownership of the memory for assigning a Vulkan debug marker
+    Image(const Device &device, VkImageCreateFlags flags, VkImageType image_type, VkFormat format, std::uint32_t width,
+          std::uint32_t height, std::uint32_t miplevel_count, std::uint32_t layer_count,
+          VkSampleCountFlagBits sample_count, VkImageUsageFlags usage_flags, VkImageViewType view_type,
+          VkComponentMapping view_components, VkImageAspectFlags aspect_mask, std::string name);
+
+    /// @brief Call constructor #2, but don't expose ``view_components``.
+    /// @param device The device wrapper
+    /// @param flags The image creation flags
+    /// @param image_type The type of the image
+    /// @param format The image format
+    /// @param width The width of the image in pixels
+    /// @param height The height of the image in pixels
+    /// @param miplevel_count The number of mip levels
+    /// @param layer_count The number of layers in the image
+    /// @param sample_count The number of samples per pixel
+    /// @param usage_flags The image usage flags
+    /// @param view_type The view type of the image view
+    /// @param aspect_mask The aspect mask of the image view
+    /// @param name The internal debug marker name of the image
+    /// @note std::move(name) is used since we must take ownership of the memory for assigning a Vulkan debug marker
+    Image(const Device &device, VkImageCreateFlags flags, VkImageType image_type, VkFormat format, std::uint32_t width,
+          std::uint32_t height, std::uint32_t miplevel_count, std::uint32_t layer_count,
+          VkSampleCountFlagBits sample_count, VkImageUsageFlags usage_flags, VkImageViewType view_type,
+          VkImageAspectFlags aspect_mask, std::string name);
+
+    /// @brief Call constructor #2, but don't expose ``flags``.
+    /// @param device The device wrapper
+    /// @param image_type The type of the image
+    /// @param format The image format
+    /// @param width The width of the image in pixels
+    /// @param height The height of the image in pixels
+    /// @param miplevel_count The number of mip levels
+    /// @param layer_count The number of layers in the image
+    /// @param sample_count The number of samples per pixel
+    /// @param usage_flags The image usage flags
+    /// @param view_type The view type of the image view
+    /// @param aspect_mask The aspect mask of the image view
+    /// @param name The internal debug marker name of the image
+    /// @note std::move(name) is used since we must take ownership of the memory for assigning a Vulkan debug marker
+    Image(const Device &device, VkImageType image_type, VkFormat format, std::uint32_t width, std::uint32_t height,
+          std::uint32_t miplevel_count, std::uint32_t layer_count, VkSampleCountFlagBits sample_count,
+          VkImageUsageFlags usage_flags, VkImageViewType view_type, VkImageAspectFlags aspect_mask, std::string name);
+
+    /// @brief Call constructor #2, but don't expose ``image_type``, ``miplevel_count``, ``layer_count``,
+    /// ``sample_count``, and ``view_type``.
+    /// @param device The device wrapper
+    /// @param format The image format
+    /// @param width The width of the image in pixels
+    /// @param height The height of the image in pixels
+    /// @param usage_flags The image usage flags
+    /// @param aspect_mask The aspect mask of the image view
+    /// @param name The internal debug marker name of the image
+    /// @note std::move(name) is used since we must take ownership of the memory for assigning a Vulkan debug marker
+    Image::Image(const Device &device, VkFormat format, std::uint32_t width, std::uint32_t height,
+                 VkImageUsageFlags usage_flags, VkImageAspectFlags aspect_mask, std::string name);
 
     Image(const Image &) = delete;
     Image(Image &&) noexcept;
@@ -47,7 +126,7 @@ class Image {
         return m_image_view;
     }
 
-    [[nodiscard]] VkImage get() const {
+    [[nodiscard]] VkImage image() const {
         return m_image;
     }
 };

include/inexor/vulkan-renderer/wrapper/offscreen_framebuffer.hpp

@@ -0,0 +1,26 @@
+#pragma once
+
+#include "inexor/vulkan-renderer/wrapper/descriptor.hpp"
+#include "inexor/vulkan-renderer/wrapper/framebuffer.hpp"
+#include "inexor/vulkan-renderer/wrapper/image.hpp"
+
+#include <memory>
+
+namespace inexor::vulkan_renderer::wrapper {
+
+class OffscreenFramebuffer : public Framebuffer, public Image {
+
+public:
+    /// @brief Create the framebuffer and its image.
+    /// @param device The device wrapper
+    /// @param format The image format
+    /// @param width The width of the offscreen framebuffer
+    /// @param height The height of the offscreen framebuffer
+    /// @param renderpass The VkRenderpass
+    /// @param attachments The image views
+    /// @param name The name of the offscreen framebuffer
+    OffscreenFramebuffer(const wrapper::Device &device, VkFormat format, std::uint32_t width, std::uint32_t height,
+                         VkRenderPass renderpass, const std::vector<VkImageView> &attachments, std::string name);
+};
+
+} // namespace inexor::vulkan_renderer::wrapper

include/inexor/vulkan-renderer/wrapper/once_command_buffer.hpp

@@ -47,12 +47,14 @@ class OnceCommandBuffer {
 
     /// @brief Create the command buffer.
     /// @note We are not merging this into the constructor because we need to be able to call this function separately.
+    // TODO: Merge create_command_buffer() into start_recording().
     void create_command_buffer();
 
     /// @brief Call vkBeginCommandBuffer.
     void start_recording();
 
     /// @brief Call vkEndCommandBuffer and vkFreeCommandBuffers.
+    // TODO: Check if submit was called!
     void end_recording_and_submit_command();
 
     [[nodiscard]] VkCommandBuffer command_buffer() const {

shaders/CMakeLists.txt

@@ -7,11 +7,11 @@ set(
     SHADERS
     brdflut/genbrdflut.frag
     brdflut/genbrdflut.vert
-    gltf/filtercube.vert
-    gltf/irradiancecube.frag
+    cubemap/filtercube.vert
+    cubemap/irradiancecube.frag
+    cubemap/prefilterenvmap.frag
     gltf/pbr.vert
     gltf/pbr_khr.frag
-    gltf/prefilterenvmap.frag
     imgui/ui.vert
     imgui/ui.frag
     octree/main.frag

src/CMakeLists.txt

@@ -56,6 +56,7 @@ set(INEXOR_SOURCE_FILES
     vulkan-renderer/wrapper/image.cpp
     vulkan-renderer/wrapper/instance.cpp
     vulkan-renderer/wrapper/make_info.cpp
+    vulkan-renderer/wrapper/offscreen_framebuffer.cpp 
     vulkan-renderer/wrapper/once_command_buffer.cpp
     vulkan-renderer/wrapper/semaphore.cpp
     vulkan-renderer/wrapper/shader.cpp