ernie-renderer 0.2.0.dev7__tar.gz → 0.2.0.dev13__tar.gz

ernie_renderer-0.2.0.dev13/.gitattributes

@@ -0,0 +1,15 @@
+* text=auto eol=lf
+*.sh text eol=lf
+
+# Binary formats, never normalised or diffed as text whatever their bytes look like.
+*.dds binary
+*.exr binary
+*.img binary
+*.jpeg binary
+*.jpg binary
+*.ktx2 binary
+*.nvdb binary
+*.png binary
+*.tif binary
+*.tiff binary
+*.vdb binary

{ernie_renderer-0.2.0.dev7 → ernie_renderer-0.2.0.dev13}/.github/workflows/ci.yml

@@ -80,13 +80,12 @@ jobs:
       # MSVC on the path for the Ninja generator.
       - uses: ilammy/msvc-dev-cmd@0b201ec74fa43914dc39ae48a89fd1d8cb592756 # v1.13.0
         if: runner.os == 'Windows'
-      # Fetched dependencies' sources, keyed on their pins. Compiled objects are not cached.
+      # Fetched dependencies' sources (ERNIE_DEPS_DIR), keyed on their pins; they are built in the
+      # build tree, so compiled objects are not cached.
       - uses: actions/cache@55cc8345863c7cc4c66a329aec7e433d2d1c52a9 # v6.1.0
         with:
