From e3bd422fafc74dd3410c3de24a576635be92c3b4 Mon Sep 17 00:00:00 2001 From: Greg Daniel Date: Thu, 27 Apr 2017 18:48:15 +0000 Subject: Revert "Plumb the use of GrBackendRenderTarget throughout Skia" This reverts commit fdd77daedbba3b7c53be74a82fb9fae891b51696. Reason for revert: Apparently I have a few more build files to update before this can land. Original change's description: > Plumb the use of GrBackendRenderTarget throughout Skia > > Bug: skia: > Change-Id: Ib99a58d9552f5c7b8d77c09dcc72fa88326c26aa > Reviewed-on: https://skia-review.googlesource.com/14148 > Reviewed-by: Brian Salomon > Reviewed-by: Robert Phillips > Commit-Queue: Greg Daniel > TBR=egdaniel@google.com,bsalomon@google.com,robertphillips@google.com,reviews@skia.org NOPRESUBMIT=true NOTREECHECKS=true NOTRY=true Change-Id: I984e1909870182474c4c3cce257f01b6a9d8581f Reviewed-on: https://skia-review.googlesource.com/14531 Reviewed-by: Greg Daniel Commit-Queue: Greg Daniel --- tools/viewer/sk_app/GLWindowContext.cpp | 34 ++++++++++++++++----------------- 1 file changed, 16 insertions(+), 18 deletions(-) (limited to 'tools/viewer/sk_app') diff --git a/tools/viewer/sk_app/GLWindowContext.cpp b/tools/viewer/sk_app/GLWindowContext.cpp index 6195199ce0..ff56ce8668 100644 --- a/tools/viewer/sk_app/GLWindowContext.cpp +++ b/tools/viewer/sk_app/GLWindowContext.cpp @@ -6,18 +6,19 @@ * found in the LICENSE file. */ -#include "GrBackendSurface.h" #include "GrContext.h" -#include "GrRenderTarget.h" +#include "SkSurface.h" #include "GLWindowContext.h" #include "gl/GrGLDefines.h" + #include "gl/GrGLUtil.h" +#include "GrRenderTarget.h" +#include "GrContext.h" #include "SkCanvas.h" #include "SkImage_Base.h" #include "SkMathPriv.h" -#include "SkSurface.h" namespace sk_app { @@ -63,7 +64,7 @@ void GLWindowContext::destroyContext() { fContext->unref(); fContext = nullptr; } - + fBackendContext.reset(nullptr); this->onDestroyContext(); @@ -72,21 +73,18 @@ void GLWindowContext::destroyContext() { sk_sp GLWindowContext::getBackbufferSurface() { if (nullptr == fSurface) { if (fContext) { - GrGLFramebufferInfo fbInfo; + GrBackendRenderTargetDesc desc; + desc.fWidth = this->fWidth; + desc.fHeight = this->fHeight; + desc.fConfig = fPixelConfig; + desc.fOrigin = kBottomLeft_GrSurfaceOrigin; + desc.fSampleCnt = fSampleCount; + desc.fStencilBits = fStencilBits; GrGLint buffer; - GR_GL_CALL(fBackendContext.get(), GetIntegerv(GR_GL_FRAMEBUFFER_BINDING, - &buffer)); - fbInfo.fFBOID = buffer; - - GrBackendRenderTarget backendRT(fWidth, - fHeight, - fSampleCount, - fStencilBits, - fPixelConfig, - fbInfo); - - fSurface = SkSurface::MakeFromBackendRenderTarget(fContext, backendRT, - kBottomLeft_GrSurfaceOrigin, + GR_GL_CALL(fBackendContext.get(), GetIntegerv(GR_GL_FRAMEBUFFER_BINDING, &buffer)); + desc.fRenderTargetHandle = buffer; + + fSurface = SkSurface::MakeFromBackendRenderTarget(fContext, desc, fDisplayParams.fColorSpace, &fSurfaceProps); } -- cgit v1.2.3