Merge branch 'master' into mesh_loaders_kevin

Author: kevyuu

.github/workflows/build-nabla.yml

@@ -1,4 +1,4 @@
-name: Build Nabla Workflow
+name: Build
 
 on:
   push:
@@ -7,14 +7,16 @@ on:
 
 permissions:
   contents: read
+  checks: write
 
 concurrency:
   group: push-lock-${{ github.ref }}
   cancel-in-progress: true
 
 jobs:
   build-windows:
-    runs-on: windows-2022
+    name: Nabla (${{ matrix.os }}, ${{ matrix.vendor }}-${{ matrix.tag }}, ${{ matrix.config }})
+    runs-on: ${{ matrix.os }}
 
     env:
       image: ghcr.io/devsh-graphics-programming/docker-nanoserver-msvc-winsdk
@@ -33,6 +35,7 @@ jobs:
         vendor: [msvc]
         config: [Release, Debug, RelWithDebInfo]
         tag: ['17.13.6']
+        os: [windows-2022]
 
     steps:
       - name: Environment Setup
@@ -129,7 +132,30 @@ jobs:
               --preset ci-build-dynamic-${{ matrix.vendor }} `
               -t run-compiler-explorer --config ${{ matrix.config }}
 
-      - name: Container – Build Examples
+      - name: Container – Install Nabla
+        run: |
+          docker exec orphan `
+            ${{ env.entry }} ${{ env.cmd }} -Command cmake --install `
+              ${{ env.binary }} --config ${{ matrix.config }} `
+              --prefix ${{ env.install }}
+
+      - name: API / Examples / Check Run (Create)
+        id: check-run-create
+        uses: actions/github-script@v6
+        with:
+          github-token: ${{ secrets.GITHUB_TOKEN }}
+          result-encoding: string
+          script: |
+            const response = await github.rest.checks.create({
+              owner: context.repo.owner,
+              repo: context.repo.repo,
+              name: `Examples (${{ matrix.os }}, ${{ matrix.vendor }}-${{ matrix.tag }}, ${{ matrix.config }})`,
+              head_sha: context.sha,
+              status: 'in_progress'
+            });
+            return response.data.id;
+
+      - name: Container – Build & Install Examples
         id: build-examples
         continue-on-error: true
         run: |
@@ -139,21 +165,39 @@ jobs:
               -t examples_tests\all --config ${{ matrix.config }} `
               -- -k 0
 
-      - name: Container – Install Nabla
-        run: |
           docker exec orphan `
             ${{ env.entry }} ${{ env.cmd }} -Command cmake --install `
-              ${{ env.binary }} --config ${{ matrix.config }} `
+              ${{ env.binary }}\examples_tests --config ${{ matrix.config }} `
               --prefix ${{ env.install }}
 
-      - name: Container – Install Examples
-        id: install-examples
-        continue-on-error: true
+      - name: API / Examples / Check Run (Conclusion)
+        id: outcome-examples
         run: |
-          docker exec orphan `
-            ${{ env.entry }} ${{ env.cmd }} -Command cmake --install `
-              ${{ env.binary }}\examples_tests --config ${{ matrix.config }} `
-              --prefix ${{ env.install }}
+          $completedAt = (Get-Date).ToUniversalTime().ToString("yyyy-MM-ddTHH:mm:ssZ")
+          if ("${{ steps.build-examples.outcome }}" -eq "success") {
+            "conclusion=success" | Out-File -FilePath $env:GITHUB_OUTPUT -Append
+          } else {
+            "conclusion=failure" | Out-File -FilePath $env:GITHUB_OUTPUT -Append
+          }
+          "completed_at=$completedAt" | Out-File -FilePath $env:GITHUB_OUTPUT -Append
+
+      - name: API / Examples / Check Run (Update)
+        uses: actions/github-script@v6
+        with:
+          github-token: ${{ secrets.GITHUB_TOKEN }}
+          script: |
+            await github.rest.checks.update({
+              owner: context.repo.owner,
+              repo: context.repo.repo,
+              check_run_id: ${{ steps.check-run-create.outputs.result }},
+              status: 'completed',
+              conclusion: '${{ steps.outcome-examples.outputs.conclusion }}',
+              completed_at: '${{ steps.outcome-examples.outputs.completed_at }}',
+              output: {
+                title: '',
+                summary: '[View logs](https://github.com/${{ github.repository }}/actions/runs/${{ github.run_id }}) to see details.'
+              }
+            });
 
       - name: Container – Save NSC Image
         run: |
