Merge branch 'next_release'

KhronosGroup · Mar 15, 2024 · c355b8a · c355b8a
2 parents d17fcf9 + 7971d9f
commit c355b8a
Show file tree

Hide file tree

Showing 1,014 changed files with 8,491 additions and 2,766 deletions.
diff --git a/.github/workflows/anari_sdk_ci.yml b/.github/workflows/anari_sdk_ci.yml
@@ -45,5 +45,4 @@ jobs:
 
     - name: Render Tests
       working-directory: ${{github.workspace}}/build
-      if: ${{ matrix.config == 'Release' }}
       run: ctest -R render_test -C ${{ matrix.config }}
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -1,4 +1,4 @@
-## Copyright 2021 The Khronos Group
+## Copyright 2021-2024 The Khronos Group
 ## SPDX-License-Identifier: Apache-2.0
 
 cmake_minimum_required(VERSION 3.11)
@@ -28,7 +28,7 @@ list(APPEND CMAKE_MODULE_PATH ${CMAKE_CURRENT_LIST_DIR}/cmake)
 
 ## Establish project
 
-project(anari VERSION 0.8.0 LANGUAGES C CXX)
+project(anari VERSION 0.9.0 LANGUAGES C CXX)
 
 set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${PROJECT_BINARY_DIR})
 set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${PROJECT_BINARY_DIR})
@@ -66,7 +66,7 @@ include(cmake/anari_sdk_fetch_project.cmake)
 
 ## Add library and executable targets
 
-add_subdirectory(libs)
+add_subdirectory(src)
 add_subdirectory(external)
 add_subdirectory(code_gen)
 if (BUILD_EXAMPLES)

diff --git a/cmake/Findanari.cmake b/cmake/Findanari.cmake
@@ -1,4 +1,4 @@
-## Copyright 2022 The Khronos Group
+## Copyright 2022-2024 The Khronos Group
 ## SPDX-License-Identifier: Apache-2.0
 
 ## NOTE: DO NOT USE THIS MODULE FILE!!! This CMake module sets up fake imported

diff --git a/cmake/anariConfig.cmake.in b/cmake/anariConfig.cmake.in
@@ -1,4 +1,4 @@
-## Copyright 2021 The Khronos Group
+## Copyright 2021-2024 The Khronos Group
 ## SPDX-License-Identifier: Apache-2.0
 
 @PACKAGE_INIT@

diff --git a/cmake/anari_generate_codegen.cmake b/cmake/anari_generate_codegen.cmake
@@ -1,4 +1,4 @@
-## Copyright 2023 The Khronos Group
+## Copyright 2023-2024 The Khronos Group
 ## SPDX-License-Identifier: Apache-2.0
 
 function(anari_generate_queries)

diff --git a/cmake/anari_generate_frontend.cmake b/cmake/anari_generate_frontend.cmake
@@ -1,4 +1,4 @@
-## Copyright 2021 The Khronos Group
+## Copyright 2021-2024 The Khronos Group
 ## SPDX-License-Identifier: Apache-2.0
 
 function(anari_generate_frontend)

diff --git a/cmake/anari_sdk_fetch_project.cmake b/cmake/anari_sdk_fetch_project.cmake
@@ -1,4 +1,4 @@
-## Copyright 2023 The Khronos Group
+## Copyright 2023-2024 The Khronos Group
 ## SPDX-License-Identifier: Apache-2.0
 
 include(FetchContent)

diff --git a/cmake/cmake_project_commands.cmake b/cmake/cmake_project_commands.cmake
@@ -1,4 +1,4 @@
-## Copyright 2022 The Khronos Group
+## Copyright 2022-2024 The Khronos Group
 ## SPDX-License-Identifier: Apache-2.0
 
 function(project_add_executable)

diff --git a/cmake/mark_cache_variables_as_advanced.cmake b/cmake/mark_cache_variables_as_advanced.cmake
@@ -1,4 +1,4 @@
-## Copyright 2023 The Khronos Group
+## Copyright 2023-2024 The Khronos Group
 ## SPDX-License-Identifier: Apache-2.0
 
 function(mark_cache_variables_as_advanced)

diff --git a/code_gen/CMakeLists.txt b/code_gen/CMakeLists.txt
@@ -1,4 +1,4 @@
-## Copyright 2021 The Khronos Group
+## Copyright 2021-2024 The Khronos Group
 ## SPDX-License-Identifier: Apache-2.0
 
 if(CMAKE_VERSION VERSION_GREATER_EQUAL "3.12")

