Merge branch 'release-2.1.x'

RenderKit · May 25, 2020 · 7cc36c7 · 7cc36c7
2 parents 7c01f46 + 1e04c28
commit 7cc36c7
Show file tree

Hide file tree

Showing 31 changed files with 464 additions and 346 deletions.
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
@@ -31,6 +31,12 @@ variables:
   tags:
     - build
 
+.job_template: &build_artifacts
+  artifacts:
+    paths:
+      - build/install/ospray
+    expire_in: 3 day
+
 .job_template: &release_job
   stage: deploy
   tags:
@@ -56,12 +62,12 @@ variables:
 .job_template: &test_job_unix
   <<: *test_job
   script:
-    - LD_LIBRARY_PATH="$CI_PROJECT_DIR/build/install/lib:$LD_LIBRARY_PATH" PATH="$CI_PROJECT_DIR/build/install/bin:$PATH" scripts/tests/run_tests.sh "$CI_PROJECT_DIR"
+    - LD_LIBRARY_PATH="$CI_PROJECT_DIR/build/install/ospray/lib:$LD_LIBRARY_PATH" PATH="$CI_PROJECT_DIR/build/install/ospray/bin:$PATH" scripts/tests/run_tests.sh "$CI_PROJECT_DIR"
 
 .job_template: &test_job_windows
   <<: *test_job
   script:
-    - $env:Path += ";$CI_PROJECT_DIR\build\install\bin"
+    - $env:Path += ";$CI_PROJECT_DIR\build\install\ospray\bin"
     - scripts\tests\run_tests.ps1 "$CI_PROJECT_DIR"
 
 
@@ -82,44 +88,35 @@ build-arch-clang:
 build-arch-gcc-extras:
   <<: *build_job_docker
   script:
-    - scripts/build_gitlab/linux.sh -G Ninja -DBUILD_GLFW=OFF -DBUILD_OSPRAY_CI_EXTRAS=ON -DINSTALL_IN_SEPARATE_DIRECTORIES=ON -DBUILD_OIDN=ON
+    - scripts/build_gitlab/linux.sh -G Ninja -DBUILD_GLFW=OFF -DBUILD_OSPRAY_CI_EXTRAS=ON -DBUILD_OIDN=ON
 
 build-arch-clang-extras:
   <<: *build_job_docker
   script:
     - export CC=clang
     - export CXX=clang++
-    - scripts/build_gitlab/linux.sh -G Ninja -DBUILD_GLFW=OFF -DBUILD_OSPRAY_CI_EXTRAS=ON -DINSTALL_IN_SEPARATE_DIRECTORIES=ON -DBUILD_OIDN=ON
+    - scripts/build_gitlab/linux.sh -G Ninja -DBUILD_GLFW=OFF -DBUILD_OSPRAY_CI_EXTRAS=ON -DBUILD_OIDN=ON
 
 build-ubuntu1604-gcc:
   <<: *build_job_docker
   image: ospray/docker-images:ubuntu16.04
   script:
     - scripts/build_gitlab/linux.sh -G Ninja
-  artifacts:
-    paths:
-      - build/install
-    expire_in: 3 day
+  <<: *build_artifacts
 
 build-ubuntu1804-gcc:
   <<: *build_job_docker
   image: ospray/docker-images:ubuntu18.04
   script:
     - scripts/build_gitlab/linux.sh -G Ninja -DBUILD_GLFW=OFF
-  artifacts:
-    paths:
-      - build/install
-    expire_in: 3 day
+  <<: *build_artifacts
 
 build-centos8:
   <<: *build_job_docker
   image: ospray/docker-images:centos8
   script:
     - scripts/build_gitlab/linux.sh -G Ninja
-  artifacts:
-    paths:
-      - build/install
-    expire_in: 3 day
+  <<: *build_artifacts
 
 build-centos7-icc:
   <<: *build_job_docker_modules
