From 881f143aec15e35e76bab64ab0c93de610b7f3fd Mon Sep 17 00:00:00 2001 From: Robert Phillips Date: Thu, 15 Jun 2017 12:28:21 -0400 Subject: [PATCH] Hide GrGpuResourceRef from prying eyes Change-Id: I5535b8cc8e82ed4b6fe847b96b417531b4bae348 Reviewed-on: https://skia-review.googlesource.com/19967 Reviewed-by: Brian Salomon Commit-Queue: Robert Phillips --- gn/gpu.gni | 2 +- {include => src}/gpu/GrGpuResourceRef.h | 0 src/gpu/GrMesh.h | 1 - src/gpu/GrOpList.h | 1 - src/gpu/GrPipelineBuilder.h | 1 - src/gpu/GrProgramElement.h | 2 -- 6 files changed, 1 insertion(+), 6 deletions(-) rename {include => src}/gpu/GrGpuResourceRef.h (100%) diff --git a/gn/gpu.gni b/gn/gpu.gni index fab5d971b4..aa840694ce 100644 --- a/gn/gpu.gni +++ b/gn/gpu.gni @@ -16,7 +16,6 @@ skia_gpu_sources = [ "$_include/gpu/GrContextOptions.h", "$_include/gpu/GrContext.h", "$_include/gpu/GrGpuResource.h", - "$_include/gpu/GrGpuResourceRef.h", "$_include/gpu/GrRenderTarget.h", "$_include/gpu/GrResourceKey.h", "$_include/gpu/GrShaderCaps.h", @@ -93,6 +92,7 @@ skia_gpu_sources = [ "$_src/gpu/GrGpuCommandBuffer.h", "$_src/gpu/GrGpuResourcePriv.h", "$_src/gpu/GrGpuResource.cpp", + "$_src/gpu/GrGpuResourceRef.h", "$_src/gpu/GrGpuFactory.cpp", "$_src/gpu/GrGpuFactory.h", "$_src/gpu/GrImageTextureMaker.cpp", diff --git a/include/gpu/GrGpuResourceRef.h b/src/gpu/GrGpuResourceRef.h similarity index 100% rename from include/gpu/GrGpuResourceRef.h rename to src/gpu/GrGpuResourceRef.h diff --git a/src/gpu/GrMesh.h b/src/gpu/GrMesh.h index bdb62f5f0f..feced48d6f 100644 --- a/src/gpu/GrMesh.h +++ b/src/gpu/GrMesh.h @@ -9,7 +9,6 @@ #define GrMesh_DEFINED #include "GrBuffer.h" -#include "GrGpuResourceRef.h" class GrPrimitiveProcessor; diff --git a/src/gpu/GrOpList.h b/src/gpu/GrOpList.h index 04142d873f..37ca3333d8 100644 --- a/src/gpu/GrOpList.h +++ b/src/gpu/GrOpList.h @@ -9,7 +9,6 @@ #define GrOpList_DEFINED #include "GrGpuResourceRef.h" - #include "SkRefCnt.h" #include "SkTDArray.h" diff --git a/src/gpu/GrPipelineBuilder.h b/src/gpu/GrPipelineBuilder.h index aedc07ca06..9023e8ae1d 100644 --- a/src/gpu/GrPipelineBuilder.h +++ b/src/gpu/GrPipelineBuilder.h @@ -8,7 +8,6 @@ #ifndef GrPipelineBuilder_DEFINED #define GrPipelineBuilder_DEFINED -#include "GrGpuResourceRef.h" #include "GrPipeline.h" #include "GrProcessorSet.h" #include "GrUserStencilSettings.h" diff --git a/src/gpu/GrProgramElement.h b/src/gpu/GrProgramElement.h index 425f57a59d..ef96738ade 100644 --- a/src/gpu/GrProgramElement.h +++ b/src/gpu/GrProgramElement.h @@ -11,8 +11,6 @@ #include "../private/SkTArray.h" #include "SkRefCnt.h" -class GrGpuResourceRef; - /** * Note: We are converting GrProcessor from ref counting to a single owner model using move * semantics. This class will be removed.