display: W/A for OpenGL context version mismatch

Now, VIGS & Qt5 GUI use the OpenGL 3.2 core profile.
Later, we must solve this issue in the right way.
TODO:
- Improve the check GL version related function in VIGS.
- Add check GL version function to the Qt5 GUI.
- Add feature to match the verified GL version of Qt5 GUI and VIGS.

Change-Id: I9d225c69ba9ab55a7b65ff9affa5633ed4462092
Signed-off-by: Jinhyung Jo <jinhyung.jo@samsung.com>

diff --git a/hw/vigs/vigs_gl_backend_glx.c b/hw/vigs/vigs_gl_backend_glx.c
index 8212b88..98e07f7 100644 (file)
--- a/hw/vigs/vigs_gl_backend_glx.c
+++ b/hw/vigs/vigs_gl_backend_glx.c
@@ -129,7 +129,7 @@ static bool vigs_gl_backend_glx_check_gl_version(struct vigs_gl_backend_glx *gl_
     int ctx_attribs[] =
     {
         GLX_CONTEXT_MAJOR_VERSION_ARB, 3,
-        GLX_CONTEXT_MINOR_VERSION_ARB, 1,
+        GLX_CONTEXT_MINOR_VERSION_ARB, 2,
         GLX_RENDER_TYPE, GLX_RGBA_TYPE,
         GLX_CONTEXT_PROFILE_MASK_ARB, GLX_CONTEXT_CORE_PROFILE_BIT_ARB,
         None
@@ -331,7 +331,7 @@ static bool vigs_gl_backend_glx_create_context(struct vigs_gl_backend_glx *gl_ba
     int attribs[] =
     {
         GLX_CONTEXT_MAJOR_VERSION_ARB, 3,
-        GLX_CONTEXT_MINOR_VERSION_ARB, 1,
+        GLX_CONTEXT_MINOR_VERSION_ARB, 2,
         GLX_RENDER_TYPE, GLX_RGBA_TYPE,
         GLX_CONTEXT_PROFILE_MASK_ARB, GLX_CONTEXT_CORE_PROFILE_BIT_ARB,
         None

diff --git a/hw/vigs/vigs_gl_backend_wgl.c b/hw/vigs/vigs_gl_backend_wgl.c
index 9db01a0..7cdfc7f 100644 (file)
--- a/hw/vigs/vigs_gl_backend_wgl.c
+++ b/hw/vigs/vigs_gl_backend_wgl.c
@@ -158,7 +158,7 @@ static bool vigs_gl_backend_wgl_check_gl_version(struct vigs_gl_backend_wgl *gl_
     int ctx_attribs[] =
     {
         WGL_CONTEXT_MAJOR_VERSION_ARB, 3,
-        WGL_CONTEXT_MINOR_VERSION_ARB, 1,
+        WGL_CONTEXT_MINOR_VERSION_ARB, 2,
         WGL_CONTEXT_PROFILE_MASK_ARB, WGL_CONTEXT_CORE_PROFILE_BIT_ARB,
         0
     };
@@ -355,7 +355,7 @@ static bool vigs_gl_backend_wgl_create_context(struct vigs_gl_backend_wgl *gl_ba
     int attribs[] =
     {
         WGL_CONTEXT_MAJOR_VERSION_ARB, 3,
-        WGL_CONTEXT_MINOR_VERSION_ARB, 1,
+        WGL_CONTEXT_MINOR_VERSION_ARB, 2,
         WGL_CONTEXT_PROFILE_MASK_ARB, WGL_CONTEXT_CORE_PROFILE_BIT_ARB,
         0
     };

diff --git a/tizen/src/ui/qt5_supplement.cpp b/tizen/src/ui/qt5_supplement.cpp
index ba7091f..a467866 100644 (file)
--- a/tizen/src/ui/qt5_supplement.cpp
+++ b/tizen/src/ui/qt5_supplement.cpp
@@ -496,7 +496,7 @@ void qt5_early_prepare(bool isOnscreen)
 // This code is W/A to experience,
 // I do not know the exact cause and solution.(IMHO, it is a Qt's bug.)
 // On Mac OS X(macOS), must explicitly usr the OpenGL version, exclude.
-#ifndef CONFIG_DARWIN
+#ifdef CONFIG_WIN32
         if (!isForceLegacy) {
             QSurfaceFormat defFormat = QSurfaceFormat::defaultFormat();
             defFormat.setMajorVersion(2);