From de81143630f379af560467c3ae1335e73a0b9f03 Mon Sep 17 00:00:00 2001 From: Greg Daniel Date: Wed, 30 May 2018 22:58:20 +0000 Subject: [PATCH] Revert "Move include into head to fix build breakage." This reverts commit fac695317f13bfd52bf640308834d3fc28fffc29. Reason for revert: needed to revert early change Original change's description: > Move include into head to fix build breakage. > > Bug: skia: > Change-Id: I47e182bf18f56c9c0749a1fd79b85d26fce9887e > Reviewed-on: https://skia-review.googlesource.com/131022 > Commit-Queue: Greg Daniel > Commit-Queue: Brian Osman > Auto-Submit: Greg Daniel > Reviewed-by: Brian Osman TBR=egdaniel@google.com,rmistry@google.com,brianosman@google.com Change-Id: Ie396d213c2e43e053a6c6df9cfb18ac4be8b909c No-Presubmit: true No-Tree-Checks: true No-Try: true Bug: skia: Reviewed-on: https://skia-review.googlesource.com/131080 Reviewed-by: Greg Daniel Commit-Queue: Greg Daniel --- include/gpu/vk/GrVkBackendContext.h | 3 ++- src/gpu/vk/GrVkBackendContext.cpp | 1 + 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/include/gpu/vk/GrVkBackendContext.h b/include/gpu/vk/GrVkBackendContext.h index 4b93de8554..212362873a 100644 --- a/include/gpu/vk/GrVkBackendContext.h +++ b/include/gpu/vk/GrVkBackendContext.h @@ -12,7 +12,8 @@ #include "vk/GrVkDefines.h" #include "vk/GrVkInterface.h" -#include "vk/GrVkMemoryAllocator.h" + +class GrVkMemoryAllocator; enum GrVkExtensionFlags { kEXT_debug_report_GrVkExtensionFlag = 0x0001, diff --git a/src/gpu/vk/GrVkBackendContext.cpp b/src/gpu/vk/GrVkBackendContext.cpp index d54582f3a5..196b141493 100644 --- a/src/gpu/vk/GrVkBackendContext.cpp +++ b/src/gpu/vk/GrVkBackendContext.cpp @@ -8,6 +8,7 @@ #include "SkAutoMalloc.h" #include "vk/GrVkBackendContext.h" #include "vk/GrVkExtensions.h" +#include "vk/GrVkMemoryAllocator.h" #include "vk/GrVkUtil.h" ////////////////////////////////////////////////////////////////////////////////