commit 0ea962107a8de6ffe4001c600fe59ab3ab8e73db
author Jamie Madill <jmadill@chromium.org> Tue Oct 30 15:14:51 2018 -0400
committer Commit Bot <commit-bot@chromium.org> Tue Oct 30 20:16:50 2018 +0000
tree dd2b6330b6e93af236f9c5842e794cdf126878aa
parent 763cec0707ceb5a8df9f5deb37ad77c86d82cdbf

Vulkan: Enable more perf tests.

Also fixes the check for the correct UINT index extension that wasn't
available on Vulkan. Also includes a workaround for the mock ICD not
implementing buffer state for index ranges.

Bug: angleproject:2923
Change-Id: Iab35809d15f890525a9e658d4148272c46cf1320
Reviewed-on: https://chromium-review.googlesource.com/c/1308733
Reviewed-by: Jamie Madill <jmadill@chromium.org>
Commit-Queue: Jamie Madill <jmadill@chromium.org>

src/libANGLE/renderer/vulkan/RendererVk.cpp

diff --git a/src/libANGLE/renderer/vulkan/RendererVk.cpp b/src/libANGLE/renderer/vulkan/RendererVk.cpp
index e1c8809..09e8248 100644
--- a/src/libANGLE/renderer/vulkan/RendererVk.cpp
+++ b/src/libANGLE/renderer/vulkan/RendererVk.cpp
@@ -297,6 +297,7 @@
     : mCapsInitialized(false),
       mInstance(VK_NULL_HANDLE),
       mEnableValidationLayers(false),
+      mEnableMockICD(false),
       mDebugReportCallback(VK_NULL_HANDLE),
       mPhysicalDevice(VK_NULL_HANDLE),
       mQueue(VK_NULL_HANDLE),
@@ -384,7 +385,7 @@
     ScopedVkLoaderEnvironment scopedEnvironment(ShouldUseDebugLayers(attribs),
                                                 ShouldEnableMockICD(attribs));
     mEnableValidationLayers = scopedEnvironment.canEnableValidationLayers();
-    bool enableMockICD      = scopedEnvironment.canEnableMockICD();
+    mEnableMockICD          = scopedEnvironment.canEnableMockICD();
 
     // Gather global layer properties.
     uint32_t instanceLayerCount = 0;
@@ -481,7 +482,7 @@
     std::vector<VkPhysicalDevice> physicalDevices(physicalDeviceCount);
     ANGLE_VK_TRY(displayVk, vkEnumeratePhysicalDevices(mInstance, &physicalDeviceCount,
                                                        physicalDevices.data()));
-    ChoosePhysicalDevice(physicalDevices, enableMockICD, &mPhysicalDevice,
+    ChoosePhysicalDevice(physicalDevices, mEnableMockICD, &mPhysicalDevice,
                          &mPhysicalDeviceProperties);
 
     vkGetPhysicalDeviceFeatures(mPhysicalDevice, &mPhysicalDeviceFeatures);