mantle: added quirk for internal synchronization of descriptor set access

Star Swarm doesn't care about synchronizing access to descriptor sets, so sometimes it crashes with normal descriptor sets and crashes almost immediately with descriptor buffers.

Author: Cherser-s

src/mantle/mantle_descriptor_set.c

@@ -195,6 +195,7 @@ GR_RESULT GR_STDCALL grCreateDescriptorSet(
         .grObj = { GR_OBJ_TYPE_DESCRIPTOR_SET, grDevice },
         .slotCount = pCreateInfo->slots,
         .slots = calloc(pCreateInfo->slots, sizeof(DescriptorSetSlot)),
+        .descriptorLock = SRWLOCK_INIT,
         .descriptorPool = descriptorPool,
         .descriptorSet = descriptorSet,
         .descriptorBufferPtr = descriptorBufferPtr,
@@ -246,6 +247,10 @@ GR_VOID GR_STDCALL grAttachSamplerDescriptors(
     GrDescriptorSet* grDescriptorSet = (GrDescriptorSet*)descriptorSet;
     const GrDevice* grDevice = GET_OBJ_DEVICE(grDescriptorSet);
 
+    if (quirkHas(QUIRK_DESCRIPTOR_SET_INTERNAL_SYNCHRONIZED)) {
+        AcquireSRWLockExclusive(&grDescriptorSet->descriptorLock);
+    }
+
     if (grDevice->descriptorBufferSupported && grDevice->descriptorBufferAllowPreparedSampler) {
         for (unsigned i = 0; i < slotCount; i++) {
             const GrSampler* grSampler = (GrSampler*)pSamplers[i];
@@ -311,6 +316,9 @@ GR_VOID GR_STDCALL grAttachSamplerDescriptors(
         STACK_ARRAY_FINISH(writeDescriptors);
     }
 
+    if (quirkHas(QUIRK_DESCRIPTOR_SET_INTERNAL_SYNCHRONIZED)) {
+        ReleaseSRWLockExclusive(&grDescriptorSet->descriptorLock);
+    }
 }
 
 GR_VOID GR_STDCALL grAttachImageViewDescriptors(
@@ -323,6 +331,10 @@ GR_VOID GR_STDCALL grAttachImageViewDescriptors(
     GrDescriptorSet* grDescriptorSet = (GrDescriptorSet*)descriptorSet;
     const GrDevice* grDevice = GET_OBJ_DEVICE(grDescriptorSet);
 
+    if (quirkHas(QUIRK_DESCRIPTOR_SET_INTERNAL_SYNCHRONIZED)) {
+        AcquireSRWLockExclusive(&grDescriptorSet->descriptorLock);
+    }
+
     if (grDevice->descriptorBufferSupported && grDevice->descriptorBufferAllowPreparedImageView) {
         for (unsigned i = 0; i < slotCount; i++) {
             const GR_IMAGE_VIEW_ATTACH_INFO* info = &pImageViews[i];
@@ -428,6 +440,10 @@ GR_VOID GR_STDCALL grAttachImageViewDescriptors(
         VKD.vkUpdateDescriptorSets(grDevice->device, descriptorWriteCount, writeDescriptors, 0, NULL);
         STACK_ARRAY_FINISH(writeDescriptors);
     }
+
+    if (quirkHas(QUIRK_DESCRIPTOR_SET_INTERNAL_SYNCHRONIZED)) {
+        ReleaseSRWLockExclusive(&grDescriptorSet->descriptorLock);
+    }
 }
 
 GR_VOID GR_STDCALL grAttachMemoryViewDescriptors(
@@ -441,6 +457,10 @@ GR_VOID GR_STDCALL grAttachMemoryViewDescriptors(
     const GrDevice* grDevice = GET_OBJ_DEVICE(grDescriptorSet);
     VkResult vkRes;
 
+    if (quirkHas(QUIRK_DESCRIPTOR_SET_INTERNAL_SYNCHRONIZED)) {
+        AcquireSRWLockExclusive(&grDescriptorSet->descriptorLock);
+    }
+
     if (grDevice->descriptorBufferSupported) {
         for (unsigned i = 0; i < slotCount; i++) {
             DescriptorSetSlot* slot = &grDescriptorSet->slots[startSlot + i];
@@ -596,6 +616,10 @@ GR_VOID GR_STDCALL grAttachMemoryViewDescriptors(
         VKD.vkUpdateDescriptorSets(grDevice->device, descriptorWriteCount, writeDescriptors, 0, NULL);
         STACK_ARRAY_FINISH(writeDescriptors);
     }
+
+    if (quirkHas(QUIRK_DESCRIPTOR_SET_INTERNAL_SYNCHRONIZED)) {
+        ReleaseSRWLockExclusive(&grDescriptorSet->descriptorLock);
+    }
 }
 
 GR_VOID GR_STDCALL grAttachNestedDescriptors(
@@ -608,6 +632,10 @@ GR_VOID GR_STDCALL grAttachNestedDescriptors(
     GrDescriptorSet* grDescriptorSet = (GrDescriptorSet*)descriptorSet;
     const GrDevice* grDevice = GET_OBJ_DEVICE(grDescriptorSet);
 
+    if (quirkHas(QUIRK_DESCRIPTOR_SET_INTERNAL_SYNCHRONIZED)) {
+        AcquireSRWLockExclusive(&grDescriptorSet->descriptorLock);
+    }
+
     for (unsigned i = 0; i < slotCount; i++) {
         DescriptorSetSlot* slot = &grDescriptorSet->slots[startSlot + i];
         const GR_DESCRIPTOR_SET_ATTACH_INFO* info = &pNestedDescriptorSets[i];
@@ -622,6 +650,9 @@ GR_VOID GR_STDCALL grAttachNestedDescriptors(
             },
         };
     }
+    if (quirkHas(QUIRK_DESCRIPTOR_SET_INTERNAL_SYNCHRONIZED)) {
+        ReleaseSRWLockExclusive(&grDescriptorSet->descriptorLock);
+    }
 }
 
 GR_VOID GR_STDCALL grClearDescriptorSetSlots(
@@ -633,6 +664,10 @@ GR_VOID GR_STDCALL grClearDescriptorSetSlots(
     GrDescriptorSet* grDescriptorSet = (GrDescriptorSet*)descriptorSet;
     const GrDevice* grDevice = GET_OBJ_DEVICE(grDescriptorSet);
 
+    if (quirkHas(QUIRK_DESCRIPTOR_SET_INTERNAL_SYNCHRONIZED)) {
+        AcquireSRWLockExclusive(&grDescriptorSet->descriptorLock);
+    }
+
     if (grDevice->descriptorBufferSupported) {
         memset(grDescriptorSet->descriptorBufferPtr + (startSlot * DESCRIPTORS_PER_SLOT * grDevice->maxMutableDescriptorSize), 0, grDevice->maxMutableDescriptorSize * slotCount * DESCRIPTORS_PER_SLOT);
         memset(&grDescriptorSet->slots[startSlot], 0, sizeof(DescriptorSetSlot) * slotCount);
@@ -645,4 +680,8 @@ GR_VOID GR_STDCALL grClearDescriptorSetSlots(
             slot->type = SLOT_TYPE_NONE;
         }
     }
+
+    if (quirkHas(QUIRK_DESCRIPTOR_SET_INTERNAL_SYNCHRONIZED)) {
+        ReleaseSRWLockExclusive(&grDescriptorSet->descriptorLock);
+    }
 }

src/mantle/mantle_object.h

@@ -233,6 +233,7 @@ typedef struct _GrDescriptorSet {
     GrObject grObj;
     unsigned slotCount;
     DescriptorSetSlot* slots;
+    SRWLOCK descriptorLock;
     VkDescriptorPool descriptorPool;
     VkDescriptorSet descriptorSet;
     void* descriptorBufferPtr;

src/mantle/quirk.c

@@ -17,7 +17,8 @@ void quirkInit(
                   QUIRK_INVALID_CMD_BUFFER_RESET |
                   QUIRK_CUBEMAP_LAYER_DIV_6 |
                   QUIRK_SILENCE_TRANSFER_ONLY_LINEAR_IMAGE_WARNINGS |
-                  QUIRK_DESCRIPTOR_SET_USE_DEDICATED_ALLOCATION;
+                  QUIRK_DESCRIPTOR_SET_USE_DEDICATED_ALLOCATION |
+                  QUIRK_DESCRIPTOR_SET_INTERNAL_SYNCHRONIZED;
     } else if (!strcmp(appInfo->pEngineName, "CivTech")) {
         mQuirks = QUIRK_NON_ZERO_MEM_REQ |
                   QUIRK_READ_ONLY_IMAGE_STATE_MISMATCH |

src/mantle/quirk.h

@@ -31,6 +31,9 @@ typedef enum {
 
     // Star Swarm uses completely incompatible memory types for descriptor buffers
     QUIRK_DESCRIPTOR_SET_USE_DEDICATED_ALLOCATION = 1 << 8,
+
+    // Star Swarm also doesn't care about external sync
+    QUIRK_DESCRIPTOR_SET_INTERNAL_SYNCHRONIZED = 1 << 9,
 } QUIRK_FLAGS;
 
 void quirkInit(