From a6a3df7d64dc81082619ab103450fc6d0af7c644 Mon Sep 17 00:00:00 2001 From: Brian Salomon Date: Fri, 23 Mar 2018 16:32:22 -0400 Subject: Move GrPixelConfig to GrTypesPriv BUG= skia:6718 Change-Id: I254a5d289c1216e580b8f7fe613236c090d0e901 Reviewed-on: https://skia-review.googlesource.com/116196 Commit-Queue: Brian Salomon Reviewed-by: Greg Daniel --- src/core/SkSpecialSurface.h | 2 +- src/gpu/gl/GrGLUtil.h | 1 + src/gpu/mtl/GrMtlUtil.h | 5 +++-- src/image/SkSurface_Gpu.h | 1 + 4 files changed, 6 insertions(+), 3 deletions(-) (limited to 'src') diff --git a/src/core/SkSpecialSurface.h b/src/core/SkSpecialSurface.h index 96b74a4dac..2c138a3e79 100644 --- a/src/core/SkSpecialSurface.h +++ b/src/core/SkSpecialSurface.h @@ -13,7 +13,7 @@ #include "SkSurfaceProps.h" #if SK_SUPPORT_GPU -#include "GrTypes.h" +#include "GrTypesPriv.h" #endif class GrContext; diff --git a/src/gpu/gl/GrGLUtil.h b/src/gpu/gl/GrGLUtil.h index 416538a749..8062a0dbce 100644 --- a/src/gpu/gl/GrGLUtil.h +++ b/src/gpu/gl/GrGLUtil.h @@ -11,6 +11,7 @@ #include "gl/GrGLInterface.h" #include "GrGLDefines.h" #include "GrStencilSettings.h" +#include "GrTypesPriv.h" class SkMatrix; diff --git a/src/gpu/mtl/GrMtlUtil.h b/src/gpu/mtl/GrMtlUtil.h index a84a636511..1900c3933d 100644 --- a/src/gpu/mtl/GrMtlUtil.h +++ b/src/gpu/mtl/GrMtlUtil.h @@ -8,10 +8,11 @@ #ifndef GrMtlUtil_DEFINED #define GrMtlUtil_DEFINED -#include "GrTypes.h" - #import +#include "GrTypesPriv.h" + + /** * Returns the Metal texture format for the given GrPixelConfig */ diff --git a/src/image/SkSurface_Gpu.h b/src/image/SkSurface_Gpu.h index 9699b01e05..3edb0ca32f 100644 --- a/src/image/SkSurface_Gpu.h +++ b/src/image/SkSurface_Gpu.h @@ -8,6 +8,7 @@ #ifndef SkSurface_Gpu_DEFINED #define SkSurface_Gpu_DEFINED +#include "GrTypesPriv.h" #include "SkSurface_Base.h" #if SK_SUPPORT_GPU -- cgit v1.2.3