@@ -142,10 +139,7 @@ build-centos7-icc15:
 build-centos7-gcc:
   <<: *build_job_docker
   image: ospray/docker-images:centos7
-  artifacts:
-    paths:
-      - build/install
-    expire_in: 3 day
+  <<: *build_artifacts
 
 build-centos7-mpi:
   <<: *build_job_docker_modules
@@ -175,10 +169,7 @@ build-windows-msvc14:
   tags:
     - msvc14
     - win
-  artifacts:
-    paths:
-      - build/install
-    expire_in: 3 day
+  <<: *build_artifacts
 
 build-windows-msvc15:
   <<: *build_job_shell
@@ -187,10 +178,7 @@ build-windows-msvc15:
   tags:
     - msvc15
     - win
-  artifacts:
-    paths:
-      - build/install
-    expire_in: 3 day
+  <<: *build_artifacts
 
 #build-windows-icc:
 #  <<: *build_job_shell
@@ -199,24 +187,20 @@ build-windows-msvc15:
 #  tags:
 #    - icc17
 #    - win
-#  artifacts:
-#    paths:
-#      - build/install
-#    expire_in: 3 day
+#  <<: *build_artifacts
 
 build-scan-kw:
   stage: build
-  image: ospray-kw-centos7
+  image: ospray/docker-images:centos7
   script:
     - scripts/build_gitlab/build-scan-kw.sh
     - test -s $CI_PROJECT_DIR/kw_build_number
   tags:
-    - kw-scan-docker
+    - docker
   artifacts:
     paths:
         - $CI_PROJECT_DIR/kw_build_number
     expire_in: 3 day
-  allow_failure: true
 
 source-protex-scan:
   stage: build
@@ -291,20 +275,20 @@ test-windows-msvc14:
 
 test-kw-critical:
   stage: test-src
-  image: ospray-kw-centos7
+  image: ospray/docker-images:centos7
   script:
-    - /tmp/test-kw-critical.sh
-  dependencies:
+    - scripts/build_gitlab/test-kw-critical.sh
+  needs:
     - build-scan-kw
   tags:
-    - kw-scan-docker
+    - docker
   allow_failure: true
 
 generate-ci-baseline:
   <<: *test_job_unix
   image: ospray/docker-images:ubuntu18.04
   script:
-    - LD_LIBRARY_PATH="$CI_PROJECT_DIR/build/install/lib:$LD_LIBRARY_PATH" PATH="$CI_PROJECT_DIR/build/install/bin:$PATH" scripts/tests/generate_baseline.sh
+    - LD_LIBRARY_PATH="$CI_PROJECT_DIR/build/install/ospray/lib:$LD_LIBRARY_PATH" PATH="$CI_PROJECT_DIR/build/install/ospray/bin:$PATH" scripts/tests/generate_baseline.sh
   dependencies:
     - build-ubuntu1804-gcc
   artifacts:
@@ -357,7 +341,7 @@ release-linux:
     - modules
   artifacts:
     paths:
