diff --git a/aster/include/aster/core/image_view.h b/aster/include/aster/core/image_view.h index 9b82c1e..072a40f 100644 --- a/aster/include/aster/core/image_view.h +++ b/aster/include/aster/core/image_view.h @@ -8,7 +8,7 @@ #include "global.h" #include "image.h" -template +template struct View { using ImageType = TImage; @@ -69,7 +69,7 @@ struct View } }; -struct ImageView : View<> +struct ImageView : View { }; diff --git a/aster/include/aster/systems/resource_manager.h b/aster/include/aster/systems/resource_manager.h index 6977d6e..df18dcd 100644 --- a/aster/include/aster/systems/resource_manager.h +++ b/aster/include/aster/systems/resource_manager.h @@ -20,9 +20,9 @@ class ResourceManager struct CombinedImageViewManager { ImageManager *m_ImageManager; - ImageViewManager *m_ViewManager; + ViewManager *m_ViewManager; - CombinedImageViewManager(ImageManager *imageManager, ImageViewManager *viewManager) + CombinedImageViewManager(ImageManager *imageManager, ViewManager *viewManager) : m_ImageManager{imageManager} , m_ViewManager{viewManager} { @@ -92,7 +92,7 @@ class ResourceManager BufferManager m_Buffers; ImageManager m_Images; SamplerManager m_Samplers; - ImageViewManager m_Views; + ViewManager m_Views; CombinedImageViewManager m_CombinedImageViews; public: @@ -117,7 +117,7 @@ class ResourceManager return m_Images; } - ImageViewManager & + ViewManager & Views() { return m_Views; diff --git a/aster/include/aster/systems/view_manager.h b/aster/include/aster/systems/view_manager.h index d6f5c69..a25738b 100644 --- a/aster/include/aster/systems/view_manager.h +++ b/aster/include/aster/systems/view_manager.h @@ -86,10 +86,10 @@ struct ViewCreateInfo } }; -class ImageViewManager final : public Manager +class ViewManager final : public Manager { public: - ImageViewManager(const Device *device, u32 maxCount); + ViewManager(const Device *device, u32 maxCount); template Ref diff --git a/aster/src/aster/systems/view_manager.cpp b/aster/src/aster/systems/view_manager.cpp index f22183f..0ff6444 100644 --- a/aster/src/aster/systems/view_manager.cpp +++ b/aster/src/aster/systems/view_manager.cpp @@ -9,13 +9,13 @@ using namespace systems; -ImageViewManager::ImageViewManager(const Device *device, const u32 maxCount) +ViewManager::ViewManager(const Device *device, const u32 maxCount) : Manager{device, maxCount} { } Ref -ImageViewManager::CreateView(const ViewCreateInfo<> &createInfo) +ViewManager::CreateView(const ViewCreateInfo<> &createInfo) { const auto layerCount = createInfo.GetLayerCount(); const auto mipCount = createInfo.GetMipLevelCount();