[Bf-blender-cvs] [5bd7a2c416b] tmp-vulkan: Fix merge conflict. Missing parameter when creating EGLContext.

[Jeroen Bakker]

Commit: 5bd7a2c416b39f4fde69c5fa72ed5f2a15c6410b
Author: Jeroen Bakker
Date:   Tue Jul 6 09:02:29 2021 +0200
Branches: tmp-vulkan
https://developer.blender.org/rB5bd7a2c416b39f4fde69c5fa72ed5f2a15c6410b

Fix merge conflict. Missing parameter when creating EGLContext.

===================================================================

M	intern/ghost/intern/GHOST_SystemX11.cpp

===================================================================

diff --git a/intern/ghost/intern/GHOST_SystemX11.cpp b/intern/ghost/intern/GHOST_SystemX11.cpp
index 5eafa13bb54..38ac90af103 100644
--- a/intern/ghost/intern/GHOST_SystemX11.cpp
+++ b/intern/ghost/intern/GHOST_SystemX11.cpp
@@ -456,7 +456,8 @@ GHOST_IContext *GHOST_SystemX11::createOffscreenContext(GHOST_TDrawingContextTyp
 
     for (int minor = 5; minor >= 0; --minor) {
 #if defined(WITH_GL_EGL)
-      context = new GHOST_ContextEGL(false,
+      context = new GHOST_ContextEGL(this,
+                                     false,
                                      EGLNativeWindowType(nullptr),
                                      EGLNativeDisplayType(m_display),
                                      profile_mask,
@@ -1209,9 +1210,9 @@ void GHOST_SystemX11::processEvent(XEvent *xe)
         else {
           printf("Bad keycode lookup. Keysym 0x%x Status: %s\n",
                  (unsigned int)key_sym,
-                 (status == XLookupNone ?
-                      "XLookupNone" :
-                      status == XLookupKeySym ? "XLookupKeySym" : "Unknown status"));
+                 (status == XLookupNone   ? "XLookupNone" :
+                  status == XLookupKeySym ? "XLookupKeySym" :
+                                            "Unknown status"));
 
           printf("'%.*s' %p %p\n", len, utf8_buf, xic, m_xim);
         }