diff options
| author |  Mike Reed <reed@google.com> | 2017-06-14 06:03:10 -0400 |
|---|---|---|
| committer |  Skia Commit-Bot <skia-commit-bot@chromium.org> | 2017-06-14 10:23:07 +0000 |
| commit | d20b5c489b5709a4d251c0cc68d584ea4514594e (patch) | |
| tree | c21e7fdc25a42129126b963804617bdba88933cb | |
| parent | fcd5fddb0264d062a461435618ad54a29ff80fc0 (diff) | |
use #ifdef instead of #if for SK_VULKAN
Try to fix android roll
Bug: skia:
Change-Id: Iae32027b299d8a975d3caf70f0f8910541ca972d
Reviewed-on: https://skia-review.googlesource.com/19800
Reviewed-by: Mike Reed <reed@google.com>
Commit-Queue: Mike Reed <reed@google.com>
| -rw-r--r-- | src/gpu/GrBackendTextureImageGenerator.cpp | 2 | ||||
| -rw-r--r-- | src/image/SkImage_Gpu.cpp | 2 | ||||
| -rw-r--r-- | tools/gpu/GrTest.cpp | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/src/gpu/GrBackendTextureImageGenerator.cpp b/src/gpu/GrBackendTextureImageGenerator.cpp index c7e77d65a5..0b6d64e862 100644 --- a/src/gpu/GrBackendTextureImageGenerator.cpp +++ b/src/gpu/GrBackendTextureImageGenerator.cpp @@ -33,7 +33,7 @@ static GrBackendTexture make_backend_texture_from_handle(GrBackend backend, int width, int height, GrPixelConfig config, GrBackendObject handle) { -#if SK_VULKAN +#ifdef SK_VULKAN if (kVulkan_GrBackend == backend) { GrVkImageInfo* vkInfo = (GrVkImageInfo*)(handle); return GrBackendTexture(width, height, *vkInfo); diff --git a/src/image/SkImage_Gpu.cpp b/src/image/SkImage_Gpu.cpp index 57b8b7f592..f9441e0f5b 100644 --- a/src/image/SkImage_Gpu.cpp +++ b/src/image/SkImage_Gpu.cpp @@ -325,7 +325,7 @@ static GrBackendTexture make_backend_texture_from_handle(GrBackend backend, int width, int height, GrPixelConfig config, GrBackendObject handle) { -#if SK_VULKAN +#ifdef SK_VULKAN if (kVulkan_GrBackend == backend) { GrVkImageInfo* vkInfo = (GrVkImageInfo*)(handle); return GrBackendTexture(width, height, *vkInfo); diff --git a/tools/gpu/GrTest.cpp b/tools/gpu/GrTest.cpp index f486993bbc..0486787790 100644 --- a/tools/gpu/GrTest.cpp +++ b/tools/gpu/GrTest.cpp @@ -61,7 +61,7 @@ void SetupAlwaysEvictAtlas(GrContext* context) { GrBackendTexture CreateBackendTexture(GrBackend backend, int width, int height, GrPixelConfig config, GrBackendObject handle) { -#if SK_VULKAN +#ifdef SK_VULKAN if (kVulkan_GrBackend == backend) { GrVkImageInfo* vkInfo = (GrVkImageInfo*)(handle); return GrBackendTexture(width, height, *vkInfo); |