-          path: |
-            .deps/*-src
-            .deps/*-subbuild
-          key: deps-${{ runner.os }}-${{ hashFiles('cmake/third_party/**') }}
+          path: .deps
+          key: deps-${{ runner.os }}-${{ hashFiles('cmake/ErnieFetch.cmake', 'cmake/third_party/**') }}
       - name: Configure
         shell: bash
         run: >
@@ -171,10 +170,8 @@ jobs:
       - run: python -m pip install nanobind ninja pytest gcovr
       - uses: actions/cache@55cc8345863c7cc4c66a329aec7e433d2d1c52a9 # v6.1.0
         with:
-          path: |
-            .deps/*-src
-            .deps/*-subbuild
-          key: deps-${{ runner.os }}-${{ hashFiles('cmake/third_party/**') }}
+          path: .deps
+          key: deps-${{ runner.os }}-${{ hashFiles('cmake/ErnieFetch.cmake', 'cmake/third_party/**') }}
       - name: Install lavapipe
         run: |
           sudo apt-get update
@@ -194,7 +191,7 @@ jobs:
       - name: Report
         run: |
           mkdir -p coverage
-          gcovr --root . --filter 'ernie/' --exclude 'ernie/test/' --exclude '.*_table\.h' \
+          gcovr --root . --filter 'ernie/' --exclude '.*_table\.h' \
             --object-directory build/coverage \
             --html-details coverage/index.html --json-summary coverage/summary.json --print-summary
           python .github/scripts/coverage_badge.py coverage
@@ -223,9 +220,13 @@ jobs:
 
   # The project site on GitHub Pages, from main: the docs, with the coverage report and its badge
   # under coverage/.
+  # The site follows main whenever its docs build, so a failing test elsewhere never takes it down;
+  # the coverage report is included when the coverage job passed.
   pages:
-    needs: [lint, test, docs, coverage]
-    if: github.event_name == 'push' && github.ref == 'refs/heads/main'
+    needs: [docs, coverage]
+    if: >
+      always() && github.event_name == 'push' && github.ref == 'refs/heads/main'
+      && needs.docs.result == 'success'
     runs-on: ubuntu-24.04
     timeout-minutes: 10
     permissions:
@@ -240,6 +241,7 @@ jobs:
           name: docs
           path: site
       - uses: actions/download-artifact@9000827ccba6bdab643e8b6fd33ac0654aef8333 # v8.0.2
+        if: needs.coverage.result == 'success'
         with:
           name: coverage
           path: site/coverage
@@ -250,18 +252,23 @@ jobs:
         uses: actions/deploy-pages@368f82528645a54fb793d4d04e342629a3f51346 # v5.0.1
 
   wheel:
-    name: wheel (${{ matrix.platform }})
+    name: wheel (${{ matrix.platform }}, ${{ matrix.python }})
     needs: version
     runs-on: ${{ matrix.runner }}
     timeout-minutes: 45
     strategy:
       fail-fast: false
       matrix:
+        # cp312 is the stable-ABI wheel for every CPython from 3.12.
+        python: [cp310, cp311, cp312]
+        platform: [linux-x86_64, linux-aarch64, windows-amd64, macos-arm64]
         include:
           - { platform: linux-x86_64, runner: ubuntu-24.04 }
           - { platform: linux-aarch64, runner: ubuntu-24.04-arm }
           - { platform: windows-amd64, runner: windows-2025 }
           - { platform: macos-arm64, runner: macos-15 }
+    env:
+      CIBW_BUILD: ${{ matrix.python }}-*
     steps:
       - uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
       - name: Version
@@ -276,7 +283,7 @@ jobs:
           output-dir: wheelhouse
       - uses: actions/upload-artifact@cf430e030ddbb5b0abf93d22962f4752f3646cd9 # v7.0.2
         with:
-          name: wheel-${{ matrix.platform }}
+          name: wheel-${{ matrix.platform }}-${{ matrix.python }}
           path: wheelhouse/*.whl
 
   # The sdist, then a wheel built from it and imported, as pip does for platforms without wheels.

{ernie_renderer-0.2.0.dev7 → ernie_renderer-0.2.0.dev13}/.pre-commit-config.yaml

@@ -1,3 +1,6 @@
+# Vendored sources stay byte for byte as their upstream release.
+exclude: ^third_party/(basisu|nanovdb)/
+
 repos:
   - repo: https://github.com/pre-commit/pre-commit-hooks
     rev: v6.0.0

{ernie_renderer-0.2.0.dev7 → ernie_renderer-0.2.0.dev13}/CMakeLists.txt

@@ -14,7 +14,7 @@ project(
 )
 
 # Pre-release suffix such as .dev12, written by CI.
-set(ERNIE_VERSION_SUFFIX ".dev7" CACHE STRING "Pre-release suffix of Ernie's version")
+set(ERNIE_VERSION_SUFFIX ".dev13" CACHE STRING "Pre-release suffix of Ernie's version")
 set(ERNIE_VERSION "${PROJECT_VERSION}${ERNIE_VERSION_SUFFIX}")
 
 option(ERNIE_BUILD_TESTS "Build Ernie's tests" OFF)
@@ -40,12 +40,17 @@ if(ERNIE_BUILD_PYTHON)
     set(CMAKE_POSITION_INDEPENDENT_CODE ON)
 endif()
 
+include(cmake/ErnieFetch.cmake)
 include(cmake/third_party/glm.cmake)
 include(cmake/third_party/dlpack.cmake)
 include(cmake/third_party/json.cmake)
+include(cmake/third_party/openexr.cmake)
+include(cmake/third_party/bc7enc.cmake)
+include(cmake/third_party/stb.cmake)
 include(cmake/third_party/tracy.cmake)
 include(cmake/third_party/vulkan_headers.cmake)
 include(cmake/third_party/volk.cmake)
+add_subdirectory(third_party)
 
 add_library(ernie_build_options INTERFACE)
 if(MSVC)
@@ -79,9 +84,7 @@ if(ERNIE_ASSERTS)
     )
 endif()
 if(ERNIE_COVERAGE)
-    # Unoptimised, so every line maps to its own counters; atomic, as ParallelFor's threads share
-    # them.
-    target_compile_options(ernie_build_options INTERFACE --coverage -fprofile-update=atomic -O0 -g)
+    target_compile_options(ernie_build_options INTERFACE --coverage -fprofile-update=atomic -Og -g)
     target_link_options(ernie_build_options INTERFACE --coverage)
 endif()
 
@@ -89,7 +92,7 @@ add_subdirectory(ernie)
 
 if(ERNIE_BUILD_TESTS)
     enable_testing()
-    add_subdirectory(ernie/test)
+    add_subdirectory(tests)
 endif()
 
 if(PROJECT_IS_TOP_LEVEL AND NOT SKBUILD)

{ernie_renderer-0.2.0.dev7 → ernie_renderer-0.2.0.dev13}/CMakePresets.json

@@ -28,8 +28,7 @@
       "cacheVariables": {
         "CMAKE_BUILD_TYPE": "Release",
         "ERNIE_ASSERTS": "ON",
-        "ERNIE_WARNINGS_AS_ERRORS": "ON",
-        "FETCHCONTENT_BASE_DIR": "${sourceDir}/.deps"
+        "ERNIE_WARNINGS_AS_ERRORS": "ON"
       }
     },
     {
@@ -41,8 +40,7 @@
       "cacheVariables": {
         "CMAKE_BUILD_TYPE": "Debug",
         "ERNIE_COVERAGE": "ON",
-        "ERNIE_WARNINGS_AS_ERRORS": "ON",
-        "FETCHCONTENT_BASE_DIR": "${sourceDir}/.deps"
+        "ERNIE_WARNINGS_AS_ERRORS": "ON"
       }
     },
     {
@@ -56,8 +54,7 @@
         "CMAKE_INSTALL_PREFIX": "/usr",
         "ERNIE_BUILD_APP": "ON",
         "ERNIE_BUILD_TESTS": "OFF",
-        "ERNIE_BUILD_PYTHON": "OFF",
-        "FETCHCONTENT_BASE_DIR": "${sourceDir}/.deps"
+        "ERNIE_BUILD_PYTHON": "OFF"
       }
     }
   ],
@@ -68,11 +65,13 @@
     },
     {
       "name": "ci",
-      "configurePreset": "ci"
+      "configurePreset": "ci",
+      "nativeToolOptions": ["-k", "0"]
     },
     {
       "name": "coverage",
-      "configurePreset": "coverage"
+      "configurePreset": "coverage",
+      "nativeToolOptions": ["-k", "0"]
     },
     {
       "name": "package",

{ernie_renderer-0.2.0.dev7 → ernie_renderer-0.2.0.dev13}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: ernie-renderer
-Version: 0.2.0.dev7
+Version: 0.2.0.dev13
 Summary: Efficient Renderer for Natural and Interplanetary Environments: a physically based, spectral Vulkan ray tracer
 Author: Alex Maietta
 License-Expression: BSD-3-Clause
@@ -8,7 +8,7 @@ License-File: LICENSE
 Project-URL: Homepage, https://github.com/alexmaietta/ernie
 Project-URL: Repository, https://github.com/alexmaietta/ernie
 Project-URL: Issues, https://github.com/alexmaietta/ernie/issues
-Requires-Python: >=3.12
+Requires-Python: >=3.10
 Provides-Extra: test
 Requires-Dist: pytest>=8; extra == "test"
 Description-Content-Type: text/markdown

ernie_renderer-0.2.0.dev13/cmake/ErnieFetch.cmake

@@ -0,0 +1,41 @@
+# SPDX-License-Identifier: BSD-3-Clause
+include_guard(GLOBAL)
+include(FetchContent)
+
+set(ERNIE_DEPS_DIR
+    "${PROJECT_SOURCE_DIR}/.deps"
+    CACHE PATH
+    "Where fetched dependency sources are kept"
+)
+
+function(ernie_fetch name)
+    # The FetchContent_Declare arguments recipes use, declared so others are rejected and gersemi
+    # formats calls by keyword.
+    cmake_parse_arguments(
+        ARG
+        ""
+        "URL;GIT_REPOSITORY;GIT_TAG;GIT_SHALLOW;SOURCE_SUBDIR"
+        "GIT_SUBMODULES"
+        ${ARGN}
+    )
+    if(ARG_UNPARSED_ARGUMENTS)
+        message(FATAL_ERROR "ernie_fetch(${name}): unexpected ${ARG_UNPARSED_ARGUMENTS}")
+    endif()
+    string(TOLOWER "${name}" lower)
+    string(TOUPPER "${name}" upper)
+    set(source "${ERNIE_DEPS_DIR}/${lower}-src")
+    set(stamp "${source}/.ernie-fetched")
+    if(EXISTS "${stamp}")
+        file(READ "${stamp}" fetched)
+        if(fetched STREQUAL "${ARGN}")
+            set(FETCHCONTENT_SOURCE_DIR_${upper} "${source}")
+        else()
+            file(REMOVE_RECURSE "${source}")
+        endif()
+    endif()
+    FetchContent_Declare(${name} ${ARGN} SOURCE_DIR "${source}")
+    FetchContent_MakeAvailable(${name})
+    file(WRITE "${stamp}" "${ARGN}")
+    set(${lower}_SOURCE_DIR "${${lower}_SOURCE_DIR}" PARENT_SCOPE)
+    set(${lower}_BINARY_DIR "${${lower}_BINARY_DIR}" PARENT_SCOPE)
+endfunction()

{ernie_renderer-0.2.0.dev7 → ernie_renderer-0.2.0.dev13}/cmake/ErnieTesting.cmake

@@ -25,6 +25,10 @@ function(ernie_add_test_suite name)
     set(target ernie_tests_${name})
     add_executable(${target} ${ARG_SOURCES})
     target_link_libraries(${target} PRIVATE ${ARG_LIBRARIES} GTest::gtest_main ernie_build_options)
+    target_compile_definitions(
+        ${target}
+        PRIVATE ERNIE_TEST_FIXTURES="${PROJECT_SOURCE_DIR}/tests/fixtures"
+    )
     gtest_discover_tests(
         ${target}
         TEST_PREFIX "ernie.${name}."

ernie_renderer-0.2.0.dev13/cmake/third_party/bc7enc.cmake

@@ -0,0 +1,26 @@
+# SPDX-License-Identifier: BSD-3-Clause
+# bc7enc_rdo has no releases, so a commit is pinned.
+set(ERNIE_DEP_VERSION_bc7enc
+    b9438627eef73a1157e84201b6fa6eb2ffd6d9f0
+    CACHE STRING
+    "Commit of bc7enc_rdo to fetch"
+)
+mark_as_advanced(ERNIE_DEP_VERSION_bc7enc)
+
+ernie_fetch(
+    bc7enc
+    URL https://github.com/richgel999/bc7enc_rdo/archive/${ERNIE_DEP_VERSION_bc7enc}.tar.gz
+    SOURCE_SUBDIR no-build
+)
+
+# bc7enc_rdo (MIT or public domain): its BC7 encoder (bc7enc), BC1 to BC5 encoders and decoders
+# (rgbcx) and BC7 decoder (bc7decomp), for baking and decoding textures.
+add_library(
+    ernie_bc7enc
+    STATIC
+    "${bc7enc_SOURCE_DIR}/bc7enc.cpp"
+    "${bc7enc_SOURCE_DIR}/rgbcx.cpp"
+    "${bc7enc_SOURCE_DIR}/bc7decomp.cpp"
+)
+target_include_directories(ernie_bc7enc SYSTEM PUBLIC "${bc7enc_SOURCE_DIR}")
+set_target_properties(ernie_bc7enc PROPERTIES POSITION_INDEPENDENT_CODE ON)

{ernie_renderer-0.2.0.dev7 → ernie_renderer-0.2.0.dev13}/cmake/third_party/dlpack.cmake

@@ -2,15 +2,11 @@
 set(ERNIE_DEP_VERSION_dlpack v1.3 CACHE STRING "Tag of DLPack to fetch")
 mark_as_advanced(ERNIE_DEP_VERSION_dlpack)
 
-include(FetchContent)
-FetchContent_Declare(
+ernie_fetch(
     dlpack
-    GIT_REPOSITORY https://github.com/dmlc/dlpack.git
-    GIT_TAG ${ERNIE_DEP_VERSION_dlpack}
-    GIT_SHALLOW TRUE
+    URL https://github.com/dmlc/dlpack/archive/refs/tags/${ERNIE_DEP_VERSION_dlpack}.tar.gz
     SOURCE_SUBDIR no-build
 )
-FetchContent_MakeAvailable(dlpack)
 
 # The tensor exchange header, nothing to build.
 add_library(ernie_dlpack INTERFACE)

{ernie_renderer-0.2.0.dev7 → ernie_renderer-0.2.0.dev13}/cmake/third_party/glm.cmake

@@ -6,14 +6,7 @@ set(GLM_BUILD_LIBRARY OFF)
 set(GLM_BUILD_TESTS OFF)
 set(GLM_BUILD_INSTALL OFF)
 
-include(FetchContent)
-FetchContent_Declare(
-    glm
-    GIT_REPOSITORY https://github.com/g-truc/glm.git
-    GIT_TAG ${ERNIE_DEP_VERSION_glm}
-    GIT_SHALLOW TRUE
-)
-FetchContent_MakeAvailable(glm)
+ernie_fetch(glm URL https://github.com/g-truc/glm/archive/refs/tags/${ERNIE_DEP_VERSION_glm}.tar.gz)
 
 add_library(ernie_glm INTERFACE)
 target_include_directories(ernie_glm SYSTEM INTERFACE "${glm_SOURCE_DIR}")

{ernie_renderer-0.2.0.dev7 → ernie_renderer-0.2.0.dev13}/cmake/third_party/googletest.cmake

@@ -6,11 +6,8 @@ set(BUILD_GMOCK OFF)
 set(INSTALL_GTEST OFF)
 set(gtest_force_shared_crt ON)
 
-include(FetchContent)
-FetchContent_Declare(
+ernie_fetch(
     googletest
-    GIT_REPOSITORY https://github.com/google/googletest.git
-    GIT_TAG ${ERNIE_DEP_VERSION_googletest}
-    GIT_SHALLOW TRUE
+    URL
+        https://github.com/google/googletest/archive/refs/tags/${ERNIE_DEP_VERSION_googletest}.tar.gz
 )
-FetchContent_MakeAvailable(googletest)

{ernie_renderer-0.2.0.dev7 → ernie_renderer-0.2.0.dev13}/cmake/third_party/json.cmake

@@ -3,12 +3,10 @@ set(ERNIE_DEP_VERSION_json v3.12.0 CACHE STRING "Release of nlohmann/json to fet
 mark_as_advanced(ERNIE_DEP_VERSION_json)
 
 # The release's single-include archive, without the repository's tests and history.
-include(FetchContent)
-FetchContent_Declare(
+ernie_fetch(
     nlohmann_json
     URL https://github.com/nlohmann/json/releases/download/${ERNIE_DEP_VERSION_json}/include.zip
 )
-FetchContent_MakeAvailable(nlohmann_json)
 
 add_library(ernie_json INTERFACE)
 target_include_directories(ernie_json SYSTEM INTERFACE "${nlohmann_json_SOURCE_DIR}/single_include")

{ernie_renderer-0.2.0.dev7 → ernie_renderer-0.2.0.dev13}/cmake/third_party/nanobind.cmake

@@ -8,7 +8,7 @@ mark_as_advanced(ERNIE_DEP_VERSION_nanobind)
 
 find_package(
     Python
-    3.12
+    3.10
     REQUIRED
     COMPONENTS Interpreter Development.Module ${SKBUILD_SABI_COMPONENT}
 )
@@ -22,13 +22,11 @@ execute_process(
 )
 find_package(nanobind CONFIG QUIET)
 if(NOT nanobind_FOUND)
-    include(FetchContent)
-    FetchContent_Declare(
+    ernie_fetch(
         nanobind
         GIT_REPOSITORY https://github.com/wjakob/nanobind.git
         GIT_TAG ${ERNIE_DEP_VERSION_nanobind}
         GIT_SHALLOW TRUE
         GIT_SUBMODULES ext/robin_map
     )
-    FetchContent_MakeAvailable(nanobind)
 endif()

ernie_renderer-0.2.0.dev13/cmake/third_party/openexr.cmake

@@ -0,0 +1,71 @@
+# SPDX-License-Identifier: BSD-3-Clause
+set(ERNIE_DEP_VERSION_openexr v3.5.2 CACHE STRING "Tag of OpenEXR to fetch")
+set(ERNIE_DEP_VERSION_imath v3.2.3 CACHE STRING "Tag of Imath to fetch for OpenEXR")
+mark_as_advanced(ERNIE_DEP_VERSION_openexr ERNIE_DEP_VERSION_imath)
+
+set(OPENEXR_BUILD_TOOLS OFF)
+set(OPENEXR_BUILD_EXAMPLES OFF)
+set(OPENEXR_BUILD_DOCS OFF)
+set(OPENEXR_BUILD_PYTHON OFF)
+set(OPENEXR_INSTALL OFF)
+set(OPENEXR_INSTALL_TOOLS OFF)
+set(OPENEXR_INSTALL_PKG_CONFIG OFF)
+set(OPENEXR_TEST_LIBRARIES OFF)
+set(OPENEXR_TEST_TOOLS OFF)
+set(OPENEXR_TEST_PYTHON OFF)
+set(OPENEXR_FORCE_INTERNAL_IMATH ON)
+set(OPENEXR_FORCE_INTERNAL_DEFLATE ON)
+set(OPENEXR_FORCE_INTERNAL_ZSTD ON)
+set(OPENEXR_FORCE_INTERNAL_OPENJPH ON)
+set(IMATH_INSTALL_PKG_CONFIG OFF)
+set(IMATH_INSTALL OFF)
+set(BUILD_SHARED_LIBS OFF)
+
+# Their own tests stay out of Ernie's ctest. Imath is made available first, so OpenEXR finds it
+# populated and skips its own git clone of it.
+set(ernie_saved_build_testing ${BUILD_TESTING})
+set(BUILD_TESTING OFF)
+ernie_fetch(
+    Imath
+    URL
+        https://github.com/AcademySoftwareFoundation/Imath/archive/refs/tags/${ERNIE_DEP_VERSION_imath}.tar.gz
+)
+ernie_fetch(
+    openexr
+    URL
+        https://github.com/AcademySoftwareFoundation/openexr/archive/refs/tags/${ERNIE_DEP_VERSION_openexr}.tar.gz
+)
+set(BUILD_TESTING ${ernie_saved_build_testing})
+
+# Its headers and Imath's are system headers to Ernie, kept out of its warnings.
+foreach(
+    target
+    OpenEXR
+    OpenEXRCore
+    OpenEXRUtil
+    Iex
+    IlmThread
+    Imath
+    ImathConfig
+    OpenEXRConfig
+)
+    if(TARGET ${target})
+        get_target_property(directories ${target} INTERFACE_INCLUDE_DIRECTORIES)
+        if(directories)
+            set_property(
+                TARGET ${target}
+                APPEND
+                PROPERTY INTERFACE_SYSTEM_INCLUDE_DIRECTORIES ${directories}
+            )
+        endif()
+    endif()
+endforeach()
+
+add_library(ernie_openexr INTERFACE)
+target_link_libraries(ernie_openexr INTERFACE OpenEXR::OpenEXR)
+
+# The zstd built into OpenEXRCore exports its API, so KTX2's zstd supercompression is decoded with
+# it rather than a second copy.
+add_library(ernie_zstd INTERFACE)
+target_include_directories(ernie_zstd SYSTEM INTERFACE "${openexr_SOURCE_DIR}/external/zstd/lib")
+target_link_libraries(ernie_zstd INTERFACE OpenEXR::OpenEXRCore)

ernie_renderer-0.2.0.dev13/cmake/third_party/stb.cmake

@@ -0,0 +1,28 @@
+# SPDX-License-Identifier: BSD-3-Clause
+# stb has no releases, so a commit is pinned.
+set(ERNIE_DEP_VERSION_stb
+    2c980bb59875b0d32144a71867fbdebb2f77cd20
+    CACHE STRING
+    "Commit of stb to fetch"
+)
+mark_as_advanced(ERNIE_DEP_VERSION_stb)
+
+ernie_fetch(
+    stb
+    URL https://github.com/nothings/stb/archive/${ERNIE_DEP_VERSION_stb}.tar.gz
+    SOURCE_SUBDIR no-build
+)
+
+# stb is header-only: its implementations of stb_image (PNG, JPEG) and stb_image_write are compiled
+# once, from a source written into the build tree.
+set(ernie_stb_source "${CMAKE_BINARY_DIR}/stb/stb.cpp")
+file(
+    CONFIGURE
+    OUTPUT "${ernie_stb_source}"
+    CONTENT
+        "#define STB_IMAGE_IMPLEMENTATION\n#define STB_IMAGE_WRITE_IMPLEMENTATION\n#include <stb_image.h>\n#include <stb_image_write.h>\n"
+)
+add_library(ernie_stb STATIC "${ernie_stb_source}")
+target_include_directories(ernie_stb SYSTEM PUBLIC "${stb_SOURCE_DIR}")
+target_compile_definitions(ernie_stb PUBLIC STBI_ONLY_PNG STBI_ONLY_JPEG)
+set_target_properties(ernie_stb PROPERTIES POSITION_INDEPENDENT_CODE ON)

{ernie_renderer-0.2.0.dev7 → ernie_renderer-0.2.0.dev13}/cmake/third_party/tracy.cmake

@@ -12,14 +12,10 @@ endif()
 set(TRACY_ENABLE ON CACHE BOOL "" FORCE)
 set(TRACY_ON_DEMAND ON CACHE BOOL "" FORCE)
 
-include(FetchContent)
-FetchContent_Declare(
+ernie_fetch(
     tracy
-    GIT_REPOSITORY https://github.com/wolfpld/tracy.git
-    GIT_TAG ${ERNIE_DEP_VERSION_tracy}
-    GIT_SHALLOW TRUE
+    URL https://github.com/wolfpld/tracy/archive/refs/tags/${ERNIE_DEP_VERSION_tracy}.tar.gz
 )
-FetchContent_MakeAvailable(tracy)
 set_target_properties(
     TracyClient
     PROPERTIES POSITION_INDEPENDENT_CODE ON COMPILE_WARNING_AS_ERROR OFF

{ernie_renderer-0.2.0.dev7 → ernie_renderer-0.2.0.dev13}/cmake/third_party/volk.cmake

@@ -2,15 +2,11 @@
 set(ERNIE_DEP_VERSION_volk vulkan-sdk-1.4.363.0 CACHE STRING "Tag of volk to fetch")
 mark_as_advanced(ERNIE_DEP_VERSION_volk)
 
-include(FetchContent)
-FetchContent_Declare(
+ernie_fetch(
     volk
-    GIT_REPOSITORY https://github.com/zeux/volk.git
-    GIT_TAG ${ERNIE_DEP_VERSION_volk}
-    GIT_SHALLOW TRUE
+    URL https://github.com/zeux/volk/archive/refs/tags/${ERNIE_DEP_VERSION_volk}.tar.gz
     SOURCE_SUBDIR no-build
 )
-FetchContent_MakeAvailable(volk)
 
 # Loads the Vulkan loader at run time, so nothing links against libvulkan.
 add_library(ernie_volk STATIC "${volk_SOURCE_DIR}/volk.c")

{ernie_renderer-0.2.0.dev7 → ernie_renderer-0.2.0.dev13}/cmake/third_party/vulkan_headers.cmake

@@ -6,15 +6,12 @@ set(ERNIE_DEP_VERSION_vulkan_headers
 )
 mark_as_advanced(ERNIE_DEP_VERSION_vulkan_headers)
 
-include(FetchContent)
-FetchContent_Declare(
+ernie_fetch(
     vulkan_headers
-    GIT_REPOSITORY https://github.com/KhronosGroup/Vulkan-Headers.git
-    GIT_TAG ${ERNIE_DEP_VERSION_vulkan_headers}
-    GIT_SHALLOW TRUE
+    URL
+        https://github.com/KhronosGroup/Vulkan-Headers/archive/refs/tags/${ERNIE_DEP_VERSION_vulkan_headers}.tar.gz
     SOURCE_SUBDIR no-build
 )
-FetchContent_MakeAvailable(vulkan_headers)
 
 add_library(ernie_vulkan_headers INTERFACE)
 target_include_directories(

{ernie_renderer-0.2.0.dev7 → ernie_renderer-0.2.0.dev13}/ernie/CMakeLists.txt

@@ -1,7 +1,7 @@
 # SPDX-License-Identifier: BSD-3-Clause
 
 # One target per layer; a layer links only the layers below it.
-add_subdirectory(core)
+add_subdirectory(util)
 add_subdirectory(physics)
 add_subdirectory(io)
 add_subdirectory(scene)

{ernie_renderer-0.2.0.dev7 → ernie_renderer-0.2.0.dev13}/ernie/app/main.cpp

@@ -1,8 +1,8 @@
 // SPDX-License-Identifier: BSD-3-Clause
 /// @file main.cpp
 /// @brief The ernie program.
-#include "ernie/core/version.h"
 #include "ernie/device/vulkan_devices.h"
+#include "ernie/util/version.h"
 
 #include <cstdio>
 #include <exception>

{ernie_renderer-0.2.0.dev7 → ernie_renderer-0.2.0.dev13}/ernie/device/CMakeLists.txt

@@ -1,3 +1,3 @@
 # SPDX-License-Identifier: BSD-3-Clause
 add_library(ernie_device STATIC vulkan_devices.cpp)
-target_link_libraries(ernie_device PUBLIC ernie_core PRIVATE ernie_volk ernie_build_options)
+target_link_libraries(ernie_device PUBLIC ernie_util PRIVATE ernie_volk ernie_build_options)

ernie_renderer-0.2.0.dev13/ernie/io/CMakeLists.txt

@@ -0,0 +1,22 @@
+# SPDX-License-Identifier: BSD-3-Clause
+add_library(
+    ernie_io
+    STATIC
+    ies.cpp
+    image.cpp
+    nanovdb.cpp
+    raster.cpp
+    texture.cpp
+)
+target_link_libraries(
+    ernie_io
+    PUBLIC ernie_util
+    PRIVATE
+        ernie_build_options
+        ernie_basisu
+        ernie_bc7enc
+        ernie_nanovdb
+        ernie_openexr
+        ernie_stb
+        ernie_zstd
+)