aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
-rw-r--r--tests/VkClearTests.cpp2
-rw-r--r--tests/VkHeapTests.cpp2
-rw-r--r--tests/VkUploadPixelsTests.cpp2
-rw-r--r--tests/VkWrapTests.cpp2
4 files changed, 4 insertions, 4 deletions
diff --git a/tests/VkClearTests.cpp b/tests/VkClearTests.cpp
index cced84439d..c797ef2c33 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"
diff --git a/tests/VkHeapTests.cpp b/tests/VkHeapTests.cpp
index 4561c90803..fd5f88a1bb 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"
diff --git a/tests/VkUploadPixelsTests.cpp b/tests/VkUploadPixelsTests.cpp
index 7f5001c17e..3fa9419f89 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"
diff --git a/tests/VkWrapTests.cpp b/tests/VkWrapTests.cpp
index bbc3f8d847..ca0feb5f14 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"