commit 4c70c75d0ab6b2924204c6d70e03c6672c4934a4
author Jim Van Verth <jvanverth@google.com> Tue Jul 11 12:03:01 2017 -0400
committer Skia Commit-Bot <skia-commit-bot@chromium.org> Tue Jul 11 16:34:21 2017 +0000
tree c3b02d2c11ecaff90fdde9b9d75169d8c0c5d510
parent 39ef556d7c6ea15f0c6afd7707d338cdfd41084a

Update SkiaSDLExample to latest Ganesh interfaces.

Also updates SDL to 2.0.5.

Change-Id: I3a3c8f69360fc20a3d543c19dcf82dd3f42f1309
Reviewed-on: https://skia-review.googlesource.com/22204
Reviewed-by: Brian Salomon <bsalomon@google.com>
Reviewed-by: Mike Klein <mtklein@google.com>
Commit-Queue: Jim Van Verth <jvanverth@google.com>

example/SkiaSDLExample.cpp

diff --git a/example/SkiaSDLExample.cpp b/example/SkiaSDLExample.cpp
index f3be850..813485f 100644
--- a/example/SkiaSDLExample.cpp
+++ b/example/SkiaSDLExample.cpp
@@ -193,12 +193,12 @@
 
     // Wrap the frame buffer object attached to the screen in a Skia render target so Skia can
     // render to it
-    GrGLFrameBufferInfo fbInfo;
     GrGLint buffer;
-    GR_GL_GetIntegerv(interface, GR_GL_FRAMEBUFFER_BINDING, &buffer);
-    fbInfo.fFBOID = buffer;
-    GrBackendRenderTarget backendRT(dm.w, dm.h, kMsaaSampleCount, kStencilBits,
-                                    kSkia8888_GrPixelConfig, fbInfo);
+    GR_GL_GetIntegerv(interface.get(), GR_GL_FRAMEBUFFER_BINDING, &buffer);
+    GrGLFramebufferInfo info;
+    info.fFBOID = (GrGLuint) buffer;
+    GrBackendRenderTarget target(dm.w, dm.h, kMsaaSampleCount, kStencilBits,
+                                 kSkia8888_GrPixelConfig, info);
 
     // setup SkSurface
     // To use distance field text, use commented out SkSurfaceProps instead
@@ -206,10 +206,9 @@
     //                      SkSurfaceProps::kLegacyFontHost_InitType);
     SkSurfaceProps props(SkSurfaceProps::kLegacyFontHost_InitType);
 
-    sk_sp<SkSurface> surface(SkSurface::MakeFromBackendRenderTarget(grContext,
-                                                                    backendRT,
+    sk_sp<SkSurface> surface(SkSurface::MakeFromBackendRenderTarget(grContext.get(), target,
                                                                     kBottomLeft_GrSurfaceOrigin,
-                                                                    &props));
+                                                                    nullptr, &props));
 
     SkCanvas* canvas = surface->getCanvas();