From 0b179e59e277c1511d317f389675260ce3431857 Mon Sep 17 00:00:00 2001 From: simon chen Date: Sat, 5 Jun 2021 22:54:14 +0800 Subject: [PATCH] fixed GLES3 bug, when "EGL_KHR_create_context" doesn't exist. (#2529) * fixed gles3 bug * fixed sdl bug on android platform --- examples/common/entry/entry_sdl.cpp | 6 +++++- src/glcontext_egl.cpp | 2 +- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/examples/common/entry/entry_sdl.cpp b/examples/common/entry/entry_sdl.cpp index 512c24971..27a361717 100644 --- a/examples/common/entry/entry_sdl.cpp +++ b/examples/common/entry/entry_sdl.cpp @@ -65,10 +65,12 @@ namespace entry # else return (void*)wmi.info.x11.window; # endif -# elif BX_PLATFORM_OSX +# elif BX_PLATFORM_OSX || BX_PLATFORM_IOS return wmi.info.cocoa.window; # elif BX_PLATFORM_WINDOWS return wmi.info.win.window; +# elif BX_PLATFORM_ANDROID + return wmi.info.android.window; # endif // BX_PLATFORM_ } @@ -92,6 +94,8 @@ namespace entry pd.ndt = NULL; # elif BX_PLATFORM_WINDOWS pd.ndt = NULL; +# elif BX_PLATFORM_ANDROID + pd.ndt = NULL; # endif // BX_PLATFORM_ pd.nwh = sdlNativeWindowHandle(_window); diff --git a/src/glcontext_egl.cpp b/src/glcontext_egl.cpp index d70e25103..3d1df88ba 100644 --- a/src/glcontext_egl.cpp +++ b/src/glcontext_egl.cpp @@ -311,7 +311,7 @@ EGL_IMPORT # endif // BX_PLATFORM_RPI { bx::write(&writer, EGLint(EGL_CONTEXT_CLIENT_VERSION) ); - bx::write(&writer, 2); + bx::write(&writer, EGLint(gles / 10)); } bx::write(&writer, EGLint(EGL_NONE) );