From e2d37c2a07f5473e5fc6fb65e9e23e14127580e9 Mon Sep 17 00:00:00 2001 From: Brian Salomon Date: Thu, 20 Jul 2017 10:59:44 -0400 Subject: Remove GrBackendRenderTargetDesc in favor of GrBackendRenderTarget. Also removes a reference to GrBackendTextureDesc in a comment and updates markdown docs. Docs-Preview: https://skia.org/?cl=24861 Bug: skia: Change-Id: Ic6490d5ef46953450e6dee69271397bb2b94d0d6 Reviewed-on: https://skia-review.googlesource.com/24861 Commit-Queue: Brian Salomon Reviewed-by: Robert Phillips --- experimental/SkV8Example/SkV8Example.cpp | 25 +++++++++++-------------- 1 file changed, 11 insertions(+), 14 deletions(-) (limited to 'experimental/SkV8Example') diff --git a/experimental/SkV8Example/SkV8Example.cpp b/experimental/SkV8Example/SkV8Example.cpp index a6a2a7e816..b4a0db633b 100644 --- a/experimental/SkV8Example/SkV8Example.cpp +++ b/experimental/SkV8Example/SkV8Example.cpp @@ -8,13 +8,12 @@ */ #include #include - #include "SkV8Example.h" #include "Global.h" #include "JsContext.h" #include "Path2D.h" #include "Path2DBuilder.h" - +#include "GrBackendSurface.h" #include "gl/GrGLUtil.h" #include "gl/GrGLDefines.h" #include "gl/GrGLInterface.h" @@ -85,19 +84,17 @@ void SkV8ExampleWindow::windowSizeChanged() { exit(1); } - GrBackendRenderTargetDesc desc; - desc.fWidth = SkScalarRoundToInt(this->width()); - desc.fHeight = SkScalarRoundToInt(this->height()); - desc.fConfig = kSkia8888_GrPixelConfig; - desc.fOrigin = kBottomLeft_GrSurfaceOrigin; - desc.fSampleCnt = attachmentInfo.fSampleCount; - desc.fStencilBits = attachmentInfo.fStencilBits; - GrGLint buffer; - GR_GL_GetIntegerv(fCurIntf, GR_GL_FRAMEBUFFER_BINDING, &buffer); - desc.fRenderTargetHandle = buffer; - + GrGLFramebufferInfo framebufferInfo; + GR_GL_GetIntegerv(fCurIntf, GR_GL_FRAMEBUFFER_BINDING, &framebufferInfo.fFBOID); + GrBackendRenderTarget backendRenderTarget(SkScalarRoundToInt(this->width()), + SkScalarRoundToInt(this->height()), + attachmentInfo.fSampleCount, + attachmentInfo.fStencilBits, + kSkia8888_GrPixelConfig, + framebufferInfo); SkSafeUnref(fCurSurface); - fCurSurface = SkSurface::MakeFromBackendRenderTarget(fCurContext, desc, + fCurSurface = SkSurface::MakeFromBackendRenderTarget(fCurContext, backendRenderTarget, + kBottomLeft_GrSurfaceOrigin, nullptr, nullptr).release(); } } -- cgit v1.2.3