Skip to content

Commit e3177fc

Browse files
committed
Fixed linux compilation.
Some minor changes were reverted due to GCC compilation errors in linux. (g++ 7.3.0)
1 parent 4c984f7 commit e3177fc

File tree

2 files changed

+8
-8
lines changed

2 files changed

+8
-8
lines changed

Calc/inc/device.h

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -47,9 +47,9 @@ namespace Calc
4747
std::uint32_t min_alignment;
4848
std::uint32_t max_num_queues;
4949

50-
unsigned __int64 global_mem_size;
51-
unsigned __int64 local_mem_size;
52-
unsigned __int64 max_alloc_size;
50+
unsigned long long global_mem_size;
51+
unsigned long long local_mem_size;
52+
unsigned long long max_alloc_size;
5353
std::size_t max_local_size;
5454

5555
bool has_fp16;

RadeonRays/src/device/calc_intersection_device.cpp

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -100,7 +100,7 @@ namespace RadeonRays
100100
{
101101
if (m_intersector_string != "bvh2l")
102102
{
103-
m_intersector = std::make_unique<IntersectorTwoLevel>(m_device.get());
103+
m_intersector.reset(new IntersectorTwoLevel(m_device.get()));
104104
m_intersector_string = "bvh2l";
105105
}
106106
}
@@ -114,7 +114,7 @@ namespace RadeonRays
114114
{
115115
if (m_intersector_string != "bvh")
116116
{
117-
m_intersector = std::make_unique<IntersectorSkipLinks>(m_device.get());
117+
m_intersector.reset(new IntersectorSkipLinks(m_device.get()));
118118
m_intersector_string = "bvh";
119119
}
120120
}
@@ -126,7 +126,7 @@ namespace RadeonRays
126126
m_intersector.reset(new IntersectorShortStack(m_device.get()));
127127
m_intersector_string = "fatbvh";
128128
#else
129-
m_intersector = std::make_unique<IntersectorLDS>(m_device.get());
129+
m_intersector.reset(new IntersectorLDS(m_device.get()));
130130
m_intersector_string = "fatbvh";
131131
#endif
132132
}
@@ -135,15 +135,15 @@ namespace RadeonRays
135135
{
136136
if (m_intersector_string != "hlbvh")
137137
{
138-
m_intersector = std::make_unique<IntersectorHlbvh>(m_device.get());
138+
m_intersector.reset(new IntersectorHlbvh(m_device.get()));
139139
m_intersector_string = "hlbvh";
140140
}
141141
}
142142
/*else if (acctype == "hashbvh")
143143
{
144144
if (m_intersector_string != "hashbvh")
145145
{
146-
m_intersector = std::make_unique<IntersectorBitTrail>(m_device.get());
146+
m_intersector.reset(new IntersectorBitTrail(m_device.get()));
147147
m_intersector_string = "hashbvh";
148148
}
149149
}*/

0 commit comments

Comments
 (0)