Vulkan: Guard access to pipeline DynamicState and push constants

Author: bjoeris

gapis/api/vulkan/api/descriptor.api

@@ -868,7 +868,9 @@ vkCmdPushConstantsArgs {
 sub void dovkCmdPushConstants(ref!vkCmdPushConstantsArgs args) {
   _ = PipelineLayouts[args.Layout]
   pushConstants := lastPushConstants()
-  write(pushConstants.Data[args.Offset:args.Offset+args.Size])
+  if pushConstants != null {
+    write(pushConstants.Data[args.Offset:args.Offset+args.Size])
+  }
 }
 
 @indirect("VkCommandBuffer", "VkDevice")
@@ -899,8 +901,10 @@ cmd void vkCmdPushConstants(
 sub void readPushConstants(VkPipelineBindPoint bindPoint) {
   layout := boundPipelineLayout(bindPoint)
   pushConstants := lastPushConstants()
-  for _, _, r in layout.PushConstantRanges {
-    read(pushConstants.Data[r.offset:r.offset+r.size])
+  if pushConstants != null {
+    for _, _, r in layout.PushConstantRanges {
+      read(pushConstants.Data[r.offset:r.offset+r.size])
+    }
   }
 }
 

gapis/api/vulkan/api/draw_commands.api

@@ -436,9 +436,11 @@ sub void readWriteMemoryInBoundComputeDescriptorSets() {
 
 sub  ref!DynamicStateSet unpackDynamicState(ref!DynamicData data) {
   obj := new!DynamicStateSet()
-  for _, _, s in data.DynamicStates {
-    if as!s32(s) < 9 {
-      obj.contains[as!s32(s)] = true
+  if data != null {
+    for _, _, s in data.DynamicStates {
+      if as!s32(s) < 9 {
+        obj.contains[as!s32(s)] = true
+      }
     }
   }
   return obj