diff options
author | Brian Salomon <bsalomon@google.com> | 2017-07-06 10:09:38 -0400 |
---|---|---|
committer | Skia Commit-Bot <skia-commit-bot@chromium.org> | 2017-07-06 14:35:45 +0000 |
commit | 0c26a9dbd0b6546731df63c01411cb2aaa5ba236 (patch) | |
tree | 02779da50097086c27bc5f0a1885e419ad4162a5 /src/gpu/GrProcessor.h | |
parent | 7c26ca770b08bd75dd8f347350a0f958953d3071 (diff) |
GR_TEST_UTILS fixes
Fixes build of Skia lib when GR_TEST_UTILS=0
Makes GR_TEST_UTILS=0 for official builds
Makes "Mini" builder bot exercise building GPU with is_official_build=true
Bug: skia:6786
Change-Id: I6186683a3a216d2e779645bd9e8276a66bcff4d5
Reviewed-on: https://skia-review.googlesource.com/21524
Commit-Queue: Brian Salomon <bsalomon@google.com>
Reviewed-by: Brian Osman <brianosman@google.com>
Diffstat (limited to 'src/gpu/GrProcessor.h')
-rw-r--r-- | src/gpu/GrProcessor.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/gpu/GrProcessor.h b/src/gpu/GrProcessor.h index 771b276570..a2be518de6 100644 --- a/src/gpu/GrProcessor.h +++ b/src/gpu/GrProcessor.h @@ -8,23 +8,23 @@ #ifndef GrProcessor_DEFINED #define GrProcessor_DEFINED -#include "GrColor.h" +#include "../private/SkAtomics.h" #include "GrBuffer.h" +#include "GrColor.h" #include "GrGpuResourceRef.h" #include "GrProcessorUnitTest.h" #include "GrProgramElement.h" #include "GrSamplerParams.h" #include "GrShaderVar.h" #include "GrSurfaceProxyPriv.h" +#include "GrTextureProxy.h" #include "SkMath.h" #include "SkString.h" -#include "../private/SkAtomics.h" class GrContext; class GrCoordTransform; class GrInvariantOutput; class GrResourceProvider; -class GrTextureProxy; /** * Used by processors to build their keys. It incorporates each per-processor key into a larger |