diff options
Diffstat (limited to 'src/gpu/GrTextureProxy.cpp')
| -rw-r--r-- | src/gpu/GrTextureProxy.cpp | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/src/gpu/GrTextureProxy.cpp b/src/gpu/GrTextureProxy.cpp index b25efd95f5..fc6a2fae16 100644 --- a/src/gpu/GrTextureProxy.cpp +++ b/src/gpu/GrTextureProxy.cpp @@ -17,10 +17,12 @@ // Deferred version - with data GrTextureProxy::GrTextureProxy(const GrSurfaceDesc& srcDesc, GrMipMapped mipMapped, - SkBackingFit fit, SkBudgeted budgeted, const void* srcData, - size_t /*rowBytes*/, GrInternalSurfaceFlags surfaceFlags) + GrTextureType textureType, SkBackingFit fit, SkBudgeted budgeted, + const void* srcData, size_t /*rowBytes*/, + GrInternalSurfaceFlags surfaceFlags) : INHERITED(srcDesc, kTopLeft_GrSurfaceOrigin, fit, budgeted, surfaceFlags) , fMipMapped(mipMapped) + , fTextureType(textureType) , fProxyProvider(nullptr) , fDeferredUploader(nullptr) { SkASSERT(!srcData); // currently handled in Make() @@ -28,28 +30,30 @@ GrTextureProxy::GrTextureProxy(const GrSurfaceDesc& srcDesc, GrMipMapped mipMapp // Deferred version - no data GrTextureProxy::GrTextureProxy(const GrSurfaceDesc& srcDesc, GrSurfaceOrigin origin, - GrMipMapped mipMapped, SkBackingFit fit, SkBudgeted budgeted, - GrInternalSurfaceFlags surfaceFlags) + GrMipMapped mipMapped, GrTextureType textureType, SkBackingFit fit, + SkBudgeted budgeted, GrInternalSurfaceFlags surfaceFlags) : INHERITED(srcDesc, origin, fit, budgeted, surfaceFlags) , fMipMapped(mipMapped) + , fTextureType(textureType) , fProxyProvider(nullptr) , fDeferredUploader(nullptr) {} // Lazy-callback version GrTextureProxy::GrTextureProxy(LazyInstantiateCallback&& callback, LazyInstantiationType lazyType, const GrSurfaceDesc& desc, GrSurfaceOrigin origin, - GrMipMapped mipMapped, SkBackingFit fit, SkBudgeted budgeted, - GrInternalSurfaceFlags surfaceFlags) + GrMipMapped mipMapped, GrTextureType textureType, SkBackingFit fit, + SkBudgeted budgeted, GrInternalSurfaceFlags surfaceFlags) : INHERITED(std::move(callback), lazyType, desc, origin, fit, budgeted, surfaceFlags) , fMipMapped(mipMapped) + , fTextureType(textureType) , fProxyProvider(nullptr) - , fDeferredUploader(nullptr) { -} + , fDeferredUploader(nullptr) {} // Wrapped version GrTextureProxy::GrTextureProxy(sk_sp<GrSurface> surf, GrSurfaceOrigin origin) : INHERITED(std::move(surf), origin, SkBackingFit::kExact) , fMipMapped(fTarget->asTexture()->texturePriv().mipMapped()) + , fTextureType(fTarget->asTexture()->texturePriv().textureType()) , fProxyProvider(nullptr) , fDeferredUploader(nullptr) { if (fTarget->getUniqueKey().isValid()) { @@ -167,11 +171,7 @@ void GrTextureProxy::onValidateSurface(const GrSurface* surface) { SkASSERT(surface->asTexture()); SkASSERT(GrMipMapped::kNo == this->texPriv().proxyMipMapped() || GrMipMapped::kYes == surface->asTexture()->texturePriv().mipMapped()); - - GrInternalSurfaceFlags proxyFlags = fSurfaceFlags; - GrInternalSurfaceFlags surfaceFlags = surface->surfacePriv().flags(); - SkASSERT((proxyFlags & GrInternalSurfaceFlags::kTextureMask) == - (surfaceFlags & GrInternalSurfaceFlags::kTextureMask)); + SkASSERT(surface->asTexture()->texturePriv().textureType() == fTextureType); } #endif |