File 0006-Fix-building-with-vsg-1.1.10.patch of Package mingw32-vsgvr

From e539d126213781a8bba7e703c9f40e328d730d35 Mon Sep 17 00:00:00 2001
From: Ralf Habacker <ralf.habacker@freenet.de>
Date: Tue, 4 Feb 2025 22:43:49 +0100
Subject: [PATCH 6/7] Fix building with vsg 1.1.10

---
 vsgvr/include/vsgvr/actions/ActionSet.h  |  1 +
 vsgvr/include/vsgvr/xr/ViewMatrix.h      |  2 +-
 vsgvr/src/vsgvr/app/CompositionLayer.cpp | 14 +++++++-------
 3 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/vsgvr/include/vsgvr/actions/ActionSet.h b/vsgvr/include/vsgvr/actions/ActionSet.h
index d39274c..692f205 100644
--- a/vsgvr/include/vsgvr/actions/ActionSet.h
+++ b/vsgvr/include/vsgvr/actions/ActionSet.h
@@ -25,6 +25,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #include <vsgvr/actions/Action.h>
 #include <vsg/core/Inherit.h>
 
+#include <list>
 #include <set>
 
 namespace vsgvr {
diff --git a/vsgvr/include/vsgvr/xr/ViewMatrix.h b/vsgvr/include/vsgvr/xr/ViewMatrix.h
index f437246..3f068da 100644
--- a/vsgvr/include/vsgvr/xr/ViewMatrix.h
+++ b/vsgvr/include/vsgvr/xr/ViewMatrix.h
@@ -77,7 +77,7 @@ namespace vsgvr {
       matrix = matrix * viewAxesMat * worldRotateMat;
     }
 
-    vsg::dmat4 transform() const override { return matrix; }
+    vsg::dmat4 transform(const vsg::dvec3& offset = {}) const override { return matrix; }
     vsg::dmat4 matrix;
   };
 }
diff --git a/vsgvr/src/vsgvr/app/CompositionLayer.cpp b/vsgvr/src/vsgvr/app/CompositionLayer.cpp
index 03f2304..8312afd 100644
--- a/vsgvr/src/vsgvr/app/CompositionLayer.cpp
+++ b/vsgvr/src/vsgvr/app/CompositionLayer.cpp
@@ -402,8 +402,8 @@ namespace vsgvr {
       recordAndSubmitTask->queue = device->getQueue(deviceQueueFamily.queueFamily);
       _recordAndSubmitTasks.emplace_back(recordAndSubmitTask);
 
-      recordAndSubmitTask->earlyTransferTask->transferQueue = device->getQueue(transferQueueFamily);
-      recordAndSubmitTask->lateTransferTask->transferQueue = device->getQueue(transferQueueFamily);
+      recordAndSubmitTask->transferTask->transferQueue = device->getQueue(transferQueueFamily);
+      recordAndSubmitTask->transferTask->transferQueue = device->getQueue(transferQueueFamily);
     }
   }
 
@@ -515,7 +515,7 @@ namespace vsgvr {
 
         for (auto& commandGraph : task->commandGraphs)
         {
-          commandGraph->maxSlot = resourceRequirements.maxSlot;
+          commandGraph->maxSlots = resourceRequirements.maxSlots;
           commandGraph->accept(*deviceResource.compile);
 
           if (resourceRequirements.containsPagedLOD) task_containsPagedLOD = true;
@@ -532,13 +532,13 @@ namespace vsgvr {
           // task->databasePager->compileManager = compileManager;
         }
 
-        if (task->earlyTransferTask)
+        if (task->transferTask)
         {
-          task->earlyTransferTask->assign(resourceRequirements.earlyDynamicData);
+          task->transferTask->assign(resourceRequirements.dynamicData);
         }
-        if (task->lateTransferTask)
+        if (task->transferTask)
         {
-          task->lateTransferTask->assign(resourceRequirements.lateDynamicData);
+          task->transferTask->assign(resourceRequirements.dynamicData);
         }
       }
 
-- 
2.50.0