@@ -268,17 +312,36 @@ jobs:
           commit_message: "[CI] badges update"
 
   deploy-production:
-    name: Deploy to production host
+    name: Deploy Godbolt production image
     if: ${{ always() && github.ref == 'refs/heads/master' }}
     needs: build-windows
-    runs-on: ubuntu-latest
+    runs-on: windows-2022
 
     steps:
-      - name: Pull latest images, re-run containers
-        uses: appleboy/ssh-action@v1
-        with:
-          host: ${{ secrets.CE_HOST }}
-          username: ${{ secrets.CE_USER }}
-          key: ${{ secrets.CE_KEY }}
-          script: |
-            powershell -NoLogo -NoProfile -ExecutionPolicy Bypass -NoExit -File C:\Scripts\startup-docker.ps1
+      - name: Invoke Web Request
+        run: |
+          function Invoke-UpdateImages {
+              param(
+                  [string]$Token,
+                  [string]$Url = 'https://godbolt.devsh.eu/api/update-images'
+              )
+          
+              $resp = Invoke-WebRequest -Method Post `
+                                        -Uri $Url `
+                                        -Headers @{ 'X-API-Token' = $Token } `
+                                        -SkipHttpErrorCheck
+          
+              $httpCode = $resp.StatusCode
+              $body = $resp.Content | ConvertFrom-Json
+          
+              Write-Host "HTTP code : $httpCode"
+              Write-Host "status    : $($body.status)"
+              Write-Host "message   : $($body.message)"
+          
+              if ($httpCode -ne 200) {
+                  throw "Request failed"
+              }
+          }
+          
+          $token = '${{ secrets.CE_IMAGE_UPDATE_TOKEN }}'
+          Invoke-UpdateImages -Token $token

3rdparty/dxc/dxc

@@ -10,6 +10,7 @@
 			"name": "ci-configure-base",
 			"hidden": true,
 			"cacheVariables": {
+				"CMAKE_SUPPRESS_REGENERATION": "ON",
 				"NBL_EMBED_BUILTIN_RESOURCES": "ON",
 				"NBL_UPDATE_GIT_SUBMODULE": "OFF",
 				"NBL_COMPILE_WITH_CUDA": "OFF",
@@ -475,4 +476,4 @@
 			}
 		}
 	]
-}
+}

CMakePresets.json

@@ -4,8 +4,8 @@
 </div>
 
 <p align="center">
-  <a href="https://github.com/Devsh-Graphics-Programming/Nabla/actions">
-    <img src="https://img.shields.io/endpoint?url=https://raw.githubusercontent.com/Devsh-Graphics-Programming/Nabla/badges/nabla/build.json" alt="Build Status" /></a>
+  <a href="https://github.com/Devsh-Graphics-Programming/Nabla/actions/workflows/build-nabla.yml">
+    <img src="https://github.com/Devsh-Graphics-Programming/Nabla/actions/workflows/build-nabla.yml/badge.svg" alt="Build Status" /></a>
   <a href="https://opensource.org/licenses/Apache-2.0">
     <img src="https://img.shields.io/badge/license-Apache%202.0-blue" alt="License: Apache 2.0" /></a>
   <a href="https://discord.gg/krsBcABm7u">

README.md

@@ -1325,13 +1325,17 @@ struct DeviceConfigCaps
 	endif()
 
     set(REQUIRED_SINGLE_ARGS TARGET BINARY_DIR OUTPUT_VAR INPUTS INCLUDE NAMESPACE MOUNT_POINT_DEFINE)
-    cmake_parse_arguments(IMPL "" "${REQUIRED_SINGLE_ARGS}" "COMMON_OPTIONS" ${ARGV})
+    cmake_parse_arguments(IMPL "" "${REQUIRED_SINGLE_ARGS};LINK_TO" "COMMON_OPTIONS;DEPENDS" ${ARGV})
     NBL_PARSE_REQUIRED(IMPL ${REQUIRED_SINGLE_ARGS})
 
 	if(NOT TARGET ${IMPL_TARGET})
 		add_library(${IMPL_TARGET} INTERFACE)
 	endif()
 
+	if(IMPL_LINK_TO)
+		target_link_libraries(${IMPL_LINK_TO} PUBLIC ${IMPL_TARGET})
+	endif()
+
 	if(IS_ABSOLUTE "${IMPL_INCLUDE}")
 		message(FATAL_ERROR "INCLUDE argument must be relative path")
 	endif()
@@ -1429,6 +1433,10 @@ namespace @IMPL_NAMESPACE@ {
             endif()
         endif()
 
+		if(IMPL_DEPENDS)
+			list(APPEND DEPENDS_ON ${IMPL_DEPENDS})
+		endif()
+
         set(HAS_CAPS FALSE)
         set(CAPS_LENGTH 0)
         string(JSON CAPS_TYPE TYPE "${IMPL_INPUTS}" ${INDEX} CAPS)
@@ -1625,9 +1633,14 @@ endfunction()
 
 function(NBL_CREATE_RESOURCE_ARCHIVE)
     set(REQUIRED_SINGLE_ARGS TARGET BIND NAMESPACE)
-    cmake_parse_arguments(IMPL "" "${REQUIRED_SINGLE_ARGS}" "BUILTINS" ${ARGV})
+    cmake_parse_arguments(IMPL "" "${REQUIRED_SINGLE_ARGS}" "BUILTINS;LINK_TO" ${ARGV})
     NBL_PARSE_REQUIRED(IMPL ${REQUIRED_SINGLE_ARGS})
 
+	if(NOT NBL_EMBED_BUILTIN_RESOURCES)
+		add_library(${IMPL_TARGET} INTERFACE) # dummy, could use LINK_TO but makes no difference in this case
+		return()
+	endif()
+
 	set(IMPL_OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/${IMPL_TARGET}")
 
 	set(_BUNDLE_ARCHIVE_ABSOLUTE_PATH_ "")
@@ -1641,17 +1654,18 @@ function(NBL_CREATE_RESOURCE_ARCHIVE)
 	get_filename_component(BUILTIN_ARCHIVE_INPUT_ABS_ENTRY "${IMPL_INPUT_DIRECTORY}" ABSOLUTE)
 	set(BUILTIN_KEY_ENTRY_ABS "${BUILTIN_ARCHIVE_INPUT_ABS_ENTRY}/${_BUNDLE_ARCHIVE_ABSOLUTE_PATH_}")
 
-	if(NBL_EMBED_BUILTIN_RESOURCES)
-		foreach(IT ${IMPL_BUILTINS})
-			if(NBL_LOG_VERBOSE)
-				message(STATUS "[${IMPL_TARGET}'s Builtins]: Registered \"${IT}\" key")
-			endif()
+	unset(NBL_RESOURCES_TO_EMBED)
+	foreach(IT ${IMPL_BUILTINS})
+		if(NBL_LOG_VERBOSE)
+			message(STATUS "[${IMPL_TARGET}'s Builtins]: Registered \"${IT}\" key")
+		endif()
 
-			LIST_BUILTIN_RESOURCE(NBL_RESOURCES_TO_EMBED ${IT})
-		endforeach()
+		LIST_BUILTIN_RESOURCE(NBL_RESOURCES_TO_EMBED ${IT})
+	endforeach()
 
-		ADD_CUSTOM_BUILTIN_RESOURCES(${IMPL_TARGET} NBL_RESOURCES_TO_EMBED "${_BUNDLE_SEARCH_DIRECTORY_}" "${_BUNDLE_ARCHIVE_ABSOLUTE_PATH_}" "${_BUILTIN_RESOURCES_NAMESPACE_}" "${_OUTPUT_DIRECTORY_HEADER_}" "${_OUTPUT_DIRECTORY_SOURCE_}" "${_LINK_MODE_}")
-	else()
-		add_library(${IMPL_TARGET} INTERFACE) # dummy
+	ADD_CUSTOM_BUILTIN_RESOURCES(${IMPL_TARGET} NBL_RESOURCES_TO_EMBED "${_BUNDLE_SEARCH_DIRECTORY_}" "${_BUNDLE_ARCHIVE_ABSOLUTE_PATH_}" "${_BUILTIN_RESOURCES_NAMESPACE_}" "${_OUTPUT_DIRECTORY_HEADER_}" "${_OUTPUT_DIRECTORY_SOURCE_}" "${_LINK_MODE_}")
+
+	if(IMPL_LINK_TO)
+		LINK_BUILTIN_RESOURCES_TO_TARGET(${IMPL_LINK_TO} ${IMPL_TARGET})
 	endif()
 endfunction()

cmake/common.cmake

@@ -5,6 +5,7 @@
 #define _NBL_BUILTIN_HLSL_ALGORITHM_INCLUDED_
 
 #include "nbl/builtin/hlsl/functional.hlsl"
+#include "nbl/builtin/hlsl/math/intutil.hlsl"
 
 namespace nbl
 {
@@ -91,16 +92,10 @@ NBL_CONSTEXPR_INLINE_FUNC void swap(NBL_REF_ARG(T) lhs, NBL_REF_ARG(T) rhs)
 namespace impl
 {
 
-// TODO: move this to some other header
-bool isNPoT(const uint x)
-{
-    return x&(x-1);
-}
-
 template<class Accessor, class Comparator>
 struct bound_t
 {
-    static bound_t<Accessor,Comparator> setup(uint begin, const uint end, const typename Accessor::value_type _value, const Comparator _comp)
+    static bound_t<Accessor,Comparator> setup(uint32_t begin, const uint32_t end, const typename Accessor::value_type _value, const Comparator _comp)
     {
         bound_t<Accessor,Comparator> retval;
         retval.comp = _comp;
@@ -111,12 +106,12 @@ struct bound_t
     }
 
 
-    uint operator()(NBL_REF_ARG(Accessor) accessor)
+    uint32_t operator()(NBL_REF_ARG(Accessor) accessor)
     {
         if (isNPoT(len))
         {
-            const uint newLen = 0x1u<<firstbithigh(len);
-            const uint testPoint = it+(len-newLen);
+            const uint32_t newLen = 0x1u<<nbl::hlsl::findMSB(len);
+            const uint32_t testPoint = it+(len-newLen);
             len = newLen;
             comp_step(accessor,testPoint);
         }
@@ -133,24 +128,24 @@ struct bound_t
     void iteration(NBL_REF_ARG(Accessor) accessor)
     {
         len >>= 1;
-        const uint mid = it+len;
+        const uint32_t mid = it+len;
         comp_step(accessor,mid);
     }
 
-    void comp_step(NBL_REF_ARG(Accessor) accessor, const uint testPoint, const uint rightBegin)
+    void comp_step(NBL_REF_ARG(Accessor) accessor, const uint32_t testPoint, const uint32_t rightBegin)
     {
         if (comp(accessor[testPoint],value))
             it = rightBegin;
     }
-    void comp_step(NBL_REF_ARG(Accessor) accessor, const uint testPoint)
+    void comp_step(NBL_REF_ARG(Accessor) accessor, const uint32_t testPoint)
     {
         comp_step(accessor,testPoint,testPoint);
     }
 
     Comparator comp;
     typename Accessor::value_type value;
-    uint it;
-    uint len;
+    uint32_t it;
+    uint32_t len;
 };
 
 template<class Accessor, class Comparator>
@@ -168,14 +163,14 @@ struct lower_to_upper_comparator_transform_t
 
 
 template<class Accessor, class Comparator>
-uint lower_bound(NBL_REF_ARG(Accessor) accessor, const uint begin, const uint end, const typename Accessor::value_type value, const Comparator comp)
+uint32_t lower_bound(NBL_REF_ARG(Accessor) accessor, const uint32_t begin, const uint32_t end, const typename Accessor::value_type value, const Comparator comp)
 {
     impl::bound_t<Accessor,Comparator> implementation = impl::bound_t<Accessor,Comparator>::setup(begin,end,value,comp);
     return implementation(accessor);
 }
 
 template<class Accessor, class Comparator>
-uint upper_bound(NBL_REF_ARG(Accessor) accessor, const uint begin, const uint end, const typename Accessor::value_type value, const Comparator comp)
+uint32_t upper_bound(NBL_REF_ARG(Accessor) accessor, const uint32_t begin, const uint32_t end, const typename Accessor::value_type value, const Comparator comp)
 {
     //using TransformedComparator = impl::lower_to_upper_comparator_transform_t<Accessor,Comparator>;
     //TransformedComparator transformedComparator;
@@ -191,7 +186,7 @@ namespace impl
 
 // extra indirection due to https://github.com/microsoft/DirectXShaderCompiler/issues/4771
 template<class Accessor, typename T>
-uint lower_bound(NBL_REF_ARG(Accessor) accessor, const uint begin, const uint end, const T value)
+uint32_t lower_bound(NBL_REF_ARG(Accessor) accessor, const uint32_t begin, const uint32_t end, const T value)
 {
     //using Comparator = nbl::hlsl::less<T>;
     //Comparator comp;
@@ -200,7 +195,7 @@ uint lower_bound(NBL_REF_ARG(Accessor) accessor, const uint begin, const uint en
     return nbl::hlsl::lower_bound<Accessor, nbl::hlsl::less<T> >(accessor,begin,end,value,comp);
 }
 template<class Accessor, typename T>
-uint upper_bound(NBL_REF_ARG(Accessor) accessor, const uint begin, const uint end, const T value)
+uint32_t upper_bound(NBL_REF_ARG(Accessor) accessor, const uint32_t begin, const uint32_t end, const T value)
 {
     //using Comparator = nbl::hlsl::less<T>;
     //Comparator comp;
@@ -212,12 +207,12 @@ uint upper_bound(NBL_REF_ARG(Accessor) accessor, const uint begin, const uint en
 }
 
 template<class Accessor>
-uint lower_bound(NBL_REF_ARG(Accessor) accessor, const uint begin, const uint end, const typename Accessor::value_type value)
+uint32_t lower_bound(NBL_REF_ARG(Accessor) accessor, const uint32_t begin, const uint32_t end, const typename Accessor::value_type value)
 {
     return impl::lower_bound<Accessor,typename Accessor::value_type>(accessor,begin,end,value);
 }
 template<class Accessor>
-uint upper_bound(NBL_REF_ARG(Accessor) accessor, const uint begin, const uint end, const typename Accessor::value_type value)
+uint32_t upper_bound(NBL_REF_ARG(Accessor) accessor, const uint32_t begin, const uint32_t end, const typename Accessor::value_type value)
 {
     return impl::upper_bound<Accessor,typename Accessor::value_type>(accessor,begin,end,value);
 }