Refactored getting native buffer for BVH

Author: gboisse

Calc/src/device_clw.cpp

@@ -574,7 +574,7 @@ namespace Calc
     {
         m_event_pool.push(e);
     }
-    
+
     Buffer* DeviceClw::CreateBuffer(cl_mem buffer)
     {
         try
@@ -587,6 +587,13 @@ 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
     {

Calc/src/device_clw.h

@@ -23,7 +23,7 @@ THE SOFTWARE.
 
 #include "device.h"
 #include "device_cl.h"
-#include "CLW.h"
+#include "../../CLW/CLW.h"
 
 #include <queue>
 
@@ -89,6 +89,9 @@ 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;

RadeonRays/include/radeon_rays.h

@@ -288,7 +288,7 @@ namespace RadeonRays
         Unity hack for accessing internal BVH
         ******************************************/
         // Gets the BVH
-        virtual Buffer const *GetBvh() const = 0;
+        virtual void* GetBvh() const = 0;
 
         /******************************************
         Utility

RadeonRays/src/api/radeon_rays_impl.cpp

@@ -145,7 +145,7 @@ namespace RadeonRays
         m_device->QueryOcclusion(rays, numrays, maxrays, hitresults, waitevent, event);
     }
 
-    Buffer const* IntersectionApiImpl::GetBvh() const
+    void* IntersectionApiImpl::GetBvh() const
     {
         return m_device->GetBvh();
     }

RadeonRays/src/api/radeon_rays_impl.h

@@ -125,7 +125,7 @@ namespace RadeonRays
         Unity hack
         ******************************************/
         // Gets the BVH
-        Buffer const *GetBvh() const override;
+        void* GetBvh() const override;
 
         /******************************************
         Utility

RadeonRays/src/device/calc_intersection_device.cpp

@@ -336,7 +336,7 @@ namespace RadeonRays
         }
     }
 
-    Buffer const* CalcIntersectionDevice::GetBvh() const
+    void* CalcIntersectionDevice::GetBvh() const
     {
         return m_intersector->GetBvh();
     }

RadeonRays/src/device/calc_intersection_device.h

@@ -66,7 +66,7 @@ namespace RadeonRays
 
         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;
 
         Calc::Platform GetPlatform() const { return m_device->GetPlatform(); }
     protected:

RadeonRays/src/device/intersection_device.h

@@ -90,7 +90,7 @@ namespace RadeonRays
         virtual void QueryOcclusion(Buffer const* rays, Buffer const* numrays, int maxrays, Buffer* hits, Event const* waitevent, Event** event) const = 0;
 
         // Gets the BVH
-        virtual Buffer const* GetBvh() const = 0;
+        virtual void* GetBvh() const = 0;
 
         IntersectionDevice(IntersectionDevice const&) = delete;
         IntersectionDevice& operator = (IntersectionDevice const&) = delete;

RadeonRays/src/intersector/intersector.cpp

@@ -29,7 +29,7 @@ namespace RadeonRays
         return true;
     }
 
-    Buffer const* Intersector::GetBvhImpl() const
+    void* Intersector::GetBvhImpl() const
     {
         return nullptr;
     }
@@ -62,7 +62,7 @@ namespace RadeonRays
         Occluded(queue_idx, rays, num_rays, max_rays, hits, wait_event, event);
     }
 
-    Buffer const* Intersector::GetBvh() const
+    void* Intersector::GetBvh() const
     {
         return GetBvhImpl();
     }

RadeonRays/src/intersector/intersector.h

@@ -139,7 +139,7 @@ namespace RadeonRays
         \brief Gets the BVH
         \returns The requested BVH
         */
-        Buffer const* GetBvh() const;
+        void* GetBvh() const;
 
         // Disallow intersector copies
         Intersector(Intersector const&) = delete;
@@ -151,7 +151,7 @@ namespace RadeonRays
         // Compatibility check implemetation
         virtual bool IsCompatibleImpl(World const& world) const;
         // Gets BVH implementation.
-        virtual Buffer const* GetBvhImpl() const;
+        virtual void* GetBvhImpl() const;
 
         // Intersection implementation
         virtual void Intersect(std::uint32_t queue_idx, Calc::Buffer const *rays, Calc::Buffer const *num_rays, 

RadeonRays/src/intersector/intersector_lds.cpp

@@ -28,6 +28,7 @@ THE SOFTWARE.
 #include "../primitive/mesh.h"
 #include "../primitive/instance.h"
 #include "../translator/q_bvh_translator.h"
+#include "../../Calc/src/device_clw.h"
 #include "../world/world.h"
 
 namespace RadeonRays
@@ -72,8 +73,6 @@ namespace RadeonRays
         // Traversal stack
         Calc::Buffer *stack;
 
-        CalcBufferHolder bvhHolder;
-
         Program *prog;
         Program bvh_prog;
         Program qbvh_prog;
@@ -82,7 +81,6 @@ namespace RadeonRays
             : device(device)
             , bvh(nullptr)
             , stack(nullptr)
-            , bvhHolder(device, bvh)
             , prog(nullptr)
             , bvh_prog(device)
             , qbvh_prog(device)
@@ -262,9 +260,11 @@ namespace RadeonRays
         }
     }
 
-    Buffer const* IntersectorLDS::GetBvhImpl() const
+    void* IntersectorLDS::GetBvhImpl() const
     {
-        return &m_gpudata->bvhHolder;
+        if (m_device->GetPlatform() == Calc::Platform::kOpenCL)
+            return static_cast<Calc::DeviceClw *>(m_device)->GetNativeHandle(m_gpudata->bvh);
+        return NULL;
     }
 
     void IntersectorLDS::Intersect(std::uint32_t queue_idx, const Calc::Buffer *rays, const Calc::Buffer *num_rays,

RadeonRays/src/intersector/intersector_lds.h

@@ -37,7 +37,7 @@ namespace RadeonRays
         // World preprocessing implementation
         void Process(const World &world) override;
         // Gets BVH implementation
-        Buffer const* GetBvhImpl() const override;
+        void* GetBvhImpl() const override;
         // Intersection implementation
         void Intersect(std::uint32_t queue_idx, const Calc::Buffer *rays, const Calc::Buffer *num_rays,
             std::uint32_t max_rays, Calc::Buffer *hits,