commit 915893167e69f79677b17f3f388072e65d80d083
author Jim Van Verth <jvanverth@google.com> Thu Jun 22 12:52:46 2017 -0400
committer Skia Commit-Bot <skia-commit-bot@chromium.org> Thu Jun 22 18:12:30 2017 +0000
tree dc66cb72b1cf33d8195a745798424a6143ebbfe2
parent ca626b7c6f05b7d8d3df129e88bfac846e074857

Remove static initializer restriction for Vulkan tests

Change-Id: I277110976844fc80271f4e86bb8474047e8abd2a
Reviewed-on: https://skia-review.googlesource.com/20510
Reviewed-by: Greg Daniel <egdaniel@google.com>
Commit-Queue: Jim Van Verth <jvanverth@google.com>

tests/VkClearTests.cpp

diff --git a/tests/VkClearTests.cpp b/tests/VkClearTests.cpp
index cced844..c797ef2 100644
--- a/tests/VkClearTests.cpp
+++ b/tests/VkClearTests.cpp
@@ -9,7 +9,7 @@
 
 #include "SkTypes.h"
 
-#if SK_SUPPORT_GPU && SK_ALLOW_STATIC_GLOBAL_INITIALIZERS && defined(SK_VULKAN)
+#if SK_SUPPORT_GPU && defined(SK_VULKAN)
 
 #include "GrContextFactory.h"
 #include "GrTest.h"

tests/VkHeapTests.cpp

diff --git a/tests/VkHeapTests.cpp b/tests/VkHeapTests.cpp
index 4561c90..fd5f88a 100644
--- a/tests/VkHeapTests.cpp
+++ b/tests/VkHeapTests.cpp
@@ -9,7 +9,7 @@
 
 #include "SkTypes.h"
 
-#if SK_SUPPORT_GPU && SK_ALLOW_STATIC_GLOBAL_INITIALIZERS && defined(SK_VULKAN)
+#if SK_SUPPORT_GPU && defined(SK_VULKAN)
 
 #include "GrContextFactory.h"
 #include "GrTest.h"

tests/VkUploadPixelsTests.cpp

diff --git a/tests/VkUploadPixelsTests.cpp b/tests/VkUploadPixelsTests.cpp
index 7f5001c..3fa9419 100644
--- a/tests/VkUploadPixelsTests.cpp
+++ b/tests/VkUploadPixelsTests.cpp
@@ -9,7 +9,7 @@
 
 #include "SkTypes.h"
 
-#if SK_SUPPORT_GPU && SK_ALLOW_STATIC_GLOBAL_INITIALIZERS && defined(SK_VULKAN)
+#if SK_SUPPORT_GPU && defined(SK_VULKAN)
 
 #include "GrContextFactory.h"
 #include "GrContextPriv.h"

tests/VkWrapTests.cpp

diff --git a/tests/VkWrapTests.cpp b/tests/VkWrapTests.cpp
index bbc3f8d..ca0feb5 100644
--- a/tests/VkWrapTests.cpp
+++ b/tests/VkWrapTests.cpp
@@ -9,7 +9,7 @@
 
 #include "SkTypes.h"
 
-#if SK_SUPPORT_GPU && SK_ALLOW_STATIC_GLOBAL_INITIALIZERS && defined(SK_VULKAN)
+#if SK_SUPPORT_GPU && defined(SK_VULKAN)
 
 #include "GrContextFactory.h"
 #include "GrTest.h"