Fix emulator launch crash on MAC

Change-Id: I39ed3e8de118fe462ccbe6683eb397243088943c
Signed-off-by: Karthik Bhat <kv.bhat@samsung.com>

diff --git a/hw/yagl/yagl_drivers/egl_cgl/yagl_egl_cgl.c b/hw/yagl/yagl_drivers/egl_cgl/yagl_egl_cgl.c
index 0f398babde77d77119762a7d9b3b75fae9d80add..90cd0bc332da0178d17f35e01d5ed6d6ef4a94fd 100644 (file)
--- a/hw/yagl/yagl_drivers/egl_cgl/yagl_egl_cgl.c
+++ b/hw/yagl/yagl_drivers/egl_cgl/yagl_egl_cgl.c
@@ -387,14 +387,24 @@ static EGLSurface yagl_egl_cgl_pbuffer_surface_create(struct yagl_egl_driver *dr
                         width,
                         height);
 
-    error = CGLCreatePBuffer(width, height, GL_TEXTURE_2D, GL_RGBA,
-                             0, &pbuffer);
-
-    if (error) {
-        YAGL_LOG_ERROR("CGLCreatePBuffer failed: %s", CGLErrorString(error));
-        pbuffer = NULL;
+    // TODO: Migrate to Metal Framework
+    // CGLCreatePBuffer is deprecated on MAC.
+    // Below hack is to fix Emulator launch issue on MAC.
+    // The surface returned by CGLCreatePBuffer is not used in case of opengl 3.2
+    // Hence return dummy surface in case of opengl 3.2 instead of returning null and exiting.
+    if (driver->gl_version > yagl_gl_2) {
+       YAGL_LOG_INFO("Creating Dummy EGLSurface\n");
+       pbuffer = (EGLSurface)1;
     }
+    else {
+        error = CGLCreatePBuffer(width, height, GL_TEXTURE_2D, GL_RGBA,
+                                0, &pbuffer);
 
+        if (error) {
+            YAGL_LOG_ERROR("CGLCreatePBuffer failed: %s", CGLErrorString(error));
+            pbuffer = NULL;
+        }
+    }
     YAGL_LOG_FUNC_EXIT("%p", pbuffer);
 
     return pbuffer;
@@ -410,11 +420,12 @@ static void yagl_egl_cgl_pbuffer_surface_destroy(struct yagl_egl_driver *driver,
                         "dpy = %p, sfc = %p",
                         dpy,
                         sfc);
+    if (!(driver->gl_version > yagl_gl_2)) {
+        error = CGLDestroyPBuffer((CGLPBufferObj)sfc);
 
-    error = CGLDestroyPBuffer((CGLPBufferObj)sfc);
-
-    if (error) {
-        YAGL_LOG_ERROR("CGLDestroyPBuffer failed: %s", CGLErrorString(error));
+        if (error) {
+            YAGL_LOG_ERROR("CGLDestroyPBuffer failed: %s", CGLErrorString(error));
+        }
     }
 
     YAGL_LOG_FUNC_EXIT(NULL);
@@ -445,7 +456,7 @@ static EGLContext yagl_egl_cgl_context_create(struct yagl_egl_driver *driver,
         share_ctx = NULL;
     }
 
-    if ((egl_cgl->base.gl_version > yagl_gl_2) && (version != 1)) {
+    if (egl_cgl->base.gl_version > yagl_gl_2) {
         ctx->is_3_2_core = true;
     } else {
         ctx->is_3_2_core = false;
@@ -504,7 +515,7 @@ static bool yagl_egl_cgl_make_current(struct yagl_egl_driver *driver,
                         draw,
                         read,
                         ctx);
-
+    // Call CGLSetPBuffer only in case a valid CGLCreatePBuffer is created.
     if (cgl_ctx && !cgl_ctx->is_3_2_core) {
         if (read_pbuffer) {
             error = CGLSetPBuffer(cgl_ctx->base, read_pbuffer, 0, 0, 0);

diff --git a/package/changelog b/package/changelog
index c25b31e10265ed3ecf17cf3441ce2d2c194623f3..71f4b9ecd53871afc568c99f69f84cab8c8de5aa 100644 (file)
--- a/package/changelog
+++ b/package/changelog
@@ -1,3 +1,6 @@
+* 2.8.0.28
+- YAGL: Fix emulator launch fail on MAC
+== Karthik Bhat <kv.bhat@samsung.com> 2019-05-07
 * 2.8.0.23
 - MAC build error resolved
 == Rahul Dadhich <r.dadhich@samsung.com> 2018-11-30

diff --git a/package/pkginfo.manifest b/package/pkginfo.manifest
index cada94ff325a1e68ca20d0e3b1a76802f8f8aad1..ebac829be1428a71b90b43243689446170f8dcb3 100644 (file)
--- a/package/pkginfo.manifest
+++ b/package/pkginfo.manifest
@@ -1,4 +1,4 @@
-Version: 2.8.0.23
+Version: 2.8.0.24
 Maintainer: SeokYeon Hwang <syeon.hwang@samsung.com>
 Source: emulator