diff options
| author |  robertphillips <robertphillips@google.com> | 2014-09-30 06:58:20 -0700 |
|---|---|---|
| committer |  Commit bot <commit-bot@chromium.org> | 2014-09-30 06:58:20 -0700 |
| commit | b06e5a2f558133b865cb0c3cc0b36e9bd2e594e2 (patch) | |
| tree | 52a68d8103a78776d05f5c933b4f715dd7828633 /src/gpu/gl | |
| parent | dbe6074a06efc5fb6883bb5e4f251ed67c8c0ab4 (diff) | |
Revert of Make "priv" classes for GrTexure and GrSurface. (patchset #9 id:260001 of https://codereview.chromium.org/596053002/)
Reason for revert:
Breaking the Chrome builds with:
lib/libcc.so: error: undefined reference to 'GrAutoScratchTexture::detach()'
(http://108.170.220.120:10117/builders/Canary-Chrome-Ubuntu13.10-Ninja-x86_64-DRT/builds/2990/steps/Retry_BuildContentShell_1/logs/stdio)
Original issue's description:
> Make "priv" classes for GrTexure and GrSurface.
R=egdaniel@google.com, joshualitt@google.com, bsalomon@google.com
TBR=bsalomon@google.com, egdaniel@google.com, joshualitt@google.com
NOTREECHECKS=true
NOTRY=true
Author: robertphillips@google.com
Review URL: https://codereview.chromium.org/618733002
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, 8 insertions, 10 deletions
diff --git a/src/gpu/gl/GrGLTexture.h b/src/gpu/gl/GrGLTexture.h index 05acaa82dc..23ae3fa31f 100644 --- a/src/gpu/gl/GrGLTexture.h +++ b/src/gpu/gl/GrGLTexture.h @@ -45,7 +45,7 @@ private: //////////////////////////////////////////////////////////////////////////////// -class GrGLTexture : public GrTexture { +class GrGLTexture : public GrTextureImpl { public: struct TexParams { @@ -105,7 +105,7 @@ private: const Desc& textureDesc, const GrGLRenderTarget::Desc* rtDesc); - typedef GrTexture INHERITED; + typedef GrTextureImpl INHERITED; }; #endif diff --git a/src/gpu/gl/GrGpuGL.cpp b/src/gpu/gl/GrGpuGL.cpp index 8be1118d64..be385110c9 100644 --- a/src/gpu/gl/GrGpuGL.cpp +++ b/src/gpu/gl/GrGpuGL.cpp @@ -9,9 +9,7 @@ #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" @@ -495,7 +493,7 @@ bool GrGpuGL::onWriteTexturePixels(GrTexture* texture, } if (success) { - texture->texturePriv().dirtyMipMaps(true); + texture->impl()->dirtyMipMaps(true); return true; } @@ -1733,7 +1731,7 @@ void GrGpuGL::flushRenderTarget(GrGLRenderTarget* target, const SkIRect* bound) GrTexture *texture = target->asTexture(); if (texture) { - texture->texturePriv().dirtyMipMaps(true); + texture->impl()->dirtyMipMaps(true); } } @@ -2055,9 +2053,9 @@ void GrGpuGL::bindTexture(int unitIdx, const GrTextureParams& params, GrGLTextur newTexParams.fMagFilter = glMagFilterModes[filterMode]; if (GrTextureParams::kMipMap_FilterMode == filterMode && - texture->texturePriv().mipMapsAreDirty() && !GrPixelConfigIsCompressed(texture->config())) { + texture->mipMapsAreDirty() && !GrPixelConfigIsCompressed(texture->config())) { GL_CALL(GenerateMipmap(GR_GL_TEXTURE_2D)); - texture->texturePriv().dirtyMipMaps(false); + texture->dirtyMipMaps(false); } newTexParams.fWrapS = tile_to_gl_wrap(params.getTileModeX()); @@ -2471,7 +2469,7 @@ bool GrGpuGL::onCopySurface(GrSurface* dst, SkIRect dstRect = SkIRect::MakeXYWH(dstPoint.fX, dstPoint.fY, srcRect.width(), srcRect.height()); bool selfOverlap = false; - if (dst->surfacePriv().isSameAs(src)) { + if (dst->isSameAs(src)) { selfOverlap = SkIRect::IntersectsNoEmptyCheck(dstRect, srcRect); } @@ -2549,7 +2547,7 @@ bool GrGpuGL::onCanCopySurface(GrSurface* dst, return true; } if (can_blit_framebuffer(dst, src, this)) { - if (dst->surfacePriv().isSameAs(src)) { + if (dst->isSameAs(src)) { SkIRect dstRect = SkIRect::MakeXYWH(dstPoint.fX, dstPoint.fY, srcRect.width(), srcRect.height()); if(!SkIRect::IntersectsNoEmptyCheck(dstRect, srcRect)) { |