Merge pull request #1 from GPUOpen-LibrariesAndSDKs/master

update from main repo

Author: FlorentGuinier

RadeonRays/RadeonRays.lua

@@ -11,13 +11,17 @@ project "RadeonRays"
 
     if _OPTIONS["shared_calc"] then
         defines {"CALC_IMPORT_API"};
-	links {"dl"}
+        if os.is("windows") then
+            characterset ("MBCS")
+        else
+            links {"dl"}
+        end
     else
-	defines {"CALC_STATIC_LIBRARY"}
+    defines {"CALC_STATIC_LIBRARY"}
         links {"Calc"}
-	if _OPTIONS["use_opencl"] then
+    if _OPTIONS["use_opencl"] then
            links {"CLW"}
-	end
+    end
     end
 
     if _OPTIONS["enable_raymask"] then

RadeonRays/include/math/matrix.h

@@ -179,14 +179,13 @@ namespace RadeonRays
         return res*=c;
     }
 
-    inline float3 operator * (matrix const& m, float3 const& v)
+    inline float4 operator * (matrix const& m, float4 const& v)
     {
-        float3 res;
+        float4 res {0, 0, 0, 0};
 
-        for (int i=0;i<3;++i)
-        {
-            res[i] = 0.f;
-            for (int j=0;j<3;++j)
+        for (int i = 0; i < 4; ++i) {
+            //res[i] = 0.f;
+            for (int j = 0; j < 4; ++j)
                 res[i] += m.m[i][j] * v[j];
         }
 

RadeonRays/src/device/embree_intersection_device.cpp

@@ -116,7 +116,7 @@ namespace RadeonRays
         if (result != RTC_NO_ERROR)
             std::cout << "Failed to create embree rtcDevice: " << result << std::endl;
 
-        m_scene = rtcDeviceNewScene(m_device, RTC_SCENE_STATIC, RTC_INTERSECT1 | RTC_INTERSECT4 | RTC_INTERSECT8 | RTC_INTERSECT16 | RTC_INTERSECTN);
+        m_scene = rtcDeviceNewScene(m_device, RTC_SCENE_STATIC, RTC_INTERSECT1 | RTC_INTERSECT4 | RTC_INTERSECT8 | RTC_INTERSECT16 | RTC_INTERSECT_STREAM);
         result = rtcDeviceGetError(m_device);
         if (result != RTC_NO_ERROR)
             std::cout << "Failed to create embree scene: " << result << std::endl;
@@ -171,7 +171,7 @@ namespace RadeonRays
         }
         m_instances.clear();
         rtcDeleteScene(m_scene); CheckEmbreeError();
-        m_scene = rtcDeviceNewScene(m_device, RTC_SCENE_STATIC, RTC_INTERSECT1 | RTC_INTERSECT4 | RTC_INTERSECT8 | RTC_INTERSECT16 | RTC_INTERSECTN); CheckEmbreeError();
+        m_scene = rtcDeviceNewScene(m_device, RTC_SCENE_STATIC, RTC_INTERSECT1 | RTC_INTERSECT4 | RTC_INTERSECT8 | RTC_INTERSECT16 | RTC_INTERSECT_STREAM); CheckEmbreeError();
 
         for (auto i : world.shapes_)
         {
@@ -500,7 +500,7 @@ namespace RadeonRays
     {
         if (m_meshes.count(mesh))
             return m_meshes[mesh].scene;
-        RTCScene result = rtcDeviceNewScene(m_device, RTC_SCENE_STATIC, RTC_INTERSECT1 | RTC_INTERSECT4 | RTC_INTERSECT8 | RTC_INTERSECT16 | RTC_INTERSECTN);
+        RTCScene result = rtcDeviceNewScene(m_device, RTC_SCENE_STATIC, RTC_INTERSECT1 | RTC_INTERSECT4 | RTC_INTERSECT8 | RTC_INTERSECT16 | RTC_INTERSECT_STREAM);
         CheckEmbreeError();
         ThrowIf(!mesh->puretriangle(), "Only triangle meshes supported by now.");
 

RadeonRays/src/intersector/intersector_short_stack.cpp

@@ -397,6 +397,11 @@ namespace RadeonRays
             m_gpudata->bvh = m_device->CreateBuffer(translator.nodes_.size() * sizeof(FatNodeBvhTranslator::Node), Calc::BufferType::kRead, &translator.nodes_[0]);
 
             // Stack
+            if (m_gpudata->stack)
+            {
+                m_device->DeleteBuffer(m_gpudata->stack);
+                m_gpudata->stack = nullptr;
+            }
             m_gpudata->stack = m_device->CreateBuffer(kMaxBatchSize*kMaxStackSize, Calc::BufferType::kWrite);
 
             // Make sure everything is commited