diff --git a/src/renderer_gl.h b/src/renderer_gl.h
index 4630e5379..0e890a245 100644
--- a/src/renderer_gl.h
+++ b/src/renderer_gl.h
@@ -7,27 +7,27 @@
 #define BGFX_RENDERER_GL_H_HEADER_GUARD
 
 #define BGFX_USE_EGL (BGFX_CONFIG_RENDERER_OPENGLES && (0 \
-			|| BX_PLATFORM_ANDROID \
-			|| BX_PLATFORM_EMSCRIPTEN \
-			|| BX_PLATFORM_LINUX \
-			|| BX_PLATFORM_BSD \
-			|| BX_PLATFORM_QNX \
-			|| BX_PLATFORM_RPI \
-			|| BX_PLATFORM_STEAMLINK \
-			|| BX_PLATFORM_WINDOWS \
-			|| BX_PLATFORM_NX \
+			|| BX_PLATFORM_ANDROID                        \
+			|| BX_PLATFORM_BSD                            \
+			|| BX_PLATFORM_EMSCRIPTEN                     \
+			|| BX_PLATFORM_LINUX                          \
+			|| BX_PLATFORM_NX                             \
+			|| BX_PLATFORM_QNX                            \
+			|| BX_PLATFORM_RPI                            \
+			|| BX_PLATFORM_STEAMLINK                      \
+			|| BX_PLATFORM_WINDOWS                        \
 			) )
 
 #define BGFX_USE_WGL (BGFX_CONFIG_RENDERER_OPENGL && BX_PLATFORM_WINDOWS)
 #define BGFX_USE_GLX (BGFX_CONFIG_RENDERER_OPENGL && (0 \
-			|| BX_PLATFORM_LINUX \
-			|| BX_PLATFORM_BSD \
+			|| BX_PLATFORM_BSD                          \
+			|| BX_PLATFORM_LINUX                        \
 			) )
 
 #define BGFX_USE_GL_DYNAMIC_LIB (0 \
-			|| BX_PLATFORM_LINUX \
-			|| BX_PLATFORM_BSD \
-			|| BX_PLATFORM_OSX \
+			|| BX_PLATFORM_BSD     \
+			|| BX_PLATFORM_LINUX   \
+			|| BX_PLATFORM_OSX     \
 			|| BX_PLATFORM_WINDOWS \
 			)
 
@@ -83,15 +83,17 @@ typedef uint64_t GLuint64;
 #		define GL_HALF_FLOAT GL_HALF_FLOAT_OES
 #		define GL_RGBA8 GL_RGBA8_OES
 #		define GL_UNSIGNED_INT_2_10_10_10_REV GL_UNSIGNED_INT_2_10_10_10_REV_EXT
-#		ifndef BX_PLATFORM_NX
+#		ifndef GL_TEXTURE_3D
 #			define GL_TEXTURE_3D GL_TEXTURE_3D_OES
-#		endif
+#		endif // GL_TEXTURE_3D
 #		define GL_SAMPLER_3D GL_SAMPLER_3D_OES
 #		define GL_TEXTURE_WRAP_R GL_TEXTURE_WRAP_R_OES
-#		ifndef BX_PLATFORM_NX
+#		ifndef GL_MIN
 #			define GL_MIN GL_MIN_EXT
+#		endif // GL_MIN
+#		ifndef GL_MAX
 #			define GL_MAX GL_MAX_EXT
-#		endif
+#		endif // GL_MAX
 #		define GL_DEPTH_COMPONENT24 GL_DEPTH_COMPONENT24_OES
 #		define GL_DEPTH24_STENCIL8 GL_DEPTH24_STENCIL8_OES
 #		define GL_DEPTH_COMPONENT32 GL_DEPTH_COMPONENT32_OES