From a782dcb3c407a7e30d7c1263bf9965792088e786 Mon Sep 17 00:00:00 2001 From: Greg Daniel Date: Thu, 28 Jun 2018 20:18:59 +0000 Subject: Reland "Let client pass in full extension to GrVkBackendContext." This reverts commit cb92b26e5ca6063bcf1a922109b8224e0b6eb4da. Reason for revert: Original change's description: > Revert "Let client pass in full extension to GrVkBackendContext." > > This reverts commit 45c9dab4c3ec43cedb28d1b8c08e166fe0c2e767. > > Reason for revert: fucshia uses GrVkBackendContext. Need to revert earlier changes > > Original change's description: > > Let client pass in full extension to GrVkBackendContext. > > > > Bug: skia: > > Change-Id: I772ab4ccbca0f4f7e7d429d6c421b07d97f0606f > > Reviewed-on: https://skia-review.googlesource.com/131880 > > Reviewed-by: Jim Van Verth > > Commit-Queue: Greg Daniel > > TBR=egdaniel@google.com,jvanverth@google.com,bsalomon@google.com > > Change-Id: I1a765ff406c83cb234c3614b804fbed677d5a382 > No-Presubmit: true > No-Tree-Checks: true > No-Try: true > Bug: skia: > Reviewed-on: https://skia-review.googlesource.com/137901 > Reviewed-by: Greg Daniel > Commit-Queue: Greg Daniel TBR=egdaniel@google.com,jvanverth@google.com,bsalomon@google.com # Not skipping CQ checks because original CL landed > 1 day ago. Bug: skia: Change-Id: I0af797c51dde705473e9afaccb1d4b4423e8c41e Reviewed-on: https://skia-review.googlesource.com/138302 Commit-Queue: Greg Daniel Reviewed-by: Greg Daniel --- gn/gpu.gni | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'gn/gpu.gni') diff --git a/gn/gpu.gni b/gn/gpu.gni index 91184fbeaf..1e81baf01b 100644 --- a/gn/gpu.gni +++ b/gn/gpu.gni @@ -537,6 +537,7 @@ skia_null_gpu_sources = [] skia_vk_sources = [ "$_include/gpu/vk/GrVkBackendContext.h", "$_include/gpu/vk/GrVkDefines.h", + "$_include/gpu/vk/GrVkExtensions.h", "$_include/gpu/vk/GrVkInterface.h", "$_include/gpu/vk/GrVkMemoryAllocator.h", "$_include/gpu/vk/GrVkTypes.h", @@ -562,7 +563,6 @@ skia_vk_sources = [ "$_src/gpu/vk/GrVkDescriptorSetManager.cpp", "$_src/gpu/vk/GrVkDescriptorSetManager.h", "$_src/gpu/vk/GrVkExtensions.cpp", - "$_src/gpu/vk/GrVkExtensions.h", "$_src/gpu/vk/GrVkFramebuffer.cpp", "$_src/gpu/vk/GrVkFramebuffer.h", "$_src/gpu/vk/GrVkGpu.cpp", -- cgit v1.2.3