Merge branch 'master' into improve-workgroup-scan-2

Author: keptsecret

.github/workflows/build-nabla.yml

@@ -251,3 +251,19 @@ jobs:
           publish_dir: .badge-public
           keep_files: true
           commit_message: "[CI] badges update"
+
+  deploy-production:
+    name: Deploy to production host
+    if: ${{ always() && github.ref == 'refs/heads/master' }}
+    needs: build-windows
+    runs-on: ubuntu-latest
+
+    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

compose.yml

@@ -13,4 +13,10 @@ services:
       - type: bind
         source: C:\Windows\System32
         target: C:\mount\Windows\System32
-        read_only: true
+        read_only: true
+    restart: always
+
+networks:
+  default:
+    external: true
+    name: docker_default

src/nbl/video/utilities/CAssetConverter.cpp

@@ -5344,8 +5344,7 @@ ISemaphore::future_t<IQueue::RESULT> CAssetConverter::convert_impl(SReserveResul
 				retval.set({params.transfer->scratchSemaphore.semaphore,params.transfer->scratchSemaphore.value});
 		}
 		// reset original callback
-		if (bool(origXferStallCallback))
-			params.transfer->overflowCallback = std::move(origXferStallCallback);
+		params.transfer->overflowCallback = std::move(origXferStallCallback);
 
 		// Its too dangerous to leave an Intended Transfer Submit hanging around that needs to be submitted for Compute to make forward progress outside of this utility,
 		// and doing transfer-signals-after-compute-wait timeline sema tricks are not and option because: