Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
ParaView-Superbuild
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Container Registry
Model registry
Operate
Environments
Monitor
Incidents
Service Desk
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Nick Leaf
ParaView-Superbuild
Commits
c024d2a6
Commit
c024d2a6
authored
5 years ago
by
David E. DeMarle
Browse files
Options
Downloads
Patches
Plain Diff
fix ospray compilation with intel compiler
ran into this on LANL's Cray. See
https://github.com/ospray/ospray/issues/331
parent
09939080
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
projects/ospray.cmake
+2
-0
2 additions, 0 deletions
projects/ospray.cmake
projects/patches/ospray-type-conversion.patch
+23
-0
23 additions, 0 deletions
projects/patches/ospray-type-conversion.patch
with
25 additions
and
0 deletions
projects/ospray.cmake
+
2
−
0
View file @
c024d2a6
...
...
@@ -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."
)
This diff is collapsed.
Click to expand it.
projects/patches/ospray-type-conversion.patch
0 → 100644
+
23
−
0
View file @
c024d2a6
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);
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment