diff options
author | Brian Salomon <bsalomon@google.com> | 2017-07-20 10:59:44 -0400 |
---|---|---|
committer | Skia Commit-Bot <skia-commit-bot@chromium.org> | 2017-07-20 20:28:57 +0000 |
commit | e2d37c2a07f5473e5fc6fb65e9e23e14127580e9 (patch) | |
tree | e8f06cc14b5c993504c043757164d09ed243d151 /experimental | |
parent | dba7e7ccfbab1c99b8a3f81156cecdb630d7d03a (diff) |
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 <bsalomon@google.com>
Reviewed-by: Robert Phillips <robertphillips@google.com>
Diffstat (limited to 'experimental')
-rw-r--r-- | experimental/GLFWTest/glfw_main.cpp | 28 | ||||
-rw-r--r-- | experimental/SkV8Example/SkV8Example.cpp | 25 |
2 files changed, 25 insertions, 28 deletions
diff --git a/experimental/GLFWTest/glfw_main.cpp b/experimental/GLFWTest/glfw_main.cpp index 63ea1f1d9f..34fbd4ed55 100644 --- a/experimental/GLFWTest/glfw_main.cpp +++ b/experimental/GLFWTest/glfw_main.cpp @@ -5,12 +5,11 @@ * found in the LICENSE file. */ -#include "GLFW/glfw3.h" #include <stdlib.h> #include <stdio.h> - +#include "GLFW/glfw3.h" +#include "GrBackendSurface.h" #include "GrContext.h" - #include "SkCanvas.h" #include "SkImage.h" #include "SkRSXform.h" @@ -32,17 +31,18 @@ static void key_callback(GLFWwindow* window, int key, int scancode, int action, static void init_skia(int w, int h) { sContext = GrContext::Create(kOpenGL_GrBackend, 0); - - GrBackendRenderTargetDesc desc; - desc.fWidth = w; - desc.fHeight = h; - desc.fConfig = kSkia8888_GrPixelConfig; - desc.fOrigin = kBottomLeft_GrSurfaceOrigin; - desc.fSampleCnt = 1; - desc.fStencilBits = 0; - desc.fRenderTargetHandle = 0; // assume default framebuffer - - sSurface = SkSurface::MakeFromBackendRenderTarget(sContext, desc, nullptr, nullptr).release(); + + GrGLFramebufferInfo framebufferInfo; + framebufferInfo.fFBOID = 0; // assume default framebuffer + GrBackendRenderTarget backendRenderTarget(w, h, + 0, // sample count + 0, // stencil bits + kSkia8888_GrPixelConfig, + framebufferInfo); + + sSurface = SkSurface::MakeFromBackendRenderTarget(sContext, backendRenderTarget, + kBottomLeft_GrSurfaceOrigin, + nullptr, nullptr).release(); } static void cleanup_skia() { 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 <v8.h> #include <include/libplatform/libplatform.h> - #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(); } } |