AuroraMiddleware/skia2
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Remove guard around getBackendTexture/RenderTarget calls

Browse Source 
Bug: skia:
Change-Id: Ia9ad987d4af183985724f32b022553af0fcb2b78
Reviewed-on: https://skia-review.googlesource.com/120124
Reviewed-by: Brian Salomon <bsalomon@google.com>
Commit-Queue: Greg Daniel <egdaniel@google.com>
This commit is contained in:
Greg Daniel 2018-04-10 16:22:41 -04:00 committed by Skia Commit-Bot
parent c64ee20e13
commit 044b67d6c7
4 changed files with 0 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/core/SkImage.h
View File

@ -543,7 +543,6 @@ public:
GrBackendObject getTextureHandle(bool flushPendingGrContextIO, GrBackendObject getTextureHandle(bool flushPendingGrContextIO,
GrSurfaceOrigin* origin = nullptr) const; GrSurfaceOrigin* origin = nullptr) const;
#if GR_TEST_UTILS
/** Retrieves the backend texture. If SkImage has no backend texture, an invalid /** Retrieves the backend texture. If SkImage has no backend texture, an invalid
object is returned. Call GrBackendTexture::isValid to determine if the result object is returned. Call GrBackendTexture::isValid to determine if the result
is valid. is valid.
@ -559,7 +558,6 @@ public:
*/ */
GrBackendTexture getBackendTexture(bool flushPendingGrContextIO, GrBackendTexture getBackendTexture(bool flushPendingGrContextIO,
GrSurfaceOrigin* origin = nullptr) const; GrSurfaceOrigin* origin = nullptr) const;
#endif
/** \enum SkImage::CachingHint /** \enum SkImage::CachingHint
CachingHint selects whether Skia may internally cache SkBitmap generated by CachingHint selects whether Skia may internally cache SkBitmap generated by

2
include/core/SkSurface.h
View File

@ -459,7 +459,6 @@ public:
bool getRenderTargetHandle(GrBackendObject* backendObject, bool getRenderTargetHandle(GrBackendObject* backendObject,
BackendHandleAccess backendHandleAccess); BackendHandleAccess backendHandleAccess);
#if GR_TEST_UTILS
/** Retrieves the backend texture. If Surface has no backend texture, an invalid /** Retrieves the backend texture. If Surface has no backend texture, an invalid
object is returned. Call GrBackendTexture::isValid to determine if the result object is returned. Call GrBackendTexture::isValid to determine if the result
is valid. is valid.
@ -486,7 +485,6 @@ public:
@return GPU render target reference; invalid on failure @return GPU render target reference; invalid on failure
*/ */
GrBackendRenderTarget getBackendRenderTarget(BackendHandleAccess backendHandleAccess); GrBackendRenderTarget getBackendRenderTarget(BackendHandleAccess backendHandleAccess);
#endif
/** Returns SkCanvas that draws into SkSurface. Subsequent calls return the same SkCanvas. /** Returns SkCanvas that draws into SkSurface. Subsequent calls return the same SkCanvas.
SkCanvas returned is managed and owned by SkSurface, and is deleted when SkSurface SkCanvas returned is managed and owned by SkSurface, and is deleted when SkSurface

4
src/image/SkImage.cpp
View File

@ -168,12 +168,10 @@ GrBackendObject SkImage::getTextureHandle(bool flushPendingGrContextIO,
return as_IB(this)->onGetTextureHandle(flushPendingGrContextIO, origin); return as_IB(this)->onGetTextureHandle(flushPendingGrContextIO, origin);
} }
#if GR_TEST_UTILS
GrBackendTexture SkImage::getBackendTexture(bool flushPendingGrContextIO, GrBackendTexture SkImage::getBackendTexture(bool flushPendingGrContextIO,
GrSurfaceOrigin* origin) const { GrSurfaceOrigin* origin) const {
return as_IB(this)->onGetBackendTexture(flushPendingGrContextIO, origin); return as_IB(this)->onGetBackendTexture(flushPendingGrContextIO, origin);
} }
#endif
bool SkImage::isValid(GrContext* context) const { bool SkImage::isValid(GrContext* context) const {
if (context && context->contextPriv().abandoned()) { if (context && context->contextPriv().abandoned()) {
@ -190,12 +188,10 @@ bool SkImage::isTextureBacked() const { return false; }
GrBackendObject SkImage::getTextureHandle(bool, GrSurfaceOrigin*) const { return 0; } GrBackendObject SkImage::getTextureHandle(bool, GrSurfaceOrigin*) const { return 0; }
#if GR_TEST_UTILS
GrBackendTexture SkImage::getBackendTexture(bool flushPendingGrContextIO, GrBackendTexture SkImage::getBackendTexture(bool flushPendingGrContextIO,
GrSurfaceOrigin* origin) const { GrSurfaceOrigin* origin) const {
return GrBackendTexture(); // invalid return GrBackendTexture(); // invalid
} }
#endif
bool SkImage::isValid(GrContext* context) const { bool SkImage::isValid(GrContext* context) const {
if (context) { if (context) {

2
src/image/SkSurface.cpp
View File

@ -226,7 +226,6 @@ bool SkSurface::getRenderTargetHandle(GrBackendObject* obj, BackendHandleAccess
return asSB(this)->onGetRenderTargetHandle(obj, access); return asSB(this)->onGetRenderTargetHandle(obj, access);
} }
#if GR_TEST_UTILS
GrBackendTexture SkSurface::getBackendTexture(BackendHandleAccess access) { GrBackendTexture SkSurface::getBackendTexture(BackendHandleAccess access) {
return asSB(this)->onGetBackendTexture(access); return asSB(this)->onGetBackendTexture(access);
} }
@ -234,7 +233,6 @@ GrBackendTexture SkSurface::getBackendTexture(BackendHandleAccess access) {
GrBackendRenderTarget SkSurface::getBackendRenderTarget(BackendHandleAccess access) { GrBackendRenderTarget SkSurface::getBackendRenderTarget(BackendHandleAccess access) {
return asSB(this)->onGetBackendRenderTarget(access); return asSB(this)->onGetBackendRenderTarget(access);
} }
#endif
void SkSurface::prepareForExternalIO() { void SkSurface::prepareForExternalIO() {
this->flush(); this->flush();