commit 1458dbf51865bd6d92def7d505a3b79f5b2f56db
author Li Hao <hao.x.li@intel.com> Mon May 20 02:35:04 2019 +0000
committer Commit Bot service account <commit-bot@chromium.org> Mon May 20 02:35:04 2019 +0000
tree bcf253556f9f5965d6e608e7475825f7aa823120
parent f3f5bf480d3b4160617a02c74ad76f17b3084759

Enable Vulkan validation layers

BUG=dawn:150

Change-Id: Ie1b252f7fecb323badb40a226e185390d0c241e4
Reviewed-on: https://dawn-review.googlesource.com/c/dawn/+/7281
Reviewed-by: Kai Ninomiya <kainino@chromium.org>
Reviewed-by: Corentin Wallez <cwallez@chromium.org>
Commit-Queue: Hao Li <hao.x.li@intel.com>

src/dawn_native/vulkan/BackendVk.cpp

diff --git a/src/dawn_native/vulkan/BackendVk.cpp b/src/dawn_native/vulkan/BackendVk.cpp
index ecd263f..6ca0a26 100644
--- a/src/dawn_native/vulkan/BackendVk.cpp
+++ b/src/dawn_native/vulkan/BackendVk.cpp
@@ -120,16 +120,18 @@
             usedKnobs.renderDocCapture = true;
         }
 #endif
-#if defined(DAWN_ENABLE_ASSERTS)
-        if (mGlobalInfo.standardValidation) {
-            layersToRequest.push_back(kLayerNameLunargStandardValidation);
-            usedKnobs.standardValidation = true;
+
+        if (GetInstance()->IsBackendValidationEnabled()) {
+            if (mGlobalInfo.standardValidation) {
+                layersToRequest.push_back(kLayerNameLunargStandardValidation);
+                usedKnobs.standardValidation = true;
+            }
+            if (mGlobalInfo.debugReport) {
+                extensionsToRequest.push_back(kExtensionNameExtDebugReport);
+                usedKnobs.debugReport = true;
+            }
         }
-        if (mGlobalInfo.debugReport) {
-            extensionsToRequest.push_back(kExtensionNameExtDebugReport);
-            usedKnobs.debugReport = true;
-        }
-#endif
+
         // Always request all extensions used to create VkSurfaceKHR objects so that they are
         // always available for embedders looking to create VkSurfaceKHR on our VkInstance.
         if (mGlobalInfo.macosSurface) {