commit 2259bd42cf7cede7c1196d10f1a5a68180c94a32
author Jim Van Verth <jvanverth@google.com> Fri Sep 01 14:49:09 2017 -0400
committer Skia Commit-Bot <skia-commit-bot@chromium.org> Tue Sep 05 20:34:55 2017 +0000
tree 646898191f4e854c12d890f81982243069e2a7ae
parent 6f98bc648b1bb4928bf7011ee1d92eacc0db23bb

More iOS Fixes for SkiaSDLExample.

Fixes up resolution and sets up ES context properly.

Change-Id: I660098905f0d3643b0c7392808833ab564dbd447
Reviewed-on: https://skia-review.googlesource.com/42122
Reviewed-by: Ethan Nicholas <ethannicholas@google.com>
Commit-Queue: Jim Van Verth <jvanverth@google.com>

example/SkiaSDLExample.cpp

diff --git a/example/SkiaSDLExample.cpp b/example/SkiaSDLExample.cpp
index 6525411..3878cc7 100644
--- a/example/SkiaSDLExample.cpp
+++ b/example/SkiaSDLExample.cpp
@@ -113,8 +113,8 @@
     SDL_GL_SetAttribute(SDL_GL_CONTEXT_MINOR_VERSION, 0);
 
     SDL_GLContext glContext = nullptr;
-#if defined(SK_BUILD_FOR_ANDROID)
-    // For Android we need to set up for OpenGL ES and we make the window hi res & full screen
+#if defined(SK_BUILD_FOR_ANDROID) || defined(SK_BUILD_FOR_IOS)
+    // For Android/iOS we need to set up for OpenGL ES and we make the window hi res & full screen
     SDL_GL_SetAttribute(SDL_GL_CONTEXT_PROFILE_MASK, SDL_GL_CONTEXT_PROFILE_ES);
     windowFlags = SDL_WINDOW_OPENGL | SDL_WINDOW_RESIZABLE |
                   SDL_WINDOW_BORDERLESS | SDL_WINDOW_FULLSCREEN_DESKTOP |
@@ -180,7 +180,10 @@
         return success;
     }
 
-    glViewport(0, 0, dm.w, dm.h);
+    int dw, dh;
+    SDL_GL_GetDrawableSize(window, &dw, &dh);
+
+    glViewport(0, 0, dw, dh);
     glClearColor(1, 1, 1, 1);
     glClearStencil(0);
     glClear(GL_COLOR_BUFFER_BIT | GL_STENCIL_BUFFER_BIT);
@@ -198,7 +201,7 @@
     GR_GL_GetIntegerv(interface.get(), GR_GL_FRAMEBUFFER_BINDING, &buffer);
     GrGLFramebufferInfo info;
     info.fFBOID = (GrGLuint) buffer;
-    GrBackendRenderTarget target(dm.w, dm.h, kMsaaSampleCount, kStencilBits,
+    GrBackendRenderTarget target(dw, dh, kMsaaSampleCount, kStencilBits,
                                  kSkia8888_GrPixelConfig, info);
 
     // setup SkSurface
@@ -212,6 +215,7 @@
                                                                     nullptr, &props));
 
     SkCanvas* canvas = surface->getCanvas();
+    canvas->scale((float)dw/dm.w, (float)dh/dm.h);
 
     ApplicationState state;