|
6 | 6 | #include "../../cpu/volume/UnstructuredBVH.ih" |
7 | 7 | #include "../../cpu/volume/UnstructuredVolumeShared.h" |
8 | 8 |
|
| 9 | +// WA for IGC-17746 miscompile: force inlining (and pass samplePos by const&) |
| 10 | +#define VKL_WA_IGC17746_INLINE __attribute__((always_inline)) inline |
| 11 | + |
9 | 12 | namespace ispc { |
10 | 13 |
|
11 | 14 | //////////////////////////////////////////////////////////////////////////// |
@@ -113,11 +116,11 @@ namespace ispc { |
113 | 116 | // intersect / sampling functions ////////////////////////////////////////// |
114 | 117 | //////////////////////////////////////////////////////////////////////////// |
115 | 118 |
|
116 | | - inline bool intersectAndSampleTet(const void *userData, |
117 | | - uint64_t id, |
118 | | - bool assumeInside, |
119 | | - float &result, |
120 | | - vec3f samplePos) |
| 119 | + VKL_WA_IGC17746_INLINE bool intersectAndSampleTet(const void *userData, |
| 120 | + uint64_t id, |
| 121 | + bool assumeInside, |
| 122 | + float &result, |
| 123 | + const vec3f &samplePos) |
121 | 124 | { |
122 | 125 | const VKLUnstructuredVolume *self = (const VKLUnstructuredVolume *)userData; |
123 | 126 |
|
@@ -219,11 +222,11 @@ namespace ispc { |
219 | 222 | static const float WEDGE_CONVERGED = 0.0001f; |
220 | 223 | static const float WEDGE_OUTSIDE_CELL_TOLERANCE = 0.000001f; |
221 | 224 |
|
222 | | - inline bool intersectAndSampleWedge(const void *userData, |
223 | | - uint64_t id, |
224 | | - bool assumeInside, |
225 | | - float &result, |
226 | | - vec3f samplePos) |
| 225 | + VKL_WA_IGC17746_INLINE bool intersectAndSampleWedge(const void *userData, |
| 226 | + uint64_t id, |
| 227 | + bool assumeInside, |
| 228 | + float &result, |
| 229 | + const vec3f &samplePos) |
227 | 230 | { |
228 | 231 | const VKLUnstructuredVolume *self = (const VKLUnstructuredVolume *)userData; |
229 | 232 |
|
@@ -359,11 +362,11 @@ namespace ispc { |
359 | 362 | static const float PYRAMID_CONVERGED = 0.0001f; |
360 | 363 | static const float PYRAMID_OUTSIDE_CELL_TOLERANCE = 0.000001f; |
361 | 364 |
|
362 | | - inline bool intersectAndSamplePyramid(const void *userData, |
363 | | - uint64_t id, |
364 | | - bool assumeInside, |
365 | | - float &result, |
366 | | - vec3f samplePos) |
| 365 | + VKL_WA_IGC17746_INLINE bool intersectAndSamplePyramid(const void *userData, |
| 366 | + uint64_t id, |
| 367 | + bool assumeInside, |
| 368 | + float &result, |
| 369 | + const vec3f &samplePos) |
367 | 370 | { |
368 | 371 | const VKLUnstructuredVolume *self = (const VKLUnstructuredVolume *)userData; |
369 | 372 |
|
@@ -454,10 +457,10 @@ namespace ispc { |
454 | 457 | return false; |
455 | 458 | } |
456 | 459 |
|
457 | | - inline bool intersectAndSampleHexFast(const void *userData, |
458 | | - uint64_t id, |
459 | | - float &result, |
460 | | - vec3f samplePos) |
| 460 | + VKL_WA_IGC17746_INLINE bool intersectAndSampleHexFast(const void *userData, |
| 461 | + uint64_t id, |
| 462 | + float &result, |
| 463 | + const vec3f &samplePos) |
461 | 464 | { |
462 | 465 | const VKLUnstructuredVolume *self = (const VKLUnstructuredVolume *)userData; |
463 | 466 |
|
@@ -570,11 +573,12 @@ namespace ispc { |
570 | 573 | static const float HEX_CONVERGED = 0.0001f; |
571 | 574 | static const float HEX_OUTSIDE_CELL_TOLERANCE = 0.000001f; |
572 | 575 |
|
573 | | - inline bool intersectAndSampleHexIterative(const void *userData, |
574 | | - uint64_t id, |
575 | | - bool assumeInside, |
576 | | - float &result, |
577 | | - vec3f samplePos) |
| 576 | + VKL_WA_IGC17746_INLINE bool intersectAndSampleHexIterative( |
| 577 | + const void *userData, |
| 578 | + uint64_t id, |
| 579 | + bool assumeInside, |
| 580 | + float &result, |
| 581 | + const vec3f &samplePos) |
578 | 582 | { |
579 | 583 | const VKLUnstructuredVolume *self = (const VKLUnstructuredVolume *)userData; |
580 | 584 |
|
@@ -665,11 +669,12 @@ namespace ispc { |
665 | 669 | return false; |
666 | 670 | } |
667 | 671 |
|
668 | | - inline bool intersectAndSampleCell(const void *userData, |
669 | | - uint64_t id, |
670 | | - float &result, |
671 | | - vec3f samplePos, |
672 | | - const VKLFeatureFlags featureFlags) |
| 672 | + VKL_WA_IGC17746_INLINE bool intersectAndSampleCell( |
| 673 | + const void *userData, |
| 674 | + uint64_t id, |
| 675 | + float &result, |
| 676 | + const vec3f &samplePos, |
| 677 | + const VKLFeatureFlags featureFlags) |
673 | 678 | { |
674 | 679 | bool hit = false; |
675 | 680 |
|
|
0 commit comments