2 files changed, 11 insertions, 12 deletions

diff --git a/include/scene.hpp b/include/scene.hpp
index 0a5e82f..22eada5 100644
--- a/include/scene.hpp
+++ b/include/scene.hpp
@@ -43,12 +43,12 @@ public:
     handle<device_buffer>    bvh_buffer_handle;

     handle<device_buffer>    materials_buffer_handle;

 

-    uint64_t indices_buffer_address() { return vkdevice::get().get_buffer(indices_buffer_handle)->device_address; };

-    uint64_t positions_buffer_address() { return vkdevice::get().get_buffer(positions_buffer_handle)->device_address; };

-    uint64_t normals_buffer_address() { return vkdevice::get().get_buffer(normals_buffer_handle)->device_address; };

-    uint64_t uvs_buffer_address() { return vkdevice::get().get_buffer(uvs_buffer_handle)->device_address; };

-    uint64_t bvh_buffer_address() { return vkdevice::get().get_buffer(bvh_buffer_handle)->device_address; };

-    uint64_t materials_buffer_address() { return vkdevice::get().get_buffer(materials_buffer_handle)->device_address; };

+    uint64_t indices_buffer_address() { return vkdevice::get().get_buffer(indices_buffer_handle)->gpu_ptr; };

+    uint64_t positions_buffer_address() { return vkdevice::get().get_buffer(positions_buffer_handle)->gpu_ptr; };

+    uint64_t normals_buffer_address() { return vkdevice::get().get_buffer(normals_buffer_handle)->gpu_ptr; };

+    uint64_t uvs_buffer_address() { return vkdevice::get().get_buffer(uvs_buffer_handle)->gpu_ptr; };

+    uint64_t bvh_buffer_address() { return vkdevice::get().get_buffer(bvh_buffer_handle)->gpu_ptr; };

+    uint64_t materials_buffer_address() { return vkdevice::get().get_buffer(materials_buffer_handle)->gpu_ptr; };

 };

 

 #endif // !__SCENE_HPP_

diff --git a/include/vk-device-types.hpp b/include/vk-device-types.hpp
index bffaf16..dc47a4b 100644
--- a/include/vk-device-types.hpp
+++ b/include/vk-device-types.hpp
@@ -91,7 +91,6 @@ struct buffer_desc {
     size_t                size;
     VkBufferUsageFlags    usages;
     VkMemoryPropertyFlags memory_properties;
-    uint32_t              memory_usage;
     const char*           name;
 };
 
@@ -141,14 +140,14 @@ struct device_buffer {
 };
 
 struct graphics_pipeline_desc {
-    uint8_t*            vs_code;
+    const uint8_t*      vs_code;
     size_t              vs_code_size;
-    uint8_t*            fs_code;
+    const uint8_t*      fs_code;
     size_t              fs_code_size;
-    VkFormat*           color_attachments_format;
+    const VkFormat*     color_attachments_format;
     size_t              color_attachments_format_count;
-    VkFormat            depth_attachment_format;
-    VkFormat            stencil_attachment_format;
+    const VkFormat      depth_attachment_format;
+    const VkFormat      stencil_attachment_format;
     const char*         name;
 };