add EGL to win32

modules/game/gameinterface.lua

@@ -259,7 +259,7 @@ function GameInterface.createThingMenu(menuPosition, lookThing, useThing, creatu
             if creatureShield == ShieldWhiteBlue then
               menu:addOption(tr('Revoke %s\'s Invitation', creatureThing:getName()), function() g_game.partyRevokeInvitation(creatureThing:getId()) end)
             elseif creatureShield == ShieldBlue or creatureShield == ShieldBlueSharedExp or creatureShield == ShieldBlueNoSharedExpBlink or creatureShield == ShieldBlueNoSharedExp then
-              menu:addOption(tr('Pass Leadership to %s'), function() g_game.partyPassLeadership(creatureThing:getId()) end)
+              menu:addOption(tr('Pass Leadership to %s', creatureThing:getName()), function() g_game.partyPassLeadership(creatureThing:getId()) end)
             else
               menu:addOption(tr('Invite to Party'), function() g_game.partyInvite(creatureThing:getId()) end)
             end

src/framework/cmake/FindEGL.cmake

@@ -4,7 +4,7 @@
 #  EGL_LIBRARY - the EGL library
 
 FIND_PATH(EGL_INCLUDE_DIR NAMES EGL/egl.h)
-FIND_LIBRARY(EGL_LIBRARY NAMES EGL)
+FIND_LIBRARY(EGL_LIBRARY NAMES EGL.dll EGL)
 INCLUDE(FindPackageHandleStandardArgs)
 FIND_PACKAGE_HANDLE_STANDARD_ARGS(EGL DEFAULT_MSG EGL_LIBRARY EGL_INCLUDE_DIR)
 MARK_AS_ADVANCED(EGL_LIBRARY EGL_INCLUDE_DIR)

src/framework/cmake/FindOpenGLES1.cmake

@@ -4,7 +4,7 @@
 #  OPENGLES1_LIBRARY - the OpenGL ES 1.0 library
 
 FIND_PATH(OPENGLES1_INCLUDE_DIR NAMES GLES/gl.h)
-FIND_LIBRARY(OPENGLES1_LIBRARY NAMES GLESv1_CM GLES_CM)
+FIND_LIBRARY(OPENGLES1_LIBRARY NAMES GLESv1_CM.dll GLES_CM.dll GLESv1_CM GLES_CM)
 INCLUDE(FindPackageHandleStandardArgs)
 FIND_PACKAGE_HANDLE_STANDARD_ARGS(OpenGLES2 DEFAULT_MSG OPENGLES1_LIBRARY OPENGLES1_INCLUDE_DIR)
 MARK_AS_ADVANCED(OPENGLES1_LIBRARY OPENGLES1_INCLUDE_DIR)

src/framework/cmake/FindOpenGLES2.cmake

@@ -4,7 +4,7 @@
 #  OPENGLES2_LIBRARY - the OpenGL ES 2.0 library
 
 FIND_PATH(OPENGLES2_INCLUDE_DIR NAMES GLES2/gl2.h)
-FIND_LIBRARY(OPENGLES2_LIBRARY NAMES GLESv2)
+FIND_LIBRARY(OPENGLES2_LIBRARY NAMES GLESv2.dll GLESv2)
 INCLUDE(FindPackageHandleStandardArgs)
 FIND_PACKAGE_HANDLE_STANDARD_ARGS(OpenGLES2 DEFAULT_MSG OPENGLES2_LIBRARY OPENGLES2_INCLUDE_DIR)
 MARK_AS_ADVANCED(OPENGLES2_LIBRARY OPENGLES2_INCLUDE_DIR)

src/framework/platform/win32window.cpp

@@ -33,10 +33,18 @@ WIN32Window::WIN32Window()
     m_window = 0;
     m_instance = 0;
     m_deviceContext = 0;
-    m_glContext = 0;
     m_cursor = 0;
     m_minimumSize = Size(600,480);
 
+#ifdef OPENGL_ES
+    m_eglConfig = 0;
+    m_eglContext = 0;
+    m_eglDisplay = 0;
+    m_eglSurface = 0;
+#else
+    m_wglContext = 0;
+#endif
+
     m_keyMap[VK_ESCAPE] = Fw::KeyEscape;
     m_keyMap[VK_TAB] = Fw::KeyTab;
     m_keyMap[VK_RETURN] = Fw::KeyEnter;
@@ -194,20 +202,16 @@ void WIN32Window::init()
     m_instance = GetModuleHandle(NULL);
 
     internalRegisterWindowClass();
+    internalCheckGL();
     internalCreateWindow();
     internalChooseGLVisual();
     internalCreateGLContext();
+    internalConnectGLContext();
 }
 
 void WIN32Window::terminate()
 {
-    if(m_glContext) {
+    internalDestroyGLContext();
-        if(!wglMakeCurrent(NULL, NULL))
-            g_logger.error("Release of dc and rc failed.");
-        if(!wglDeleteContext(m_glContext))
-            g_logger.error("Release rendering context failed.");
-        m_glContext = NULL;
-    }
 
     if(m_deviceContext) {
         if(!ReleaseDC(m_window, m_deviceContext))
@@ -295,8 +299,41 @@ void WIN32Window::internalCreateWindow()
         g_logger.fatal("GetDC failed");
 }
 
+void WIN32Window::internalCheckGL()
+{
+#ifdef OPENGL_ES
+    m_eglDisplay = eglGetDisplay(GetDC(m_window));
+    if(m_eglDisplay == EGL_NO_DISPLAY)
+        g_logger.fatal("EGL not supported");
+
+    if(!eglInitialize(m_eglDisplay, NULL, NULL))
+        g_logger.fatal("Unable to initialize EGL");
+#endif
+}
+
 void WIN32Window::internalChooseGLVisual()
 {
+#ifdef OPENGL_ES
+    static int attrList[] = {
+#if OPENGL_ES==2
+        EGL_RENDERABLE_TYPE, EGL_OPENGL_ES2_BIT,
+#else
+        EGL_RENDERABLE_TYPE, EGL_OPENGL_ES_BIT,
+#endif
+        EGL_RED_SIZE, 5,
+        EGL_GREEN_SIZE, 6,
+        EGL_BLUE_SIZE, 5,
+        EGL_NONE
+    };
+
+    EGLint numConfig;
+
+    if(!eglChooseConfig(m_eglDisplay, attrList, &m_eglConfig, 1, &numConfig))
+        g_logger.fatal("Failed to choose EGL config");
+
+    if(numConfig != 1)
+        g_logger.warning("Didn't got the exact EGL config");
+#else
     uint pixelFormat;
     static PIXELFORMATDESCRIPTOR pfd = { sizeof(PIXELFORMATDESCRIPTOR),
                                          1,
@@ -321,19 +358,76 @@ void WIN32Window::internalChooseGLVisual()
 
     if(!SetPixelFormat(m_deviceContext, pixelFormat, &pfd))
         g_logger.fatal("Could not set the pixel format");
+#endif
 }
 
 void WIN32Window::internalCreateGLContext()
 {
-    if(!(m_glContext = wglCreateContext(m_deviceContext)))
+#ifdef OPENGL_ES
+    EGLint attrList[] = {
+#if OPENGL_ES==2
+        EGL_CONTEXT_CLIENT_VERSION, 2,
+#else
+        EGL_CONTEXT_CLIENT_VERSION, 1,
+#endif
+        EGL_NONE, EGL_NONE
+    };
+
+    m_eglContext = eglCreateContext(m_eglDisplay, m_eglConfig, EGL_NO_CONTEXT, attrList);
+    if(m_eglContext == EGL_NO_CONTEXT )
+        g_logger.fatal(stdext::format("Unable to create EGL context: %s", eglGetError()));
+#else
+    if(!(m_wglContext = wglCreateContext(m_deviceContext)))
         g_logger.fatal("Unable to create GL context");
 
-    if(!wglMakeCurrent(m_deviceContext, m_glContext))
+    if(!wglMakeCurrent(m_deviceContext, m_wglContext))
         g_logger.fatal("Unable to set GLX context on WIN32 window");
+#endif
+}
+
+void WIN32Window::internalDestroyGLContext()
+{
+#ifdef OPENGL_ES
+    if(m_eglDisplay) {
+        if(m_eglContext) {
+            eglDestroyContext(m_eglDisplay, m_eglContext);
+            m_eglContext = 0;
+        }
+        if(m_eglSurface) {
+            eglDestroySurface(m_eglDisplay, m_eglSurface);
+            m_eglSurface = 0;
+        }
+        eglTerminate(m_eglDisplay);
+        m_eglDisplay = 0;
+    }
+#else
+    if(m_wglContext) {
+        if(!wglMakeCurrent(NULL, NULL))
+            g_logger.error("Release of dc and rc failed.");
+        if(!wglDeleteContext(m_wglContext))
+            g_logger.error("Release rendering context failed.");
+        m_wglContext = NULL;
+    }
+#endif
+}
+
+void WIN32Window::internalConnectGLContext()
+{
+#ifdef OPENGL_ES
+    m_eglSurface = eglCreateWindowSurface(m_eglDisplay, m_eglConfig, m_window, NULL);
+    if(m_eglSurface == EGL_NO_SURFACE)
+        g_logger.fatal(stdext::format("Unable to create EGL surface: %s", eglGetError()));
+    if(!eglMakeCurrent(m_eglDisplay, m_eglSurface, m_eglSurface, m_eglContext))
+        g_logger.fatal("Unable to connect EGL context into X11 window");
+#endif
 }
 
 bool WIN32Window::isExtensionSupported(const char *ext)
 {
+#ifdef OPENGL_ES
+    //TODO
+    return false;
+#else
     typedef const char* (WINAPI * wglGetExtensionsStringProc)();
     wglGetExtensionsStringProc wglGetExtensionsString = (wglGetExtensionsStringProc)getExtensionProcAddress("wglGetExtensionsStringEXT");
     if(!wglGetExtensionsString)
@@ -344,11 +438,17 @@ bool WIN32Window::isExtensionSupported(const char *ext)
         return true;
 
     return false;
+#endif
 }
 
 void *WIN32Window::getExtensionProcAddress(const char *ext)
 {
+#ifdef OPENGL_ES
+    //TODO
+    return NULL;
+#else
     return (void*)wglGetProcAddress(ext);
+#endif
 }
 
 void WIN32Window::move(const Point& pos)
@@ -755,6 +855,9 @@ void WIN32Window::setFullscreen(bool fullscreen)
 
 void WIN32Window::setVerticalSync(bool enable)
 {
+#ifdef OPENGL_ES
+    //TODO
+#else
     if(!isExtensionSupported("WGL_EXT_swap_control"))
         return;
 
@@ -764,6 +867,7 @@ void WIN32Window::setVerticalSync(bool enable)
         return;
 
     wglSwapInterval(enable ? 1 : 0);
+#endif
 }
 
 void WIN32Window::setIcon(const std::string& pngIcon)
@@ -854,5 +958,9 @@ std::string WIN32Window::getClipboardText()
 
 std::string WIN32Window::getPlatformType()
 {
+#ifdef OPENGL_ES
     return "WIN32-WGL";
+#else
+    return "WIN32-EGL";
+#endif
 }

src/framework/platform/win32window.h

@@ -27,6 +27,10 @@
 
 #include <windows.h>
 
+#ifdef OPENGL_ES
+#include <EGL/egl.h>
+#endif
+
 struct WindowProcProxy;
 
 class WIN32Window : public PlatformWindow
@@ -34,8 +38,11 @@ class WIN32Window : public PlatformWindow
     void internalCreateWindow();
     void internalRegisterWindowClass();
 
+    void internalCheckGL();
     void internalChooseGLVisual();
     void internalCreateGLContext();
+    void internalDestroyGLContext();
+    void internalConnectGLContext();
 
     void *getExtensionProcAddress(const char *ext);
     bool isExtensionSupported(const char *ext);
@@ -79,10 +86,18 @@ private:
     HWND m_window;
     HINSTANCE m_instance;
     HDC m_deviceContext;
-    HGLRC m_glContext;
     HCURSOR m_cursor;
     HCURSOR m_defaultCursor;
     Size m_minimumSize;
+
+#ifdef OPENGL_ES
+    EGLConfig m_eglConfig;
+    EGLContext m_eglContext;
+    EGLDisplay m_eglDisplay;
+    EGLSurface m_eglSurface;
+#else
+    HGLRC m_wglContext;
+#endif
 };
 
 #endif