diff options
Diffstat (limited to 'experimental')
| -rw-r--r-- | experimental/GLFWTest/glfw_main.cpp | 28 | ||||
| -rw-r--r-- | experimental/SkV8Example/SkV8Example.cpp | 25 |
2 files changed, 28 insertions, 25 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() { diff --git a/experimental/SkV8Example/SkV8Example.cpp b/experimental/SkV8Example/SkV8Example.cpp index b4a0db633b..a6a2a7e816 100644 --- a/experimental/SkV8Example/SkV8Example.cpp +++ b/experimental/SkV8Example/SkV8Example.cpp @@ -8,12 +8,13 @@ */ #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" @@ -84,17 +85,19 @@ void SkV8ExampleWindow::windowSizeChanged() { exit(1); } - 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); + 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; + SkSafeUnref(fCurSurface); - fCurSurface = SkSurface::MakeFromBackendRenderTarget(fCurContext, backendRenderTarget, - kBottomLeft_GrSurfaceOrigin, + fCurSurface = SkSurface::MakeFromBackendRenderTarget(fCurContext, desc, nullptr, nullptr).release(); } } |