diff --git a/code_gen/api/khr_geometry_cone.json b/code_gen/api/khr_geometry_cone.json
@@ -16,6 +16,31 @@
                     "types" : ["ANARI_STRING"],
                     "tags" : [],
                     "description" : "optional object name"
+                }, {
+                    "name" : "color",
+                    "types" : ["ANARI_FLOAT32_VEC4"],
+                    "tags" : [],
+                    "description" : "uniform color"
+                }, {
+                    "name" : "attribute0",
+                    "types" : ["ANARI_FLOAT32_VEC4"],
+                    "tags" : [],
+                    "description" : "uniform attribute0"
+                }, {
+                    "name" : "attribute1",
+                    "types" : ["ANARI_FLOAT32_VEC4"],
+                    "tags" : [],
+                    "description" : "uniform attribute1"
+                }, {
+                    "name" : "attribute2",
+                    "types" : ["ANARI_FLOAT32_VEC4"],
+                    "tags" : [],
+                    "description" : "uniform attribute2"
+                }, {
+                    "name" : "attribute3",
+                    "types" : ["ANARI_FLOAT32_VEC4"],
+                    "tags" : [],
+                    "description" : "uniform attribute3"
                 }, {
                     "name" : "primitive.color",
                     "types" : ["ANARI_ARRAY1D"],

diff --git a/code_gen/api/khr_geometry_curve.json b/code_gen/api/khr_geometry_curve.json
@@ -16,6 +16,31 @@
                     "types" : ["ANARI_STRING"],
                     "tags" : [],
                     "description" : "optional object name"
+                }, {
+                    "name" : "color",
+                    "types" : ["ANARI_FLOAT32_VEC4"],
+                    "tags" : [],
+                    "description" : "uniform color"
+                }, {
+                    "name" : "attribute0",
+                    "types" : ["ANARI_FLOAT32_VEC4"],
+                    "tags" : [],
+                    "description" : "uniform attribute0"
+                }, {
+                    "name" : "attribute1",
+                    "types" : ["ANARI_FLOAT32_VEC4"],
+                    "tags" : [],
+                    "description" : "uniform attribute1"
+                }, {
+                    "name" : "attribute2",
+                    "types" : ["ANARI_FLOAT32_VEC4"],
+                    "tags" : [],
+                    "description" : "uniform attribute2"
+                }, {
+                    "name" : "attribute3",
+                    "types" : ["ANARI_FLOAT32_VEC4"],
+                    "tags" : [],
+                    "description" : "uniform attribute3"
                 }, {
                     "name" : "primitive.color",
                     "types" : ["ANARI_ARRAY1D"],

diff --git a/code_gen/api/khr_geometry_cylinder.json b/code_gen/api/khr_geometry_cylinder.json
@@ -16,6 +16,31 @@
                     "types" : ["ANARI_STRING"],
                     "tags" : [],
                     "description" : "optional object name"
+                }, {
+                    "name" : "color",
+                    "types" : ["ANARI_FLOAT32_VEC4"],
+                    "tags" : [],
+                    "description" : "uniform color"
+                }, {
+                    "name" : "attribute0",
+                    "types" : ["ANARI_FLOAT32_VEC4"],
+                    "tags" : [],
+                    "description" : "uniform attribute0"
+                }, {
+                    "name" : "attribute1",
+                    "types" : ["ANARI_FLOAT32_VEC4"],
+                    "tags" : [],
+                    "description" : "uniform attribute1"
+                }, {
+                    "name" : "attribute2",
+                    "types" : ["ANARI_FLOAT32_VEC4"],
+                    "tags" : [],
+                    "description" : "uniform attribute2"
+                }, {
+                    "name" : "attribute3",
+                    "types" : ["ANARI_FLOAT32_VEC4"],
+                    "tags" : [],
+                    "description" : "uniform attribute3"
                 }, {
                     "name" : "primitive.color",
                     "types" : ["ANARI_ARRAY1D"],

diff --git a/code_gen/api/khr_geometry_quad.json b/code_gen/api/khr_geometry_quad.json
@@ -16,6 +16,31 @@
                     "types" : ["ANARI_STRING"],
                     "tags" : [],
                     "description" : "optional object name"
+                }, {
+                    "name" : "color",
+                    "types" : ["ANARI_FLOAT32_VEC4"],
+                    "tags" : [],
+                    "description" : "uniform color"
+                }, {
+                    "name" : "attribute0",
+                    "types" : ["ANARI_FLOAT32_VEC4"],
+                    "tags" : [],
+                    "description" : "uniform attribute0"
+                }, {
+                    "name" : "attribute1",
+                    "types" : ["ANARI_FLOAT32_VEC4"],
+                    "tags" : [],
+                    "description" : "uniform attribute1"
+                }, {
+                    "name" : "attribute2",
+                    "types" : ["ANARI_FLOAT32_VEC4"],
+                    "tags" : [],
+                    "description" : "uniform attribute2"
+                }, {
+                    "name" : "attribute3",
+                    "types" : ["ANARI_FLOAT32_VEC4"],
+                    "tags" : [],
+                    "description" : "uniform attribute3"
                 }, {
                     "name" : "primitive.color",
                     "types" : ["ANARI_ARRAY1D"],

diff --git a/code_gen/api/khr_geometry_sphere.json b/code_gen/api/khr_geometry_sphere.json
@@ -16,6 +16,31 @@
                     "types" : ["ANARI_STRING"],
                     "tags" : [],
                     "description" : "optional object name"
+                }, {
+                    "name" : "color",
+                    "types" : ["ANARI_FLOAT32_VEC4"],
+                    "tags" : [],
+                    "description" : "uniform color"
+                }, {
+                    "name" : "attribute0",
+                    "types" : ["ANARI_FLOAT32_VEC4"],
+                    "tags" : [],
+                    "description" : "uniform attribute0"
+                }, {
+                    "name" : "attribute1",
+                    "types" : ["ANARI_FLOAT32_VEC4"],
+                    "tags" : [],
+                    "description" : "uniform attribute1"
+                }, {
+                    "name" : "attribute2",
+                    "types" : ["ANARI_FLOAT32_VEC4"],
+                    "tags" : [],
+                    "description" : "uniform attribute2"
+                }, {
+                    "name" : "attribute3",
+                    "types" : ["ANARI_FLOAT32_VEC4"],
+                    "tags" : [],
+                    "description" : "uniform attribute3"
                 }, {
                     "name" : "primitive.color",
                     "types" : ["ANARI_ARRAY1D"],

diff --git a/code_gen/api/khr_geometry_triangle.json b/code_gen/api/khr_geometry_triangle.json
@@ -16,6 +16,31 @@
                     "types" : ["ANARI_STRING"],
                     "tags" : [],
                     "description" : "optional object name"
+                }, {
+                    "name" : "color",
+                    "types" : ["ANARI_FLOAT32_VEC4"],
+                    "tags" : [],
+                    "description" : "uniform color"
+                }, {
+                    "name" : "attribute0",
+                    "types" : ["ANARI_FLOAT32_VEC4"],
+                    "tags" : [],
+                    "description" : "uniform attribute0"
+                }, {
+                    "name" : "attribute1",
+                    "types" : ["ANARI_FLOAT32_VEC4"],
+                    "tags" : [],
+                    "description" : "uniform attribute1"
+                }, {
+                    "name" : "attribute2",
+                    "types" : ["ANARI_FLOAT32_VEC4"],
+                    "tags" : [],
+                    "description" : "uniform attribute2"
+                }, {
+                    "name" : "attribute3",
+                    "types" : ["ANARI_FLOAT32_VEC4"],
+                    "tags" : [],
+                    "description" : "uniform attribute3"
                 }, {
                     "name" : "primitive.color",
                     "types" : ["ANARI_ARRAY1D"],

diff --git a/code_gen/generate_device_frontend.py b/code_gen/generate_device_frontend.py
@@ -1,4 +1,4 @@
-# Copyright 2021 The Khronos Group
+# Copyright 2021-2024 The Khronos Group
 # SPDX-License-Identifier: Apache-2.0
 
 import sys

diff --git a/code_gen/generate_extension_utility.py b/code_gen/generate_extension_utility.py
@@ -1,4 +1,4 @@
-# Copyright 2021 The Khronos Group
+# Copyright 2021-2024 The Khronos Group
 # SPDX-License-Identifier: Apache-2.0
 
 import sys
@@ -124,7 +124,7 @@ def end_namespaces(args):
 
 
 with open(args.outdir/"anari_extension_utility.h", mode='w') as f:
-    f.write("// Copyright 2021 The Khronos Group\n")
+    f.write("// Copyright 2021-2024 The Khronos Group\n")
     f.write("// SPDX-License-Identifier: Apache-2.0\n\n")
     f.write("// This file was generated by "+os.path.basename(__file__)+"\n")
     f.write("// Don't make changes to this directly\n\n")

diff --git a/code_gen/generate_headers.py b/code_gen/generate_headers.py
@@ -1,4 +1,4 @@
-# Copyright 2021 The Khronos Group
+# Copyright 2021-2024 The Khronos Group
 # SPDX-License-Identifier: Apache-2.0
 
 import sys
@@ -11,7 +11,7 @@ def write_anari_enums(filename, anari):
     os.makedirs(os.path.dirname(filename), exist_ok=True)
     with open(filename, mode='w') as f:
 
-        f.write("// Copyright 2021 The Khronos Group\n")
+        f.write("// Copyright 2024 The Khronos Group\n")
         f.write("// SPDX-License-Identifier: Apache-2.0\n\n")
         f.write("// This file was generated by "+os.path.basename(__file__)+"\n")
         f.write("// Don't make changes to this directly\n\n")
@@ -24,7 +24,6 @@ def write_anari_enums(filename, anari):
   ANARIDataType() = default;
   constexpr ANARIDataType(int v) noexcept : value(v) {}
   constexpr operator int() const noexcept { return value; }
-  constexpr bool operator==(int v) const noexcept { return v == value; }
  private:
   int value;
 };
