[Release] annoying warning fix

CMakeLists.txt

@@ -20,7 +20,7 @@
 
 cmake_minimum_required(VERSION 3.22)
 
-set(WISDOM_VERSION "0.3.8")
+set(WISDOM_VERSION "0.3.9")
 project("Wisdom" VERSION ${WISDOM_VERSION})
 
 set(CMAKE_DEBUG_POSTFIX d)

Changelog.md

@@ -1,5 +1,9 @@
 # Version History
 
+- 0.3.9
+
+  - Fixed annoying warning about class/struct mismatch in C++ API
+
 - 0.3.8
 
   - Fixed render pass for DX12 always clearing, despite of value

bindings/wisdom.h

@@ -6,7 +6,7 @@
 
 /** \mainpage Wisdom API Documentation
 
-<b>Version 0.3.6</b>
+<b>Version 0.3.9</b>
 
 Copyright (c) 2024 Ilya Doroshenko. All rights reserved.
 License: MIT

generator/generator.cpp

@@ -2228,7 +2228,7 @@ std::string Generator::MakeCPPHandle(const WisHandle& s, std::string_view impl)
         ReplaceAll(doc, "\n", "\n * ");
     }
 
-    std::string head = wis::format("{}\nstruct {}{} : public wis::Impl{}{}", doc, impl, s.name, impl, s.name);
+    std::string head = wis::format("{}\class {}{} : public wis::Impl{}{}", doc, impl, s.name, impl, s.name);
     std::string ctor = wis::format("public:\n using wis::Impl{}{}::Impl{}{};", impl, s.name, impl, s.name);
 
     std::string funcs = "public:\n";

wisdom/extensions/debug_info/wisdom/wisdom_debug.h

@@ -42,8 +42,8 @@ class ImplDX12DebugExtension : public QueryInternalExtension<DX12DebugExtension,
 };
 
 #pragma region DX12DebugExtension
-
-struct DX12DebugExtension : public wis::ImplDX12DebugExtension {
+class DX12DebugExtension : public wis::ImplDX12DebugExtension
+{
 public:
     using wis::ImplDX12DebugExtension::ImplDX12DebugExtension;
 
@@ -116,8 +116,8 @@ class ImplVKDebugExtension : public QueryInternalExtension<VKDebugExtension, wis
 };
 
 #pragma region VKDebugExtension
-
-struct VKDebugExtension : public wis::ImplVKDebugExtension {
+class VKDebugExtension : public wis::ImplVKDebugExtension
+{
 public:
     using wis::ImplVKDebugExtension::ImplVKDebugExtension;
 

wisdom/include/wisdom/dx12/dx12_adapter.h

@@ -60,7 +60,8 @@ class ImplDX12Adapter : public QueryInternal<DX12Adapter>
  * @brief Represents physical device.
  * Can safely be deleted once logical device has been created.
  * */