-      - ./*.gz
+      - build_release/*.gz
 
 release-osx-clang:
   <<: *release_job

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,6 +1,13 @@
 Version History
 ---------------
 
+### Changes in v2.1.1:
+
+-   CarPaint obeys `coat` weight parameter
+-   Correct depth buffer values with SciVis renderer
+-   Adaptions to Embree v3.10.0
+-   The Linux binary release finds `ospcommon` again
+
 ### Changes in v2.1.0:
 
 -   New clipping geometries feature that allows clipping any scene
@@ -15,7 +22,7 @@ Version History
 -   New plane geometry defined via plane equation and optional bounding
     box
 -   Sun-sky light based on physical model of Hošek-Wilkie
--   Support for photometric lights (e.g. IES or EULUMDAT)
+-   Support for photometric lights (e.g., IES or EULUMDAT)
 -   Add new `ospGetTaskDuration` API call to query execution time of
     asynchronous tasks
 -   Support for 16bit (unsigned short) textures
@@ -51,7 +58,7 @@ Version History
 -   Add the option to specify a single color for geometric models
 -   The `scivis` renderer now respects the opacity component of `color`
     on geometric models
--   Fix various inconsistent handling of frame buffer alpha between
+-   Fix various inconsistent handling of framebuffer alpha between
     renderers
 -   `ospGetCurrentDevice` now increments the ref count of the returned
     `OSPDevice` handle, so applications will need to release the handle
@@ -110,7 +117,7 @@ Version History
     -   Any unused parameters an object ignores now emit a warning message
 -   New support for volumes in the `pathtracer`
     -   Several parameters are available for performance/quality
-        trade-offs for both photo-realistic and scientific visualization
+        trade-offs for both photorealistic and scientific visualization
         use cases
 -   Simplification of the SciVis renderer
     -   Fixed AO lighting and simple ray marched volume rendering for
@@ -788,7 +795,7 @@ changes.
 -   Incorporated early version of a new Qt-based viewer to eventually
     unify (and replace) the existing simpler GLUT-based viewers
 -   Added new path tracing renderer (`ospray/render/pathtracer`),
--   roughly based on the Embree sample path tracer
+    roughly based on the Embree sample path tracer
 -   Added new features to the volume renderer
     -   Gradient shading (lighting)
     -   Implicit isosurfacing

diff --git a/README.md b/README.md
@@ -1,7 +1,7 @@
 OSPRay
 ======
 
-This is release v2.1.0 of Intel® OSPRay. For changes and new features
+This is release v2.1.1 of Intel® OSPRay. For changes and new features
 see the [changelog](CHANGELOG.md). Visit http://www.ospray.org for more
 information.
 
@@ -714,8 +714,8 @@ opaque arrays to allow the `OSPData` to own the lifetime of the array
 memory. However, opaque arrays dictate the cost of copying data into it,
 which should be kept in mind.
 
-Thus the most efficient way to specify a data array from the application
-is to created a shared data array, which is done with
+Thus, the most efficient way to specify a data array from the
+application is to created a shared data array, which is done with
 
 ``` {.cpp}
 OSPData ospNewSharedData(const void *sharedData,
@@ -943,7 +943,7 @@ Note that cell widths are defined *per refinement level*, not per block.
 |                |              |                   | `OSP_AMR_FINEST`                                                       |
 |                |              |                   | `OSP_AMR_OCTANT`                                                       |
 | float\[\]      | cellWidth    |               NULL| array of each level’s cell width                                       |
-| box3f\[\]      | block.bounds |               NULL| [data](#data) array of bounds for each AMR block                       |
+| box3i\[\]      | block.bounds |               NULL| [data](#data) array of grid sizes (in voxels) for each AMR block       |
 | int\[\]        | block.level  |               NULL| array of each block’s refinement level                                 |
 | OSPData\[\]    | block.data   |               NULL| [data](#data) array of OSPData containing the actual scalar voxel data |
 | vec3f          | gridOrigin   |        $(0, 0, 0)$| origin of the grid in world-space                                      |
@@ -1411,11 +1411,11 @@ about 0.53°.
 ### Point Light / Sphere Light
 
 The sphere light (or the special case point light) is a light emitting
-uniformly in all directions from the surface towards the outside. It
-does not emit any light towards the inside of the sphere. It is created
-by passing the type string “`sphere`” to `ospNewLight`. In addition to
-the [general parameters](#lights) understood by all lights the sphere
-light supports the following special parameters:
+uniformly in all directions from the surface toward the outside. It does
+not emit any light toward the inside of the sphere. It is created by
+passing the type string “`sphere`” to `ospNewLight`. In addition to the
+[general parameters](#lights) understood by all lights the sphere light
+supports the following special parameters:
 
 | Type  | Name     | Description                                    |
 |:------|:---------|:-----------------------------------------------|
@@ -2595,7 +2595,7 @@ Rendering
 ### Asynchronous Rendering
 
 Rendering is by default asynchronous (non-blocking), and is done by
-combining a frame buffer, renderer, camera, and world.
+combining a framebuffer, renderer, camera, and world.
 
 What to render and how to render it depends on the renderer’s
 parameters. If the framebuffer supports accumulation (i.e., it was
@@ -2634,7 +2634,7 @@ The following are values which can be synchronized with the application
 
 | Name                  | Description                                                                                                                                     |
 |:----------------------|:------------------------------------------------------------------------------------------------------------------------------------------------|
-| OSP\_NONE\_FINISHED   | Don’t wait for anything to be finished (immediately return from `ospWait`)                                                                      |
+| OSP\_NONE\_FINISHED   | Do not wait for anything to be finished (immediately return from `ospWait`)                                                                     |
 | OSP\_WORLD\_COMMITTED | Wait for the world to be committed (not yet implemented)                                                                                        |
 | OSP\_WORLD\_RENDERED  | Wait for the world to be rendered, but not post-processing operations (Pixel/Tile/Frame Op)                                                     |
 | OSP\_FRAME\_FINISHED  | Wait for all rendering operations to complete                                                                                                   |

diff --git a/apps/ospExamples/GLFWOSPRayWindow.cpp b/apps/ospExamples/GLFWOSPRayWindow.cpp
@@ -15,12 +15,15 @@
 #ifndef GL_CLAMP_TO_BORDER
 #define GL_CLAMP_TO_BORDER 0x812D
 #endif
-#ifndef GL_SRGB_ALPHA
-#define GL_SRGB_ALPHA 0x8C42
-#endif
 #ifndef GL_FRAMEBUFFER_SRGB
 #define GL_FRAMEBUFFER_SRGB 0x8DB9
 #endif
+#ifndef GL_RGBA32F
+#define GL_RGBA32F 0x8814
+#endif
+#ifndef GL_RGB32F
+#define GL_RGB32F 0x8815
+#endif
 
 static bool g_quitNextFrame = false;
 
@@ -311,15 +314,14 @@ void GLFWOSPRayWindow::display()
 
     auto *fb = framebuffer.map(showAlbedo ? OSP_FB_ALBEDO : OSP_FB_COLOR);
 
-    const GLint glFormat = showAlbedo ? GL_RGB : GL_RGBA;
     glBindTexture(GL_TEXTURE_2D, framebufferTexture);
     glTexImage2D(GL_TEXTURE_2D,
         0,
-        glFormat,
+        showAlbedo ? GL_RGB32F : GL_RGBA32F,
         windowSize.x,
         windowSize.y,
         0,
-        glFormat,
+        showAlbedo ? GL_RGB : GL_RGBA,
         GL_FLOAT,
         fb);
 

diff --git a/apps/ospTestSuite/CMakeLists.txt b/apps/ospTestSuite/CMakeLists.txt
@@ -31,5 +31,5 @@ PRIVATE
 
 install(TARGETS ospTestSuite
   DESTINATION ${CMAKE_INSTALL_BINDIR}
-  COMPONENT test
+  COMPONENT apps
 )
diff --git a/cmake/ospray_cmake_config/osprayConfig.cmake.in b/cmake/ospray_cmake_config/osprayConfig.cmake.in
@@ -1,4 +1,4 @@
-## Copyright 2009-2019 Intel Corporation
+## Copyright 2009-2020 Intel Corporation
 ## SPDX-License-Identifier: Apache-2.0
 
 # Called if we failed to find OSPRay or any of it's required dependencies,
@@ -131,7 +131,6 @@ else()
   if (NOT TARGET embree)
     ospray_find_embree(${EMBREE_VERSION_REQUIRED})
     ospray_verify_embree_features()
-    ospray_create_embree_target()
   endif()
 
   if (NOT TARGET ospcommon::ospcommon)