@@ -53,7 +52,7 @@ def write_anari_header(filename, anari):
     os.makedirs(os.path.dirname(filename), exist_ok=True)
 
     with open(filename, mode='w') as f:
-        f.write("// Copyright 2021 The Khronos Group\n")
+        f.write("// Copyright 2021-2024 The Khronos Group\n")
         f.write("// SPDX-License-Identifier: Apache-2.0\n\n")
         f.write("// This file was generated by "+os.path.basename(__file__)+"\n")
         f.write("// Don't make changes to this directly\n\n")
@@ -198,7 +197,7 @@ def write_anari_type_query_helper(filename, anari):
     os.makedirs(os.path.dirname(filename), exist_ok=True)
 
     with open(filename, mode='w') as f:
-        f.write("// Copyright 2021 The Khronos Group\n")
+        f.write("// Copyright 2021-2024 The Khronos Group\n")
         f.write("// SPDX-License-Identifier: Apache-2.0\n\n")
         f.write("// This file was generated by "+os.path.basename(__file__)+"\n")
         f.write("// Don't make changes to this directly\n\n")

diff --git a/code_gen/generate_queries.py b/code_gen/generate_queries.py
@@ -1,4 +1,4 @@
-# Copyright 2021 The Khronos Group
+# Copyright 2021-2024 The Khronos Group
 # SPDX-License-Identifier: Apache-2.0
 
 import sys
