diff options
| author |  Hal Canary <halcanary@google.com> | 2017-01-11 12:44:43 -0500 |
|---|---|---|
| committer |  Skia Commit-Bot <skia-commit-bot@chromium.org> | 2017-01-11 18:55:34 +0000 |
| commit | 95e3c058ef633782f7549e9e1c2727d60dbc8ee5 (patch) | |
| tree | 4db526398bc87c48db4565a2046b9321b7e2ee10 /src/gpu/gl | |
| parent | 000ca636e6de2e2b8bf9c82e3dee2d7ad8e1bed8 (diff) | |
SkTypes.h : move SkAutoMalloc into SkAutoMalloc.h
* SkAutoFree moved to SkTemplates.h (now implmented with unique_ptr).
* SkAutoMalloc and SkAutoSMalloc moved to SkAutoMalloc.h
* "SkAutoFree X(sk_malloc_throw(N));" --> "SkAutoMalloc X(N);"
Revert "Revert 'SkTypes.h : move SkAutoMalloc into SkAutoMalloc.h'"
This reverts commit c456b73fef9589bbdc5eb83eaa83e53c357bb3da.
Change-Id: Ie2c1a17c20134b8ceab85a68b3ae3e61c24fbaab
Reviewed-on: https://skia-review.googlesource.com/6886
Reviewed-by: Hal Canary <halcanary@google.com>
Commit-Queue: Hal Canary <halcanary@google.com>
Diffstat (limited to 'src/gpu/gl')
| -rw-r--r-- | src/gpu/gl/GrGLGpu.cpp | 16 | ||||
| -rw-r--r-- | src/gpu/gl/builders/GrGLProgramBuilder.cpp | 1 | ||||
| -rw-r--r-- | src/gpu/gl/builders/GrGLShaderStringBuilder.cpp | 7 |
3 files changed, 14 insertions, 10 deletions
diff --git a/src/gpu/gl/GrGLGpu.cpp b/src/gpu/gl/GrGLGpu.cpp index 74e52583dd..95a01ab695 100644 --- a/src/gpu/gl/GrGLGpu.cpp +++ b/src/gpu/gl/GrGLGpu.cpp @@ -6,31 +6,33 @@ */ #include "GrGLGpu.h" + +#include "../private/GrGLSL.h" +#include "GrFixedClip.h" #include "GrGLBuffer.h" #include "GrGLGpuCommandBuffer.h" #include "GrGLStencilAttachment.h" #include "GrGLTextureRenderTarget.h" -#include "GrFixedClip.h" #include "GrGpuResourcePriv.h" #include "GrMesh.h" -#include "GrPipeline.h" #include "GrPLSGeometryProcessor.h" +#include "GrPipeline.h" #include "GrRenderTargetPriv.h" #include "GrShaderCaps.h" #include "GrSurfacePriv.h" #include "GrTexturePriv.h" #include "GrTypes.h" -#include "builders/GrGLShaderStringBuilder.h" -#include "glsl/GrGLSLPLSPathRendering.h" -#include "instanced/GLInstancedRendering.h" +#include "SkAutoMalloc.h" #include "SkMakeUnique.h" #include "SkMipMap.h" #include "SkPixmap.h" -#include "SkStrokeRec.h" #include "SkSLCompiler.h" +#include "SkStrokeRec.h" #include "SkTemplates.h" #include "SkTypes.h" -#include "../private/GrGLSL.h" +#include "builders/GrGLShaderStringBuilder.h" +#include "glsl/GrGLSLPLSPathRendering.h" +#include "instanced/GLInstancedRendering.h" #define GL_CALL(X) GR_GL_CALL(this->glInterface(), X) #define GL_CALL_RET(RET, X) GR_GL_CALL_RET(this->glInterface(), RET, X) diff --git a/src/gpu/gl/builders/GrGLProgramBuilder.cpp b/src/gpu/gl/builders/GrGLProgramBuilder.cpp index 045593ff42..c3e81fb358 100644 --- a/src/gpu/gl/builders/GrGLProgramBuilder.cpp +++ b/src/gpu/gl/builders/GrGLProgramBuilder.cpp @@ -14,6 +14,7 @@ #include "GrShaderCaps.h" #include "GrSwizzle.h" #include "GrTexture.h" +#include "SkAutoMalloc.h" #include "SkTraceEvent.h" #include "gl/GrGLGpu.h" #include "gl/GrGLProgram.h" diff --git a/src/gpu/gl/builders/GrGLShaderStringBuilder.cpp b/src/gpu/gl/builders/GrGLShaderStringBuilder.cpp index df44edd07e..6c719fe305 100644 --- a/src/gpu/gl/builders/GrGLShaderStringBuilder.cpp +++ b/src/gpu/gl/builders/GrGLShaderStringBuilder.cpp @@ -6,11 +6,12 @@ */ #include "GrGLShaderStringBuilder.h" -#include "gl/GrGLGpu.h" -#include "gl/GrGLSLPrettyPrint.h" -#include "SkTraceEvent.h" +#include "SkAutoMalloc.h" #include "SkSLCompiler.h" #include "SkSLGLSLCodeGenerator.h" +#include "SkTraceEvent.h" +#include "gl/GrGLGpu.h" +#include "gl/GrGLSLPrettyPrint.h" #include "ir/SkSLProgram.h" #define GL_CALL(X) GR_GL_CALL(gpu->glInterface(), X) |