Commit c024d2a6 authored by David E. DeMarle's avatar David E. DeMarle

fix ospray compilation with intel compiler

ran into this on LANL's Cray.
See https://github.com/ospray/ospray/issues/331
parent 09939080
......@@ -40,3 +40,5 @@ superbuild_add_project(ospray
superbuild_add_extra_cmake_args(
-DOSPRAY_INSTALL_DIR:PATH=<INSTALL_DIR>)
superbuild_apply_patch(ospray type-conversion
"Fix type conversion error on icc 18.")
diff --git a/ospray/fb/LocalFB.ispc b/ospray/fb/LocalFB.ispc
index 913d16e..db130bb 100644
--- a/ospray/fb/LocalFB.ispc
+++ b/ospray/fb/LocalFB.ispc
@@ -164,12 +164,15 @@ export uniform float LocalFrameBuffer_accumulateTile(void *uniform _fb,
export void LocalFrameBuffer_accumulateAuxTile(void *uniform _fb
, const uniform Tile &tile
, uniform vec3f *uniform aux
- , const varying float * uniform ax
- , const varying float * uniform ay
- , const varying float * uniform az
+ , const void * uniform _ax
+ , const void * uniform _ay
+ , const void * uniform _az
)
{
uniform LocalFB *uniform fb = (uniform LocalFB *uniform)_fb;
+ const varying float * uniform ax = (const varying float * uniform) _ax;
+ const varying float * uniform ay = (const varying float * uniform) _ay;
+ const varying float * uniform az = (const varying float * uniform) _az;
const uniform float accumID = tile.accumID;
const uniform float accScale = rcpf(tile.accumID + 1);
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment