diff options
author | Brian Salomon <bsalomon@google.com> | 2017-07-20 20:48:12 +0000 |
---|---|---|
committer | Skia Commit-Bot <skia-commit-bot@chromium.org> | 2017-07-20 20:48:23 +0000 |
commit | 807371c15bd742efb98a9df6e1dee73e8bda8af5 (patch) | |
tree | 3fd563c6347d5948e3a1410adffdf46492bdbd4a /experimental/GLFWTest/glfw_main.cpp | |
parent | 3b59af5bf88920515835c79fe07c302438dc8e55 (diff) |
Revert "Remove GrBackendRenderTargetDesc in favor of GrBackendRenderTarget."
This reverts commit e2d37c2a07f5473e5fc6fb65e9e23e14127580e9.
Reason for revert: <INSERT REASONING HERE>
Original change's description:
> 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>
TBR=egdaniel@google.com,bsalomon@google.com,robertphillips@google.com
Change-Id: I4b85b529727f0bf5aec21d87e725a8195666e2e5
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Bug: skia:
Reviewed-on: https://skia-review.googlesource.com/25182
Reviewed-by: Brian Salomon <bsalomon@google.com>
Commit-Queue: Brian Salomon <bsalomon@google.com>
Diffstat (limited to 'experimental/GLFWTest/glfw_main.cpp')
-rw-r--r-- | experimental/GLFWTest/glfw_main.cpp | 28 |
1 files changed, 14 insertions, 14 deletions
diff --git a/experimental/GLFWTest/glfw_main.cpp b/experimental/GLFWTest/glfw_main.cpp index 34fbd4ed55..63ea1f1d9f 100644 --- a/experimental/GLFWTest/glfw_main.cpp +++ b/experimental/GLFWTest/glfw_main.cpp @@ -5,11 +5,12 @@ * 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" @@ -31,18 +32,17 @@ 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); - - 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(); + + 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(); } static void cleanup_skia() { |