Added binary BVH

GPUOpen-LibrariesAndSDKs · Jan 22, 2018 · 81d8dc0 · 81d8dc0
1 parent 01aa95a
commit 81d8dc0
Show file tree

Hide file tree

Showing 2 changed files with 90 additions and 201 deletions.
diff --git a/RadeonRays/src/intersector/intersector_lds.cpp b/RadeonRays/src/intersector/intersector_lds.cpp
@@ -123,7 +123,7 @@ namespace RadeonRays
         if (device->GetPlatform() == Calc::Platform::kOpenCL)
         {
             m_gpuData->bvh_prog.executable = m_device->CompileExecutable(g_intersect_bvh2_lds_opencl, std::strlen(g_intersect_bvh2_lds_opencl), buildopts.c_str());
-            m_gpuData->qbvh_prog.executable = m_device->CompileExecutable(g_intersect_bvh2_lds_fp16_opencl, std::strlen(g_intersect_bvh2_lds_opencl), buildopts.c_str());
+            m_gpuData->qbvh_prog.executable = m_device->CompileExecutable(g_intersect_bvh2_lds_fp16_opencl, std::strlen(g_intersect_bvh2_lds_fp16_opencl), buildopts.c_str());
         }
 #endif
 #if USE_VULKAN
@@ -161,7 +161,7 @@ namespace RadeonRays
             auto nbins = world.options_.GetOption("bvh.sah.num_bins");
             auto tcost = world.options_.GetOption("bvh.sah.traversal_cost");
 
-            bool use_qbvh = true, use_sah = false;
+            bool use_qbvh = false, use_sah = false;
             int num_bins = (nbins ? static_cast<int>(nbins->AsFloat()) : 64);
             float traversal_cost = (tcost ? tcost->AsFloat() : 10.0f);
 
@@ -207,7 +207,7 @@ namespace RadeonRays
 
                 // Copy BVH data
                 for (std::size_t i = 0; i < bvh.m_nodecount; ++i)
-                    bvhdata[i++] = bvh.m_nodes[i];
+                    bvhdata[i] = bvh.m_nodes[i];
 
                 // Unmap gpu data
                 m_device->UnmapBuffer(m_gpuData->bvh, 0, bvhdata, &e);