Browse Source

fixed GLES3 bug, when "EGL_KHR_create_context" doesn't exist. (#2529)

* fixed gles3 bug

* fixed sdl bug on android platform
simon chen 4 years ago
parent
commit
0b179e59e2
2 changed files with 6 additions and 2 deletions
  1. 5 1
      examples/common/entry/entry_sdl.cpp
  2. 1 1
      src/glcontext_egl.cpp

+ 5 - 1
examples/common/entry/entry_sdl.cpp

@@ -65,10 +65,12 @@ namespace entry
 #		else
 #		else
 		return (void*)wmi.info.x11.window;
 		return (void*)wmi.info.x11.window;
 #		endif
 #		endif
-#	elif BX_PLATFORM_OSX
+#	elif BX_PLATFORM_OSX || BX_PLATFORM_IOS
 		return wmi.info.cocoa.window;
 		return wmi.info.cocoa.window;
 #	elif BX_PLATFORM_WINDOWS
 #	elif BX_PLATFORM_WINDOWS
 		return wmi.info.win.window;
 		return wmi.info.win.window;
+#   elif BX_PLATFORM_ANDROID
+		return wmi.info.android.window;
 #	endif // BX_PLATFORM_
 #	endif // BX_PLATFORM_
 	}
 	}
 
 
@@ -92,6 +94,8 @@ namespace entry
 		pd.ndt          = NULL;
 		pd.ndt          = NULL;
 #	elif BX_PLATFORM_WINDOWS
 #	elif BX_PLATFORM_WINDOWS
 		pd.ndt          = NULL;
 		pd.ndt          = NULL;
+#	elif BX_PLATFORM_ANDROID
+		pd.ndt          = NULL;
 #	endif // BX_PLATFORM_
 #	endif // BX_PLATFORM_
 		pd.nwh          = sdlNativeWindowHandle(_window);
 		pd.nwh          = sdlNativeWindowHandle(_window);
 
 

+ 1 - 1
src/glcontext_egl.cpp

@@ -311,7 +311,7 @@ EGL_IMPORT
 #	endif // BX_PLATFORM_RPI
 #	endif // BX_PLATFORM_RPI
 				{
 				{
 					bx::write(&writer, EGLint(EGL_CONTEXT_CLIENT_VERSION) );
 					bx::write(&writer, EGLint(EGL_CONTEXT_CLIENT_VERSION) );
-					bx::write(&writer, 2);
+					bx::write(&writer, EGLint(gles / 10));
 				}
 				}
 
 
 				bx::write(&writer, EGLint(EGL_NONE) );
 				bx::write(&writer, EGLint(EGL_NONE) );