Remove OpenGL ES 2.0 support (#2633)

* Remove OpenGL ES 2.0 support

* Fix win32 dll link error [skip ci]

Author: halx99

core/CMakeLists.txt

@@ -83,23 +83,17 @@ endif()
 # macos, linux or (win32, ios, tvos) not use GLES profile
 set(_GLES_PROFILE 0) # _GLES_PROFILE is the default GLES profile
 
-if (AX_RENDER_API STREQUAL "gl")
-  if(ANDROID) # android force use GLES profile
-    set(_GLES_PROFILE 200)
-  elseif(WINRT OR WASM) # winuwp/wasm fore use GLES profile
+if(AX_RENDER_API STREQUAL "gl")
+  if(ANDROID OR WINRT OR WASM OR (WINDOWS AND AX_USE_ANGLE) OR IOS OR TVOS)
     set(_GLES_PROFILE 300)
-  elseif((NOT MACOSX) AND(NOT LINUX)) # win32, ios, tvos
-    if((WINDOWS AND AX_USE_ANGLE) OR IOS OR TVOS)
-      set(_GLES_PROFILE 300)
-    endif()
   endif()
 endif()
 
 if(_GLES_PROFILE)
   set(AX_GLES_PROFILE ${_GLES_PROFILE} CACHE STRING "")
 
-  if(NOT(AX_GLES_PROFILE EQUAL 200 OR AX_GLES_PROFILE EQUAL 300))
-    message(FATAL_ERROR "${MACOSX} Invalid GLES profile ${AX_GLES_PROFILE}, must be 200 or 300, default ${_GLES_PROFILE}")
+  if(AX_GLES_PROFILE LESS 300)
+    message(FATAL_ERROR "${MACOSX} Invalid GLES profile ${AX_GLES_PROFILE}, must be 300 or later, default ${_GLES_PROFILE}")
   endif()
 else() # force disable GLES profile
   set(AX_GLES_PROFILE 0 CACHE STRING "" FORCE)

core/math/Mat3.h

@@ -4,11 +4,10 @@
 
 NS_AX_MATH_BEGIN
 
-// both metal and GLSL3/ESSL3 mat3 is identical to mat3x4,
+// both metal, d3d11, gl-3.3, gles-3.0 mat3 in shader is identical to mat3x4,
 // so provide this helper struct to construct mat3 match with GPU
 struct Mat3
 {
-#if AX_GLES_PROFILE != 200
     enum Index
     {
         _M00 = 0,
@@ -21,20 +20,7 @@ struct Mat3
         _M21 = 9,
         _M22 = 10
     };
-#else
-    enum Index
-    {
-        _M00 = 0,
-        _M01 = 1,
-        _M02 = 2,
-        _M10 = 3,
-        _M11 = 4,
-        _M12 = 5,
-        _M20 = 6,
-        _M21 = 7,
-        _M22 = 8
-    };
-#endif
+
     Mat3() = default;
     Mat3(float m00, float m01, float m02, float m10, float m11, float m12, float m20, float m21, float m22)
     {
@@ -57,19 +43,11 @@ struct Mat3
     }
     float* operator[](size_t rowIndex)
     {
-#if AX_GLES_PROFILE != 200
         assert(rowIndex < 3);
         return &m[rowIndex * 4];
-#else
-        assert(rowIndex < 2);
-        return &m[rowIndex * 3];
-#endif
     }
-#if AX_GLES_PROFILE != 200
+
     float m[12] = {};
-#else
-    float m[9] = {};
-#endif
 };
 
 NS_AX_MATH_END

core/platform/PlatformConfig.h

@@ -126,9 +126,9 @@ THE SOFTWARE.
 // render configure
 //////////////////////////////////////////////////////////////////////////
 
-#define AX_RENDER_API_GL    1
-#define AX_RENDER_API_MTL   2
-#define AX_RENDER_API_D3D   3
+#define AX_RENDER_API_GL  1
+#define AX_RENDER_API_MTL 2
+#define AX_RENDER_API_D3D 3
 
 #ifndef AX_RENDER_API
 #    if defined(__APPLE__)
@@ -150,9 +150,9 @@ Linux: Desktop GL/Vulkan
 // mac/iOS/android use system builtin GL/GLES, not ANGLE
 // Windows: use ANGLE GLES
 #ifndef AX_GLES_PROFILE
-#    if defined(__ANDROID__)
-#        define AX_GLES_PROFILE 200
-#    elif (AX_TARGET_PLATFORM == AX_PLATFORM_WINRT)
+#    if defined(__ANDROID__) || defined(_WIN32) || \
+        (AX_RENDER_API == AX_RENDER_API_GL &&      \
+         (AX_TARGET_PLATFORM == AX_PLATFORM_IOS || AX_TARGET_PLATFORM == AX_PLATFORM_TVOS))
 #        define AX_GLES_PROFILE 300
 #    else
 #        define AX_GLES_PROFILE 0

core/renderer/CMakeLists.txt

@@ -80,7 +80,6 @@ if(AX_RENDER_API STREQUAL "gl")
     renderer/backend/opengl/OpenGLState.h
     renderer/backend/opengl/BufferGL.h
     renderer/backend/opengl/CommandBufferGL.h
-    renderer/backend/opengl/CommandBufferGLES2.h
     renderer/backend/opengl/DepthStencilStateGL.h
     renderer/backend/opengl/DriverGL.h
     renderer/backend/opengl/MacrosGL.h
@@ -96,7 +95,6 @@ if(AX_RENDER_API STREQUAL "gl")
     renderer/backend/opengl/OpenGLState.cpp
     renderer/backend/opengl/BufferGL.cpp
     renderer/backend/opengl/CommandBufferGL.cpp
-    renderer/backend/opengl/CommandBufferGLES2.cpp
     renderer/backend/opengl/DepthStencilStateGL.cpp
     renderer/backend/opengl/DriverGL.cpp
     renderer/backend/opengl/ProgramGL.cpp

core/renderer/backend/ProgramManager.h

@@ -151,8 +151,6 @@ class AX_DLL ProgramManager
     static ProgramManager* _sharedProgramManager;  ///< A shared instance of the program cache.
 };
 
