Added vulkan override

Author: gboisse

Calc/inc/device.h

@@ -77,6 +77,9 @@ namespace Calc
         virtual Buffer* CreateBuffer(std::size_t size, std::uint32_t flags, void* initdata) = 0;
         virtual void DeleteBuffer(Buffer* buffer) = 0;
 
+        // Unity hack for accessing internal BVH
+        virtual void* GetNativeHandle(Buffer const* buffer) const = 0;
+
         // Data movement
         // Calls are blocking if passed nullptr for an event, otherwise use Event to sync
         virtual void ReadBuffer(Buffer const* buffer, std::uint32_t queue, std::size_t offset, std::size_t size, void* dst, Event** e) const = 0;

Calc/src/device_clw.cpp

@@ -295,6 +295,14 @@ namespace Calc
         delete buffer;
     }
 
+    void* DeviceClw::GetNativeHandle(Buffer const* buffer) const
+    {
+        BufferClw const* bufferClw = static_cast<BufferClw const*>(buffer);
+        if (!bufferClw)
+            return nullptr;
+        return bufferClw->GetData();
+    }
+
     void DeviceClw::ReadBuffer(Buffer const* buffer, std::uint32_t queue, std::size_t offset, std::size_t size, void* dst, Event** e) const
     {
         auto buffer_clw = static_cast<BufferClw const*>(buffer);
@@ -587,14 +595,6 @@ namespace Calc
         }
     }
 
-    cl_mem DeviceClw::GetNativeHandle(Buffer const* buffer)
-    {
-        BufferClw const* bufferClw = static_cast<BufferClw const*>(buffer);
-        if (!bufferClw)
-            return nullptr;
-        return bufferClw->GetData();
-    }
-
     class PrimitivesClw : public Primitives
     {
     public:

Calc/src/device_clw.h

@@ -48,6 +48,9 @@ namespace Calc
         Buffer* CreateBuffer(std::size_t size, std::uint32_t flags, void* initdata) override;
         void DeleteBuffer(Buffer* buffer) override;
 
+        // Unity hack for accessing internal BVH
+        void* GetNativeHandle(Buffer const* buffer) const override;
+
         // Data movement
         void ReadBuffer(Buffer const* buffer, std::uint32_t queue, std::size_t offset, std::size_t size, void* dst, Event** e) const override;
         void WriteBuffer(Buffer const* buffer, std::uint32_t queue, std::size_t offset, std::size_t size, void* src, Event** e) override;
@@ -89,9 +92,6 @@ namespace Calc
 
         Platform GetPlatform() const override { return Platform::kOpenCL; }
 
-        // Unity hack for accessing internal BVH
-        cl_mem GetNativeHandle(Buffer const* buffer);
-
     protected:
         EventClw* CreateEventClw() const;
         void      ReleaseEventClw(EventClw* e) const;

Calc/src/device_vkw.cpp

@@ -173,6 +173,11 @@ namespace Calc
         }
     }
 
+    void* DeviceVulkanw::GetNativeHandle(Buffer const* buffer) const
+    {
+        return nullptr;
+    }
+
     // Data movement
     void DeviceVulkanw::ReadBuffer( Buffer const* buffer, std::uint32_t queue, std::size_t offset, std::size_t size, void* dst, Event** e ) const
     {

Calc/src/device_vkw.h

@@ -54,6 +54,9 @@ namespace Calc
         Buffer* CreateBuffer( std::size_t size, std::uint32_t flags, void* initdata ) override;
         void DeleteBuffer( Buffer* buffer ) override;
 
+        // Unity hack for accessing internal BVH
+        void* GetNativeHandle(Buffer const* buffer) const override;
+
         // Data movement
         void ReadBuffer( Buffer const* buffer, std::uint32_t queue, std::size_t offset, std::size_t size, void* dst, Event** e ) const override;
         void WriteBuffer( Buffer const* buffer, std::uint32_t queue, std::size_t offset, std::size_t size, void* src, Event** e ) override;

RadeonRays/src/device/embree_intersection_device.cpp

@@ -496,7 +496,7 @@ namespace RadeonRays
         Throw("Not implemented for embree device.");
     }
 
-    Buffer const* EmbreeIntersectionDevice::GetBvh() const
+    void* EmbreeIntersectionDevice::GetBvh() const
     {
         return nullptr;
     }

RadeonRays/src/device/embree_intersection_device.h

@@ -53,7 +53,7 @@ namespace RadeonRays
         void QueryOcclusion(Buffer const* rays, int numrays, Buffer* hitresults, Event const* waitevent, Event** event) const override;
         void QueryIntersection(Buffer const* rays, Buffer const* numrays, int maxrays, Buffer* hitinfos, Event const* waitevent, Event** event) const override;
         void QueryOcclusion(Buffer const* rays, Buffer const* numrays, int maxrays, Buffer* hitresults, Event const* waitevent, Event** event) const override;
-        Buffer const* GetBvh() const override;
+        void* GetBvh() const override;
 
     protected:
         RTCScene GetEmbreeMesh(const Mesh*);