@@ -457,7 +457,7 @@ def end_namespaces(args):
     return output
 
 with open(args.outdir/(args.prefix + "Queries.cpp"), mode='w') as f:
-    f.write("// Copyright 2021 The Khronos Group\n")
+    f.write("// Copyright 2024 The Khronos Group\n")
     f.write("// SPDX-License-Identifier: Apache-2.0\n\n")
     f.write("// This file was generated by "+os.path.basename(__file__)+"\n")
     f.write("// Don't make changes to this directly\n\n")
@@ -475,7 +475,7 @@ def end_namespaces(args):
 
 
 with open(args.outdir/(args.prefix + "Queries.h"), mode='w') as f:
-    f.write("// Copyright 2021 The Khronos Group\n")
+    f.write("// Copyright 2024 The Khronos Group\n")
     f.write("// SPDX-License-Identifier: Apache-2.0\n\n")
     f.write("// This file was generated by "+os.path.basename(__file__)+"\n")
     f.write("// Don't make changes to this directly\n\n")

diff --git a/code_gen/hash_gen.py b/code_gen/hash_gen.py
@@ -1,4 +1,4 @@
-# Copyright 2021 The Khronos Group
+# Copyright 2021-2024 The Khronos Group
 # SPDX-License-Identifier: Apache-2.0
 
 import sys

diff --git a/code_gen/merge_anari.py b/code_gen/merge_anari.py
@@ -1,4 +1,4 @@
-# Copyright 2021 The Khronos Group
+# Copyright 2021-2024 The Khronos Group
 # SPDX-License-Identifier: Apache-2.0
 
 import json
@@ -41,8 +41,9 @@ def merge_parameters(core, extension):
         name = param["name"]
         c = next((x for x in core if x["name"] == name), None)
         if c:
-            c["types"].extend(param["types"])
-            if "values" in c:
+            if "types" in c and "types" in param:
+                c["types"].extend(param["types"])
+            if "values" in c and "values" in param:
                 c["values"].extend(param["values"])
         else:
             core.append(param)