Fix SEGV when using invalid image views.

google · Mar 8, 2019 · b33134f · b33134f
1 parent 60f12ee
commit b33134f
Showing 1 changed file with 14 additions and 12 deletions.
diff --git a/gapis/api/vulkan/api/image.api b/gapis/api/vulkan/api/image.api
@@ -783,18 +783,20 @@ sub void transitionImageViewLayout(
     ref!ImageViewObject view,
     VkImageLayout oldLayout,
     VkImageLayout newLayout) {
-  if is2DView3DImage(view) {
-    rng := VkImageSubresourceRange(
-      aspectMask: view.SubresourceRange.aspectMask,
-      baseMipLevel: view.SubresourceRange.baseMipLevel,
-      levelCount: view.SubresourceRange.levelCount,
-      baseArrayLayer: 0,
-      layerCount: 1)
-    transitionImageLayout(
-      view.Image, rng, oldLayout, newLayout)
-  } else {
-    transitionImageLayout(
-      view.Image, view.SubresourceRange, oldLayout, newLayout)
+  if view != null {
+    if is2DView3DImage(view) {
+      rng := VkImageSubresourceRange(
+        aspectMask: view.SubresourceRange.aspectMask,
+        baseMipLevel: view.SubresourceRange.baseMipLevel,
+        levelCount: view.SubresourceRange.levelCount,
+        baseArrayLayer: 0,
+        layerCount: 1)
+      transitionImageLayout(
+        view.Image, rng, oldLayout, newLayout)
+    } else {
+      transitionImageLayout(
+        view.Image, view.SubresourceRange, oldLayout, newLayout)
+    }
   }
 }