From 61b25fdffc360ab70e1f33be0bb43c911150277b Mon Sep 17 00:00:00 2001
From: Chia-I Wu <olv@google.com>
Date: Fri, 27 May 2016 10:18:25 +0800
Subject: [PATCH] vulkan: fix crash when only non-global layers are enabled

We fail to set up get_instance_proc_addr_ and get_device_proc_addr_ when
there are layers but only non-global ones.

Bug: 28990561
Change-Id: I82704f946deb5a76640f9dfb792e6fd118c78aa7
---
 vulkan/libvulkan/api.cpp | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/vulkan/libvulkan/api.cpp b/vulkan/libvulkan/api.cpp
index 805366820f..b699fe97fc 100644
--- a/vulkan/libvulkan/api.cpp
+++ b/vulkan/libvulkan/api.cpp
@@ -602,6 +602,13 @@ VkResult LayerChain::ActivateLayers(VkPhysicalDevice physical_dev,
         new (&layers_[layer_count_++]) ActiveLayer{GetLayerRef(l), {}};
     }
 
+    // this may happen when all layers are non-global ones
+    if (!layer_count_) {
+        get_instance_proc_addr_ = driver::GetInstanceProcAddr;
+        get_device_proc_addr_ = driver::GetDeviceProcAddr;
+        return VK_SUCCESS;
+    }
+
     SetupLayerLinks();
 
     return VK_SUCCESS;
-- 
2.11.0