WebAssembly: Fix GL error when create sampler

Author: halx99

axmol/rhi/opengl/DriverGL.cpp

@@ -277,7 +277,7 @@ SamplerHandle DriverImpl::createSampler(const SamplerDesc& desc)
             return GL_MIRRORED_REPEAT;
         case SamplerAddressMode::CLAMP:
             return GL_CLAMP_TO_EDGE;
-#if defined(GL_CLAMP_TO_BORDER_EXT)
+#if defined(GL_CLAMP_TO_BORDER_EXT) && !defined(__EMSCRIPTEN__)
         case SamplerAddressMode::BORDER:
             return GL_CLAMP_TO_BORDER_EXT;
 #endif
@@ -289,7 +289,7 @@ SamplerHandle DriverImpl::createSampler(const SamplerDesc& desc)
     glSamplerParameteri(sampler, GL_TEXTURE_WRAP_T, toGLWrap(desc.tAddressMode));
     glSamplerParameteri(sampler, GL_TEXTURE_WRAP_R, toGLWrap(desc.wAddressMode));
 
-#if defined(GL_TEXTURE_BORDER_COLOR_EXT)
+#if defined(GL_TEXTURE_BORDER_COLOR_EXT) && !defined(__EMSCRIPTEN__)
     // --- Border color ---
     if (desc.sAddressMode == SamplerAddressMode::BORDER || desc.tAddressMode == SamplerAddressMode::BORDER ||
         desc.wAddressMode == SamplerAddressMode::BORDER)

axmol/rhi/opengl/MacrosGL.h

@@ -29,24 +29,24 @@
 #if !defined(_AX_DEBUG) || _AX_DEBUG == 0
 #    define CHECK_GL_ERROR_DEBUG()
 #else
-#    define CHECK_GL_ERROR_DEBUG()                                                                        \
-        do                                                                                                \
-        {                                                                                                 \
-            GLenum __error = glGetError();                                                                \
-            if (__error)                                                                                  \
-            {                                                                                             \
-                AXLOGE("OpenGL error 0x{:04X} in {} {} {}\n", __error, __FILE__, __FUNCTION__, __LINE__); \
-            }                                                                                             \
+#    define CHECK_GL_ERROR_DEBUG()                                                                         \
+        do                                                                                                 \
+        {                                                                                                  \
+            GLenum __error = glGetError();                                                                 \
+            if (__error)                                                                                   \
+            {                                                                                              \
+                AXLOGE("OpenGL error 0x{:04X} in {}({}) {}\n", __error, __FILE__, __LINE__, __FUNCTION__); \
+            }                                                                                              \
         } while (false)
-#    define CHECK_GL_ERROR_ABORT()                                                                        \
-        do                                                                                                \
-        {                                                                                                 \
-            GLenum __error = glGetError();                                                                \
-            if (__error)                                                                                  \
-            {                                                                                             \
-                AXLOGE("OpenGL error 0x{:04X} in {} {} {}\n", __error, __FILE__, __FUNCTION__, __LINE__); \
-                assert(false);                                                                            \
-            }                                                                                             \
+#    define CHECK_GL_ERROR_ABORT()                                                                         \
+        do                                                                                                 \
+        {                                                                                                  \
+            GLenum __error = glGetError();                                                                 \
+            if (__error)                                                                                   \
+            {                                                                                              \
+                AXLOGE("OpenGL error 0x{:04X} in {}({}) {}\n", __error, __FILE__, __LINE__, __FUNCTION__); \
+                assert(false);                                                                             \
+            }                                                                                              \
         } while (false)
 #endif