CGL/EAGL: Fix default FBO size on Retina displays

This was found while trying to fix https://github.com/glfw/glfw/issues/1169 VulkanSurfaceMtl and metal/SurfaceMtl already handle contentsScale correctly. Change-Id: I234d7b0901dd7c075cf1e9d58466f52140ab1e2b Bug: None Reviewed-on: https://chromium-review.googlesource.com/c/angle/angle/+/2154670Reviewed-by: Jonah Ryan-Davis <jonahr@google.com> Reviewed-by: Geoff Lang <geofflang@chromium.org> Commit-Queue: Corentin Wallez <cwallez@chromium.org>

CGL/EAGL: Fix default FBO size on Retina displays
902b5587 · Corentin Wallez · Commit Bot · 4a1d9226 · 902b5587 · 902b5587
Commit 902b5587 authored Apr 19, 2020 by Corentin Wallez Committed by Commit Bot Apr 21, 2020
Hide whitespace changes
Inline Side-by-side

Showing with 6 additions and 4 deletions

WindowSurfaceCGL.mm src/libANGLE/renderer/gl/cgl/WindowSurfaceCGL.mm +3 -2

WindowSurfaceEAGL.mm src/libANGLE/renderer/gl/eagl/WindowSurfaceEAGL.mm +3 -2

No files found.
--- a/src/libANGLE/renderer/gl/cgl/WindowSurfaceCGL.mm
+++ b/src/libANGLE/renderer/gl/cgl/WindowSurfaceCGL.mm
@@ -212,6 +212,7 @@ egl::Error WindowSurfaceCGL::initialize(const egl::Display *display)
                                               withContext:mContext
                                             withFunctions:mFunctions];
    [mLayer addSublayer:mSwapLayer];
+    [mSwapLayer setContentsScale:[mLayer contentsScale]];

    mFunctions->genRenderbuffers(1, &mDSRenderbuffer);
    mStateManager->bindRenderbuffer(GL_RENDERBUFFER, mDSRenderbuffer);
@@ -301,12 +302,12 @@ void WindowSurfaceCGL::setSwapInterval(EGLint interval)

 EGLint WindowSurfaceCGL::getWidth() const
 {
-    return (EGLint)CGRectGetWidth([mLayer frame]);
+    return static_cast<EGLint>(CGRectGetWidth([mLayer frame]) * [mLayer contentsScale]);
 }

 EGLint WindowSurfaceCGL::getHeight() const
 {
-    return (EGLint)CGRectGetHeight([mLayer frame]);
+    return static_cast<EGLint>(CGRectGetHeight([mLayer frame]) * [mLayer contentsScale]);
 }

 EGLint WindowSurfaceCGL::isPostSubBufferSupported() const

--- a/src/libANGLE/renderer/gl/eagl/WindowSurfaceEAGL.mm
+++ b/src/libANGLE/renderer/gl/eagl/WindowSurfaceEAGL.mm
@@ -177,6 +177,7 @@ egl::Error WindowSurfaceEAGL::initialize(const egl::Display *display)
                                               withContext:mContext
                                             withFunctions:mFunctions];
    [mLayer addSublayer:mSwapLayer];
+    [mSwapLayer setContentsScale:[mLayer contentsScale]];

    mFunctions->genRenderbuffers(1, &mDSRenderbuffer);
    mStateManager->bindRenderbuffer(GL_RENDERBUFFER, mDSRenderbuffer);
@@ -266,12 +267,12 @@ void WindowSurfaceEAGL::setSwapInterval(EGLint interval)

 EGLint WindowSurfaceEAGL::getWidth() const
 {
-    return (EGLint)CGRectGetWidth([mLayer frame]);
+    return static_cast<EGLint>(CGRectGetWidth([mLayer frame]) * [mLayer contentsScale]);
 }

 EGLint WindowSurfaceEAGL::getHeight() const
 {
-    return (EGLint)CGRectGetHeight([mLayer frame]);
+    return static_cast<EGLint>(CGRectGetHeight([mLayer frame]) * [mLayer contentsScale]);
 }

 EGLint WindowSurfaceEAGL::isPostSubBufferSupported() const