diff options
| author |  Brian Salomon <bsalomon@google.com> | 2018-06-19 14:19:13 -0400 |
|---|---|---|
| committer |  Skia Commit-Bot <skia-commit-bot@chromium.org> | 2018-06-19 21:44:28 +0000 |
| commit | 0560bd612b5d5db64895f8c6b37e055dd29fe4cd (patch) | |
| tree | 74f7ddf592776b1c414e01c76016afd64205a4e4 | |
| parent | 23c55b6b18a7f9bb93a303914f89c1d8a576ec81 (diff) | |
Move GrSwizzle.h from include/private to src/gpu.
Change-Id: I2d992404f540c7f8a1cd5ff633148d92ec50d4fa
Reviewed-on: https://skia-review.googlesource.com/135860
Commit-Queue: Brian Salomon <bsalomon@google.com>
Reviewed-by: Robert Phillips <robertphillips@google.com>
Auto-Submit: Brian Salomon <bsalomon@google.com>
| -rw-r--r-- | gn/gpu.gni | 2 | ||||
| -rw-r--r-- | src/gpu/GrShaderCaps.h | 2 | ||||
| -rw-r--r-- | src/gpu/GrSwizzle.h (renamed from include/private/GrSwizzle.h) | 0 |
3 files changed, 2 insertions, 2 deletions
diff --git a/gn/gpu.gni b/gn/gpu.gni index ba45a9bc8b..40d7495afb 100644 --- a/gn/gpu.gni +++ b/gn/gpu.gni @@ -40,7 +40,6 @@ skia_gpu_sources = [ "$_include/private/GrRenderTargetProxy.h", "$_include/private/GrSurfaceProxy.h", "$_include/private/GrSurfaceProxyRef.h", - "$_include/private/GrSwizzle.h", "$_include/private/GrTextureProxy.h", "$_include/private/GrTypesPriv.h", @@ -190,6 +189,7 @@ skia_gpu_sources = [ "$_src/gpu/GrSurfaceContextPriv.h", "$_src/gpu/GrSurfaceProxyPriv.h", "$_src/gpu/GrSurfaceProxyRef.cpp", + "$_src/gpu/GrSwizzle.h", "$_src/gpu/GrTessellator.cpp", "$_src/gpu/GrTessellator.h", "$_src/gpu/GrTextureOpList.cpp", diff --git a/src/gpu/GrShaderCaps.h b/src/gpu/GrShaderCaps.h index 914394672a..e16c9f6d5b 100644 --- a/src/gpu/GrShaderCaps.h +++ b/src/gpu/GrShaderCaps.h @@ -8,7 +8,7 @@ #ifndef GrShaderCaps_DEFINED #define GrShaderCaps_DEFINED -#include "../private/GrSwizzle.h" +#include "GrSwizzle.h" #include "GrTypesPriv.h" #include "SkRefCnt.h" #include "glsl/GrGLSL.h" diff --git a/include/private/GrSwizzle.h b/src/gpu/GrSwizzle.h index da5d3e0f16..da5d3e0f16 100644 --- a/include/private/GrSwizzle.h +++ b/src/gpu/GrSwizzle.h |