-struct DX12Adapter : public wis::ImplDX12Adapter {
+class DX12Adapter : public wis::ImplDX12Adapter
+{
 public:
     using wis::ImplDX12Adapter::ImplDX12Adapter;
 

wisdom/include/wisdom/dx12/dx12_allocator.h

@@ -89,7 +89,8 @@ class ImplDX12ResourceAllocator : public QueryInternal<DX12ResourceAllocator>
  * @brief Main memory and resource allocator.
  * Uses DXMA and VMA libraries which can allocate memory with O(1) complexity with TLSF algorithm.
  * */
-struct DX12ResourceAllocator : public wis::ImplDX12ResourceAllocator {
+class DX12ResourceAllocator : public wis::ImplDX12ResourceAllocator
+{
 public:
     using wis::ImplDX12ResourceAllocator::ImplDX12ResourceAllocator;
 

wisdom/include/wisdom/dx12/dx12_command_list.h

@@ -105,7 +105,8 @@ class ImplDX12CommandList : public QueryInternal<DX12CommandList>
 /**
  * @brief Represents command list for recording commands.
  * */
-struct DX12CommandList : public wis::ImplDX12CommandList {
+class DX12CommandList : public wis::ImplDX12CommandList
+{
 public:
     using wis::ImplDX12CommandList::ImplDX12CommandList;
 

wisdom/include/wisdom/dx12/dx12_command_queue.h

@@ -55,7 +55,8 @@ class ImplDX12CommandQueue : public QueryInternal<DX12CommandQueue>
 /**
  * @brief Represents command queue for executing command lists.
  * */
-struct DX12CommandQueue : public wis::ImplDX12CommandQueue {
+class DX12CommandQueue : public wis::ImplDX12CommandQueue
+{
 public:
     using wis::ImplDX12CommandQueue::ImplDX12CommandQueue;
 

wisdom/include/wisdom/dx12/dx12_descriptor_buffer.h

@@ -81,7 +81,8 @@ class ImplDX12DescriptorBuffer : public QueryInternal<DX12DescriptorBuffer>
 /**
  * @brief Represents descriptor buffer for binding descriptors.
  * */
-struct DX12DescriptorBuffer : public wis::ImplDX12DescriptorBuffer {
+class DX12DescriptorBuffer : public wis::ImplDX12DescriptorBuffer
+{
 public:
     using wis::ImplDX12DescriptorBuffer::ImplDX12DescriptorBuffer;
 

wisdom/include/wisdom/dx12/dx12_device.h

@@ -104,7 +104,8 @@ class ImplDX12Device : public QueryInternal<DX12Device>
  * @brief Represents logical device.
  * Creates all the resources and commands for rendering.
  * */
-struct DX12Device : public wis::ImplDX12Device {
+class DX12Device : public wis::ImplDX12Device
+{
 public:
     using wis::ImplDX12Device::ImplDX12Device;
 

wisdom/include/wisdom/dx12/dx12_factory.h

@@ -57,7 +57,8 @@ class ImplDX12Factory : public QueryInternal<DX12Factory>
  * @brief Class for creating adapters.
  * Can be safely destroyed after adapter has been chosen.
  * */
-struct DX12Factory : public wis::ImplDX12Factory {
+class DX12Factory : public wis::ImplDX12Factory
+{
 public:
     using wis::ImplDX12Factory::ImplDX12Factory;
 

wisdom/include/wisdom/dx12/dx12_fence.h

@@ -56,7 +56,8 @@ class ImplDX12Fence : public QueryInternal<DX12Fence>
 /**
  * @brief Represents fence for synchronization of GPU timeline.
  * */
-struct DX12Fence : public wis::ImplDX12Fence {
+class DX12Fence : public wis::ImplDX12Fence
+{
 public:
     using wis::ImplDX12Fence::ImplDX12Fence;
 

wisdom/include/wisdom/dx12/dx12_memory.h

@@ -59,7 +59,8 @@ class ImplDX12Memory : public QueryInternal<DX12Memory>
 /**
  * @brief Represents memory object for binding resources.
  * */
-struct DX12Memory : public wis::ImplDX12Memory {
+class DX12Memory : public wis::ImplDX12Memory
+{
 public:
     using wis::ImplDX12Memory::ImplDX12Memory;
 

wisdom/include/wisdom/dx12/dx12_resource.h

@@ -136,7 +136,8 @@ class DX12ShaderResource : public QueryInternal<DX12ShaderResource>
 /**
  * @brief Represents buffer object for storing linear data.
  * */
-struct DX12Buffer : public wis::ImplDX12Buffer {
+class DX12Buffer : public wis::ImplDX12Buffer
+{
 public:
     using wis::ImplDX12Buffer::ImplDX12Buffer;
 

wisdom/include/wisdom/dx12/dx12_swapchain.h

@@ -111,7 +111,8 @@ class ImplDX12SwapChain : public QueryInternal<DX12SwapChain>
 /**
  * @brief Represents swap chain object for presenting images.
  * */
-struct DX12SwapChain : public wis::ImplDX12SwapChain {
+class DX12SwapChain : public wis::ImplDX12SwapChain
+{
 public:
     using wis::ImplDX12SwapChain::ImplDX12SwapChain;
 

wisdom/include/wisdom/generated/api/api.h

@@ -5,7 +5,7 @@
 
 /** \mainpage Wisdom API Documentation
 
-<b>Version 0.3.6</b>
+<b>Version 0.3.9</b>
 
 Copyright (c) 2024 Ilya Doroshenko. All rights reserved.
 License: MIT

wisdom/include/wisdom/vulkan/vk_adapter.h

@@ -38,7 +38,8 @@ class ImplVKAdapter : public QueryInternal<VKAdapter>
  * @brief Represents physical device.
  * Can safely be deleted once logical device has been created.
  * */
-struct VKAdapter : public wis::ImplVKAdapter {
+class VKAdapter : public wis::ImplVKAdapter
+{
 public:
     using wis::ImplVKAdapter::ImplVKAdapter;
 

wisdom/include/wisdom/vulkan/vk_allocator.h

@@ -104,7 +104,8 @@ class ImplVKResourceAllocator : public QueryInternal<VKResourceAllocator>
  * @brief Main memory and resource allocator.
  * Uses DXMA and VMA libraries which can allocate memory with O(1) complexity with TLSF algorithm.
  * */
-struct VKResourceAllocator : public wis::ImplVKResourceAllocator {
+class VKResourceAllocator : public wis::ImplVKResourceAllocator
+{
 public:
     using wis::ImplVKResourceAllocator::ImplVKResourceAllocator;
 

wisdom/include/wisdom/vulkan/vk_command_list.h

@@ -138,7 +138,8 @@ class ImplVKCommandList : public QueryInternal<VKCommandList>
 /**
  * @brief Represents command list for recording commands.
  * */
-struct VKCommandList : public wis::ImplVKCommandList {
+class VKCommandList : public wis::ImplVKCommandList
+{
 public:
     using wis::ImplVKCommandList::ImplVKCommandList;
 

wisdom/include/wisdom/vulkan/vk_command_queue.h

@@ -57,7 +57,8 @@ class ImplVKCommandQueue : public QueryInternal<VKCommandQueue>
 /**
  * @brief Represents command queue for executing command lists.
  * */
-struct VKCommandQueue : public wis::ImplVKCommandQueue {
+class VKCommandQueue : public wis::ImplVKCommandQueue
+{
 public:
     using wis::ImplVKCommandQueue::ImplVKCommandQueue;
 

wisdom/include/wisdom/vulkan/vk_descriptor_buffer.h

@@ -125,7 +125,8 @@ class ImplVKDescriptorBuffer : public QueryInternal<VKDescriptorBuffer>
 /**
  * @brief Represents descriptor buffer for binding descriptors.
  * */
-struct VKDescriptorBuffer : public wis::ImplVKDescriptorBuffer {
+class VKDescriptorBuffer : public wis::ImplVKDescriptorBuffer
+{
 public:
     using wis::ImplVKDescriptorBuffer::ImplVKDescriptorBuffer;
 

wisdom/include/wisdom/vulkan/vk_device.h

@@ -168,7 +168,8 @@ class ImplVKDevice : public QueryInternal<VKDevice>
  * @brief Represents logical device.
  * Creates all the resources and commands for rendering.
  * */
-struct VKDevice : public wis::ImplVKDevice {
+class VKDevice : public wis::ImplVKDevice
+{
 public:
     using wis::ImplVKDevice::ImplVKDevice;
 

wisdom/include/wisdom/vulkan/vk_factory.h

@@ -125,7 +125,8 @@ class ImplVKFactory : public QueryInternal<VKFactory>
  * @brief Class for creating adapters.
  * Can be safely destroyed after adapter has been chosen.
  * */
-struct VKFactory : public wis::ImplVKFactory {
+class VKFactory : public wis::ImplVKFactory
+{
 public:
     using wis::ImplVKFactory::ImplVKFactory;
 

wisdom/include/wisdom/vulkan/vk_fence.h

@@ -53,7 +53,8 @@ class ImplVKFence : public QueryInternal<VKFence>
 /**
  * @brief Represents fence for synchronization of GPU timeline.
  * */
-struct VKFence : public wis::ImplVKFence {
+class VKFence : public wis::ImplVKFence
+{
 public:
     using wis::ImplVKFence::ImplVKFence;
 

wisdom/include/wisdom/vulkan/vk_memory.h

@@ -97,7 +97,8 @@ class ImplVKMemory : public QueryInternal<VKMemory>
 /**
  * @brief Represents memory object for binding resources.
  * */
-struct VKMemory : public wis::ImplVKMemory {
+class VKMemory : public wis::ImplVKMemory
+{
 public:
     using wis::ImplVKMemory::ImplVKMemory;
 

wisdom/include/wisdom/vulkan/vk_resource.h

@@ -218,7 +218,8 @@ class VKShaderResource : public QueryInternal<VKShaderResource>
 /**
  * @brief Represents buffer object for storing linear data.
  * */
-struct VKBuffer : public wis::ImplVKBuffer {
+class VKBuffer : public wis::ImplVKBuffer
+{
 public:
     using wis::ImplVKBuffer::ImplVKBuffer;
 

wisdom/include/wisdom/vulkan/vk_swapchain.h

@@ -144,7 +144,8 @@ class ImplVKSwapChain : public QueryInternal<VKSwapChain>
 /**
  * @brief Represents swap chain object for presenting images.
  * */
-struct VKSwapChain : public wis::ImplVKSwapChain {
+class VKSwapChain : public wis::ImplVKSwapChain
+{
 public:
     using wis::ImplVKSwapChain::ImplVKSwapChain;