From 915893167e69f79677b17f3f388072e65d80d083 Mon Sep 17 00:00:00 2001 From: Jim Van Verth Date: Thu, 22 Jun 2017 12:52:46 -0400 Subject: Remove static initializer restriction for Vulkan tests Change-Id: I277110976844fc80271f4e86bb8474047e8abd2a Reviewed-on: https://skia-review.googlesource.com/20510 Reviewed-by: Greg Daniel Commit-Queue: Jim Van Verth --- tests/VkClearTests.cpp | 2 +- tests/VkHeapTests.cpp | 2 +- tests/VkUploadPixelsTests.cpp | 2 +- tests/VkWrapTests.cpp | 2 +- 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" -- cgit v1.2.3