-using ProgramCache = ProgramManager;  // for compatible
-
 // end of _backend group
 /// @}
 }

core/renderer/backend/ProgramState.cpp

@@ -266,13 +266,8 @@ void ProgramState::setVertexUniform(int location, const void* data, std::size_t
     if (location < 0 || offset < 0)
         return;
 
-#if AX_GLES_PROFILE != 200
     assert(location + offset + size <= _vertexUniformBufferSize);
     memcpy(_uniformBuffers.data() + location + offset, data, size);
-#else
-    assert(offset + size <= _vertexUniformBufferSize);
-    memcpy(_uniformBuffers.data() + offset, data, size);
-#endif
 }
 
 #if AX_RENDER_API == AX_RENDER_API_MTL || AX_RENDER_API == AX_RENDER_API_D3D

core/renderer/backend/opengl/CommandBufferGL.cpp

@@ -40,7 +40,8 @@
 
 namespace ax::backend {
 
-#if AX_GLES_PROFILE != 200 && AX_TARGET_PLATFORM != AX_PLATFORM_WASM
+// !!Note: WebGL 2.0 on (Open GELS 3.0) not support map buffer range
+#if AX_TARGET_PLATFORM != AX_PLATFORM_WASM
 #    define AX_HAVE_MAP_BUFFER_RANGE 1
 #else
 #    define AX_HAVE_MAP_BUFFER_RANGE 0

core/renderer/backend/opengl/CommandBufferGLES2.cpp

@@ -35,9 +35,6 @@
 #include "RenderTargetGL.h"
 #include "MacrosGL.h"
 #include "renderer/backend/ProgramManager.h"
-#if !defined(__APPLE__) && AX_TARGET_PLATFORM != AX_PLATFORM_WINRT
-#    include "CommandBufferGLES2.h"
-#endif
 
 #include "base/axstd.h"
 #include "base/format.h"
@@ -61,7 +58,6 @@ static inline uint32_t hashString(std::string_view str)
 template <typename _Fty>
 static void GL_EnumAllExtensions(_Fty&& func)
 {
-#if AX_GLES_PROFILE != 200  // NOT GLES2.0
     GLint NumberOfExtensions{0};
     glGetIntegerv(GL_NUM_EXTENSIONS, &NumberOfExtensions);
     for (GLint i = 0; i < NumberOfExtensions; ++i)
@@ -70,16 +66,6 @@ static void GL_EnumAllExtensions(_Fty&& func)
         if (extName)
             func(std::string_view{extName});
     }
-#else
-    auto extensions = (const char*)glGetString(GL_EXTENSIONS);
-    if (extensions)
-    {
-        axstd::split_of_cb(extensions, " \f\n\r\t\v", [&func](const char* start, const char* end, char /*delim*/) {
-            if (start != end)
-                func(std::string_view{start, static_cast<size_t>(end - start)});
-        });
-    }
-#endif
 }
 
 DriverBase* DriverBase::getInstance()
@@ -166,11 +152,9 @@ DriverGL::DriverGL()
 
     glGetIntegerv(GL_FRAMEBUFFER_BINDING, &_defaultFBO);
 
-#if AX_GLES_PROFILE != 200
-    glGenVertexArrays(1, &_defaultVAO);
-    glBindVertexArray(_defaultVAO);
+    resetState();
+
     CHECK_GL_ERROR_DEBUG();
-#endif
 }
 
 DriverGL::~DriverGL()
@@ -185,11 +169,7 @@ GLint DriverGL::getDefaultFBO() const
 
 CommandBuffer* DriverGL::createCommandBuffer(void*)
 {
-#if !defined(__APPLE__) && AX_TARGET_PLATFORM != AX_PLATFORM_WINRT
-    return !isGLES2Only() ? new CommandBufferGL() : new CommandBufferGLES2();
-#else
     return new CommandBufferGL();
-#endif
 }
 
 Buffer* DriverGL::createBuffer(std::size_t size, BufferType type, BufferUsage usage)