diff options
author | bsalomon <bsalomon@google.com> | 2014-09-30 12:18:44 -0700 |
---|---|---|
committer | Commit bot <commit-bot@chromium.org> | 2014-09-30 12:18:44 -0700 |
commit | afbf2d6273cd22c683f20a7e5773843876af3085 (patch) | |
tree | ce03339b06e13e45b5055b7cc5abdeb57cbdd86c /src/gpu/gl | |
parent | 8de02f4bf3dfb6178132231d03caec9f9a5d0beb (diff) |
Make "priv" classes for GrTexure and GrSurface.
R=robertphillips@google.com, egdaniel@google.com, joshualitt@google.com
Author: bsalomon@google.com
Review URL: https://codereview.chromium.org/596053002
Diffstat (limited to 'src/gpu/gl')
-rw-r--r-- | src/gpu/gl/GrGLTexture.h | 4 | ||||
-rw-r--r-- | src/gpu/gl/GrGpuGL.cpp | 14 |
2 files changed, 10 insertions, 8 deletions
diff --git a/src/gpu/gl/GrGLTexture.h b/src/gpu/gl/GrGLTexture.h index 23ae3fa31f..05acaa82dc 100644 --- a/src/gpu/gl/GrGLTexture.h +++ b/src/gpu/gl/GrGLTexture.h @@ -45,7 +45,7 @@ private: //////////////////////////////////////////////////////////////////////////////// -class GrGLTexture : public GrTextureImpl { +class GrGLTexture : public GrTexture { public: struct TexParams { @@ -105,7 +105,7 @@ private: const Desc& textureDesc, const GrGLRenderTarget::Desc* rtDesc); - typedef GrTextureImpl INHERITED; + typedef GrTexture INHERITED; }; #endif diff --git a/src/gpu/gl/GrGpuGL.cpp b/src/gpu/gl/GrGpuGL.cpp index be385110c9..8be1118d64 100644 --- a/src/gpu/gl/GrGpuGL.cpp +++ b/src/gpu/gl/GrGpuGL.cpp @@ -9,7 +9,9 @@ #include "GrGpuGL.h" #include "GrGLStencilBuffer.h" #include "GrOptDrawState.h" +#include "GrSurfacePriv.h" #include "GrTemplates.h" +#include "GrTexturePriv.h" #include "GrTypes.h" #include "SkStrokeRec.h" #include "SkTemplates.h" @@ -493,7 +495,7 @@ bool GrGpuGL::onWriteTexturePixels(GrTexture* texture, } if (success) { - texture->impl()->dirtyMipMaps(true); + texture->texturePriv().dirtyMipMaps(true); return true; } @@ -1731,7 +1733,7 @@ void GrGpuGL::flushRenderTarget(GrGLRenderTarget* target, const SkIRect* bound) GrTexture *texture = target->asTexture(); if (texture) { - texture->impl()->dirtyMipMaps(true); + texture->texturePriv().dirtyMipMaps(true); } } @@ -2053,9 +2055,9 @@ void GrGpuGL::bindTexture(int unitIdx, const GrTextureParams& params, GrGLTextur newTexParams.fMagFilter = glMagFilterModes[filterMode]; if (GrTextureParams::kMipMap_FilterMode == filterMode && - texture->mipMapsAreDirty() && !GrPixelConfigIsCompressed(texture->config())) { + texture->texturePriv().mipMapsAreDirty() && !GrPixelConfigIsCompressed(texture->config())) { GL_CALL(GenerateMipmap(GR_GL_TEXTURE_2D)); - texture->dirtyMipMaps(false); + texture->texturePriv().dirtyMipMaps(false); } newTexParams.fWrapS = tile_to_gl_wrap(params.getTileModeX()); @@ -2469,7 +2471,7 @@ bool GrGpuGL::onCopySurface(GrSurface* dst, SkIRect dstRect = SkIRect::MakeXYWH(dstPoint.fX, dstPoint.fY, srcRect.width(), srcRect.height()); bool selfOverlap = false; - if (dst->isSameAs(src)) { + if (dst->surfacePriv().isSameAs(src)) { selfOverlap = SkIRect::IntersectsNoEmptyCheck(dstRect, srcRect); } @@ -2547,7 +2549,7 @@ bool GrGpuGL::onCanCopySurface(GrSurface* dst, return true; } if (can_blit_framebuffer(dst, src, this)) { - if (dst->isSameAs(src)) { + if (dst->surfacePriv().isSameAs(src)) { SkIRect dstRect = SkIRect::MakeXYWH(dstPoint.fX, dstPoint.fY, srcRect.width(), srcRect.height()); if(!SkIRect::IntersectsNoEmptyCheck(dstRect, srcRect)) { |