diff options
Diffstat (limited to 'src')
26 files changed, 29 insertions, 29 deletions
diff --git a/src/gpu/GrGpuFactory.cpp b/src/gpu/GrGpuFactory.cpp index e8d9454762..4b09c14e51 100644 --- a/src/gpu/GrGpuFactory.cpp +++ b/src/gpu/GrGpuFactory.cpp @@ -12,7 +12,7 @@ #include "gl/GrGLConfig.h" #include "GrGpu.h" -#include "gl/GrGpuGL.h" +#include "gl/GrGLGpu.h" GrGpu* GrGpu::Create(GrBackend backend, GrBackendContext backendContext, GrContext* context) { diff --git a/src/gpu/GrTexture.cpp b/src/gpu/GrTexture.cpp index 9f700c7556..e5d0fcc032 100644 --- a/src/gpu/GrTexture.cpp +++ b/src/gpu/GrTexture.cpp @@ -102,7 +102,7 @@ GrResourceKey::ResourceFlags get_texture_flags(const GrGpu* gpu, return flags; } -// FIXME: This should be refactored with the code in gl/GrGpuGL.cpp. +// FIXME: This should be refactored with the code in gl/GrGLGpu.cpp. GrSurfaceOrigin resolve_origin(const GrSurfaceDesc& desc) { // By default, GrRenderTargets are GL's normal orientation so that they // can be drawn to by the outside world without the client having diff --git a/src/gpu/gl/GrGLBufferImpl.cpp b/src/gpu/gl/GrGLBufferImpl.cpp index 3aa81e5763..b65fe5b346 100644 --- a/src/gpu/gl/GrGLBufferImpl.cpp +++ b/src/gpu/gl/GrGLBufferImpl.cpp @@ -6,7 +6,7 @@ */ #include "GrGLBufferImpl.h" -#include "GrGpuGL.h" +#include "GrGLGpu.h" #define GL_CALL(GPU, X) GR_GL_CALL(GPU->glInterface(), X) diff --git a/src/gpu/gl/GrGpuGL.cpp b/src/gpu/gl/GrGLGpu.cpp index 96af8af47f..92512ac10c 100644 --- a/src/gpu/gl/GrGpuGL.cpp +++ b/src/gpu/gl/GrGLGpu.cpp @@ -6,7 +6,7 @@ */ -#include "GrGpuGL.h" +#include "GrGLGpu.h" #include "GrGLStencilBuffer.h" #include "GrGLTextureRenderTarget.h" #include "GrGpuResourceCacheAccess.h" diff --git a/src/gpu/gl/GrGpuGL.h b/src/gpu/gl/GrGLGpu.h index d2a0d9a9ea..3809dc7bdf 100644 --- a/src/gpu/gl/GrGpuGL.h +++ b/src/gpu/gl/GrGLGpu.h @@ -5,8 +5,8 @@ * found in the LICENSE file. */ -#ifndef GrGpuGL_DEFINED -#define GrGpuGL_DEFINED +#ifndef GrGLGpu_DEFINED +#define GrGLGpu_DEFINED #include "GrDrawState.h" #include "GrGLContext.h" @@ -412,8 +412,8 @@ private: GrGLuint fDefaultVertexArrayBoundIndexBufferID; bool fDefaultVertexArrayBoundIndexBufferIDIsValid; // We return a non-const pointer to this from bindArrayAndBuffersToDraw when vertex array 0 - // is bound. However, this class is internal to GrGpuGL and this object never leaks out of - // GrGpuGL. + // is bound. However, this class is internal to GrGLGpu and this object never leaks out of + // GrGLGpu. GrGLAttribArrayState fDefaultVertexArrayAttribState; // This is used when we're using a core profile and the vertices are in a VBO. diff --git a/src/gpu/gl/GrGLGpuProgramCache.cpp b/src/gpu/gl/GrGLGpuProgramCache.cpp index 1a04341504..688b22ed04 100644 --- a/src/gpu/gl/GrGLGpuProgramCache.cpp +++ b/src/gpu/gl/GrGLGpuProgramCache.cpp @@ -5,7 +5,7 @@ * found in the LICENSE file. */ -#include "GrGpuGL.h" +#include "GrGLGpu.h" #include "builders/GrGLProgramBuilder.h" #include "GrProcessor.h" diff --git a/src/gpu/gl/GrGLIndexBuffer.cpp b/src/gpu/gl/GrGLIndexBuffer.cpp index 1fea4eae43..2d4b9a88a5 100644 --- a/src/gpu/gl/GrGLIndexBuffer.cpp +++ b/src/gpu/gl/GrGLIndexBuffer.cpp @@ -6,7 +6,7 @@ */ #include "GrGLIndexBuffer.h" -#include "GrGpuGL.h" +#include "GrGLGpu.h" GrGLIndexBuffer::GrGLIndexBuffer(GrGLGpu* gpu, const Desc& desc) : INHERITED(gpu, desc.fIsWrapped, desc.fSizeInBytes, desc.fDynamic, 0 == desc.fID) diff --git a/src/gpu/gl/GrGLPath.cpp b/src/gpu/gl/GrGLPath.cpp index 80139d7fe9..f5f66b8f8a 100644 --- a/src/gpu/gl/GrGLPath.cpp +++ b/src/gpu/gl/GrGLPath.cpp @@ -8,7 +8,7 @@ #include "GrGLPath.h" #include "GrGLPathRendering.h" -#include "GrGpuGL.h" +#include "GrGLGpu.h" namespace { inline GrGLubyte verb_to_gl_path_cmd(SkPath::Verb verb) { diff --git a/src/gpu/gl/GrGLPathRange.cpp b/src/gpu/gl/GrGLPathRange.cpp index a85c32000e..d7ccf1bcc7 100644 --- a/src/gpu/gl/GrGLPathRange.cpp +++ b/src/gpu/gl/GrGLPathRange.cpp @@ -9,7 +9,7 @@ #include "GrGLPathRange.h" #include "GrGLPath.h" #include "GrGLPathRendering.h" -#include "GrGpuGL.h" +#include "GrGLGpu.h" GrGLPathRange::GrGLPathRange(GrGLGpu* gpu, PathGenerator* pathGenerator, const SkStrokeRec& stroke) : INHERITED(gpu, pathGenerator, stroke), diff --git a/src/gpu/gl/GrGLPathRendering.cpp b/src/gpu/gl/GrGLPathRendering.cpp index a20c4de08b..7bf6ce6f8e 100644 --- a/src/gpu/gl/GrGLPathRendering.cpp +++ b/src/gpu/gl/GrGLPathRendering.cpp @@ -8,7 +8,7 @@ #include "gl/GrGLPathRendering.h" #include "gl/GrGLNameAllocator.h" #include "gl/GrGLUtil.h" -#include "gl/GrGpuGL.h" +#include "gl/GrGLGpu.h" #include "GrGLPath.h" #include "GrGLPathRange.h" diff --git a/src/gpu/gl/GrGLProgram.cpp b/src/gpu/gl/GrGLProgram.cpp index 9bf91fc595..245086db6c 100644 --- a/src/gpu/gl/GrGLProgram.cpp +++ b/src/gpu/gl/GrGLProgram.cpp @@ -13,7 +13,7 @@ #include "GrGLGeometryProcessor.h" #include "GrGLProcessor.h" #include "GrGLXferProcessor.h" -#include "GrGpuGL.h" +#include "GrGLGpu.h" #include "GrGLPathRendering.h" #include "GrGLShaderVar.h" #include "GrGLSL.h" diff --git a/src/gpu/gl/GrGLProgramDataManager.cpp b/src/gpu/gl/GrGLProgramDataManager.cpp index 65bf735cf0..67b70417be 100644 --- a/src/gpu/gl/GrGLProgramDataManager.cpp +++ b/src/gpu/gl/GrGLProgramDataManager.cpp @@ -7,7 +7,7 @@ #include "gl/GrGLPathRendering.h" #include "gl/GrGLUniformHandle.h" -#include "gl/GrGpuGL.h" +#include "gl/GrGLGpu.h" #include "SkMatrix.h" #define ASSERT_ARRAY_UPLOAD_IN_BOUNDS(UNI, COUNT) \ diff --git a/src/gpu/gl/GrGLProgramDesc.cpp b/src/gpu/gl/GrGLProgramDesc.cpp index 6e3128ceaf..76e9e0a64e 100644 --- a/src/gpu/gl/GrGLProgramDesc.cpp +++ b/src/gpu/gl/GrGLProgramDesc.cpp @@ -8,7 +8,7 @@ #include "GrGLProcessor.h" #include "GrProcessor.h" -#include "GrGpuGL.h" +#include "GrGLGpu.h" #include "GrOptDrawState.h" #include "SkChecksum.h" #include "gl/builders/GrGLFragmentShaderBuilder.h" diff --git a/src/gpu/gl/GrGLRenderTarget.cpp b/src/gpu/gl/GrGLRenderTarget.cpp index 425764d8eb..c513b65bf2 100644 --- a/src/gpu/gl/GrGLRenderTarget.cpp +++ b/src/gpu/gl/GrGLRenderTarget.cpp @@ -7,7 +7,7 @@ #include "GrGLRenderTarget.h" -#include "GrGpuGL.h" +#include "GrGLGpu.h" #define GPUGL static_cast<GrGLGpu*>(this->getGpu()) #define GL_CALL(X) GR_GL_CALL(GPUGL->glInterface(), X) diff --git a/src/gpu/gl/GrGLStencilBuffer.cpp b/src/gpu/gl/GrGLStencilBuffer.cpp index 1e854cf145..b6dfbb551d 100644 --- a/src/gpu/gl/GrGLStencilBuffer.cpp +++ b/src/gpu/gl/GrGLStencilBuffer.cpp @@ -7,7 +7,7 @@ #include "GrGLStencilBuffer.h" -#include "GrGpuGL.h" +#include "GrGLGpu.h" size_t GrGLStencilBuffer::onGpuMemorySize() const { uint64_t size = this->width(); diff --git a/src/gpu/gl/GrGLTexture.cpp b/src/gpu/gl/GrGLTexture.cpp index d34a3c0a39..2f4f49b0ce 100644 --- a/src/gpu/gl/GrGLTexture.cpp +++ b/src/gpu/gl/GrGLTexture.cpp @@ -6,7 +6,7 @@ */ #include "GrGLTexture.h" -#include "GrGpuGL.h" +#include "GrGLGpu.h" #define GPUGL static_cast<GrGLGpu*>(this->getGpu()) #define GL_CALL(X) GR_GL_CALL(GPUGL->glInterface(), X) diff --git a/src/gpu/gl/GrGLVertexArray.cpp b/src/gpu/gl/GrGLVertexArray.cpp index e28a163739..d6cc42ac54 100644 --- a/src/gpu/gl/GrGLVertexArray.cpp +++ b/src/gpu/gl/GrGLVertexArray.cpp @@ -6,7 +6,7 @@ */ #include "GrGLVertexArray.h" -#include "GrGpuGL.h" +#include "GrGLGpu.h" #define GPUGL static_cast<GrGLGpu*>(this->getGpu()) #define GL_CALL(X) GR_GL_CALL(GPUGL->glInterface(), X); diff --git a/src/gpu/gl/GrGLVertexBuffer.cpp b/src/gpu/gl/GrGLVertexBuffer.cpp index 1f3076764b..5691176125 100644 --- a/src/gpu/gl/GrGLVertexBuffer.cpp +++ b/src/gpu/gl/GrGLVertexBuffer.cpp @@ -6,7 +6,7 @@ */ #include "GrGLVertexBuffer.h" -#include "GrGpuGL.h" +#include "GrGLGpu.h" GrGLVertexBuffer::GrGLVertexBuffer(GrGLGpu* gpu, const Desc& desc) : INHERITED(gpu, desc.fIsWrapped, desc.fSizeInBytes, desc.fDynamic, 0 == desc.fID) diff --git a/src/gpu/gl/builders/GrGLFragmentShaderBuilder.cpp b/src/gpu/gl/builders/GrGLFragmentShaderBuilder.cpp index 7f21fbd631..b59df57512 100644 --- a/src/gpu/gl/builders/GrGLFragmentShaderBuilder.cpp +++ b/src/gpu/gl/builders/GrGLFragmentShaderBuilder.cpp @@ -8,7 +8,7 @@ #include "GrGLFragmentShaderBuilder.h" #include "GrGLShaderStringBuilder.h" #include "GrGLProgramBuilder.h" -#include "../GrGpuGL.h" +#include "../GrGLGpu.h" #define GL_CALL(X) GR_GL_CALL(fProgramBuilder->gpu()->glInterface(), X) #define GL_CALL_RET(R, X) GR_GL_CALL_RET(fProgramBuilder->gpu()->glInterface(), R, X) diff --git a/src/gpu/gl/builders/GrGLGeometryShaderBuilder.cpp b/src/gpu/gl/builders/GrGLGeometryShaderBuilder.cpp index ef8d1a2a35..573c553fa6 100644 --- a/src/gpu/gl/builders/GrGLGeometryShaderBuilder.cpp +++ b/src/gpu/gl/builders/GrGLGeometryShaderBuilder.cpp @@ -8,7 +8,7 @@ #include "GrGLGeometryShaderBuilder.h" #include "GrGLShaderStringBuilder.h" #include "GrGLProgramBuilder.h" -#include "../GrGpuGL.h" +#include "../GrGLGpu.h" GrGLGeometryBuilder::GrGLGeometryBuilder(GrGLProgramBuilder* program) : INHERITED(program) { diff --git a/src/gpu/gl/builders/GrGLLegacyNvprProgramBuilder.cpp b/src/gpu/gl/builders/GrGLLegacyNvprProgramBuilder.cpp index eeb9974959..f7600f50cc 100644 --- a/src/gpu/gl/builders/GrGLLegacyNvprProgramBuilder.cpp +++ b/src/gpu/gl/builders/GrGLLegacyNvprProgramBuilder.cpp @@ -6,7 +6,7 @@ */ #include "GrGLLegacyNvprProgramBuilder.h" -#include "../GrGpuGL.h" +#include "../GrGLGpu.h" GrGLLegacyNvprProgramBuilder::GrGLLegacyNvprProgramBuilder(GrGLGpu* gpu, const GrOptDrawState& optState) diff --git a/src/gpu/gl/builders/GrGLNvprProgramBuilder.cpp b/src/gpu/gl/builders/GrGLNvprProgramBuilder.cpp index b835306986..c45a911a06 100644 --- a/src/gpu/gl/builders/GrGLNvprProgramBuilder.cpp +++ b/src/gpu/gl/builders/GrGLNvprProgramBuilder.cpp @@ -6,7 +6,7 @@ */ #include "GrGLNvprProgramBuilder.h" -#include "../GrGpuGL.h" +#include "../GrGLGpu.h" #define GL_CALL(X) GR_GL_CALL(this->gpu()->glInterface(), X) #define GL_CALL_RET(R, X) GR_GL_CALL_RET(this->gpu()->glInterface(), R, X) diff --git a/src/gpu/gl/builders/GrGLProgramBuilder.cpp b/src/gpu/gl/builders/GrGLProgramBuilder.cpp index 861410bf13..cfb1d38b61 100644 --- a/src/gpu/gl/builders/GrGLProgramBuilder.cpp +++ b/src/gpu/gl/builders/GrGLProgramBuilder.cpp @@ -10,7 +10,7 @@ #include "gl/GrGLSLPrettyPrint.h" #include "gl/GrGLUniformHandle.h" #include "../GrGLXferProcessor.h" -#include "../GrGpuGL.h" +#include "../GrGLGpu.h" #include "GrCoordTransform.h" #include "GrGLLegacyNvprProgramBuilder.h" #include "GrGLNvprProgramBuilder.h" diff --git a/src/gpu/gl/builders/GrGLShaderBuilder.cpp b/src/gpu/gl/builders/GrGLShaderBuilder.cpp index d8dabae760..48872256da 100644 --- a/src/gpu/gl/builders/GrGLShaderBuilder.cpp +++ b/src/gpu/gl/builders/GrGLShaderBuilder.cpp @@ -8,7 +8,7 @@ #include "GrGLShaderBuilder.h" #include "GrGLProgramBuilder.h" #include "GrGLProgramBuilder.h" -#include "../GrGpuGL.h" +#include "../GrGLGpu.h" #include "../GrGLShaderVar.h" namespace { diff --git a/src/gpu/gl/builders/GrGLShaderStringBuilder.cpp b/src/gpu/gl/builders/GrGLShaderStringBuilder.cpp index 156d0bc9f9..4a0fee56b1 100644 --- a/src/gpu/gl/builders/GrGLShaderStringBuilder.cpp +++ b/src/gpu/gl/builders/GrGLShaderStringBuilder.cpp @@ -6,7 +6,7 @@ */ #include "GrGLShaderStringBuilder.h" -#include "../GrGpuGL.h" +#include "../GrGLGpu.h" #include "gl/GrGLSLPrettyPrint.h" #include "SkRTConf.h" #include "SkTraceEvent.h" diff --git a/src/gpu/gl/builders/GrGLVertexShaderBuilder.cpp b/src/gpu/gl/builders/GrGLVertexShaderBuilder.cpp index 991b37d6a8..2ff97823cd 100644 --- a/src/gpu/gl/builders/GrGLVertexShaderBuilder.cpp +++ b/src/gpu/gl/builders/GrGLVertexShaderBuilder.cpp @@ -8,7 +8,7 @@ #include "GrGLVertexShaderBuilder.h" #include "GrGLProgramBuilder.h" #include "GrGLShaderStringBuilder.h" -#include "../GrGpuGL.h" +#include "../GrGLGpu.h" #define GL_CALL(X) GR_GL_CALL(fProgramBuilder->gpu()->glInterface(), X) #define GL_CALL_RET(R, X) GR_GL_CALL_RET(fProgramBuilder->gpu()->glInterface(), R, X) |