From cbe07ef239121dc99a31a19b9593d76d76abb08b Mon Sep 17 00:00:00 2001 From: Chia-I Wu Date: Wed, 13 Apr 2016 15:01:00 +0800 Subject: vulkan: pass hal_extensions to InitDriverTable We only need hal_extensions to initialize the driver tables. There is no need to save it in driver::{Instance,Device}Data. Change-Id: I56ebc0ee9c5bc5e543e7a84412b03b842bd8ced5 --- vulkan/libvulkan/driver.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'vulkan/libvulkan/driver.cpp') diff --git a/vulkan/libvulkan/driver.cpp b/vulkan/libvulkan/driver.cpp index c5ea20b9b1..1f1b14448b 100644 --- a/vulkan/libvulkan/driver.cpp +++ b/vulkan/libvulkan/driver.cpp @@ -616,7 +616,6 @@ VkResult CreateInstance(const VkInstanceCreateInfo* pCreateInfo, return VK_ERROR_OUT_OF_HOST_MEMORY; data->hook_extensions |= wrapper.GetHookExtensions(); - data->hal_extensions |= wrapper.GetHalExtensions(); // call into the driver VkInstance instance; @@ -630,7 +629,8 @@ VkResult CreateInstance(const VkInstanceCreateInfo* pCreateInfo, // initialize InstanceDriverTable if (!SetData(instance, *data) || - !InitDriverTable(instance, g_hwdevice->GetInstanceProcAddr)) { + !InitDriverTable(instance, g_hwdevice->GetInstanceProcAddr, + wrapper.GetHalExtensions())) { data->driver.DestroyInstance = reinterpret_cast( g_hwdevice->GetInstanceProcAddr(instance, "vkDestroyInstance")); if (data->driver.DestroyInstance) @@ -687,7 +687,6 @@ VkResult CreateDevice(VkPhysicalDevice physicalDevice, return VK_ERROR_OUT_OF_HOST_MEMORY; data->hook_extensions |= wrapper.GetHookExtensions(); - data->hal_extensions |= wrapper.GetHalExtensions(); // call into the driver VkDevice dev; @@ -701,7 +700,8 @@ VkResult CreateDevice(VkPhysicalDevice physicalDevice, // initialize DeviceDriverTable if (!SetData(dev, *data) || - !InitDriverTable(dev, instance_data.get_device_proc_addr)) { + !InitDriverTable(dev, instance_data.get_device_proc_addr, + wrapper.GetHalExtensions())) { data->driver.DestroyDevice = reinterpret_cast( instance_data.get_device_proc_addr(dev, "vkDestroyDevice")); if (data->driver.DestroyDevice) -- cgit v1.2.3-59-g8ed1b