diff --git a/Texture.cpp b/Texture.cpp
index 965d0d51..ea6a6987 100644
--- a/Texture.cpp
+++ b/Texture.cpp
@@ -1123,7 +1123,7 @@ opengl_texture::alloc_rendertarget( GLint format, GLint components, int width, i
     wrap_mode_s = wrap;
     wrap_mode_t = wrap;
     samples = s;
-    if( Global.gfx_usegles && !GLAD_GL_ES_VERSION_3_1 ) {
+    if( Global.gfx_usegles && !glTexStorage2DMultisample ) {
         samples = 1;
     }
     layers = l;
diff --git a/opengl33geometrybank.cpp b/opengl33geometrybank.cpp
index 1b721f75..62ff4f47 100644
--- a/opengl33geometrybank.cpp
+++ b/opengl33geometrybank.cpp
@@ -133,7 +133,7 @@ opengl33_vaogeometrybank::draw_( gfx::geometry_handle const &Geometry, gfx::stre
     }
     // render
     if( chunkrecord.index_count > 0 ) {
-        if (GLAD_GL_VERSION_3_3 || GLAD_GL_ES_VERSION_3_2) {
+        if (glDrawRangeElementsBaseVertex) {
             m_vao->bind();
             ::glDrawRangeElementsBaseVertex(
                 chunk.type,
@@ -141,7 +141,7 @@ opengl33_vaogeometrybank::draw_( gfx::geometry_handle const &Geometry, gfx::stre
                 chunkrecord.index_count, GL_UNSIGNED_INT, reinterpret_cast<void const *>( chunkrecord.index_offset * sizeof( gfx::basic_index ) ),
                 chunkrecord.vertex_offset );
         }
-        else if (GLAD_GL_OES_draw_elements_base_vertex) {
+        else if (glDrawElementsBaseVertexOES) {
             m_vao->bind();
             ::glDrawElementsBaseVertexOES(
                 chunk.type,
diff --git a/openglgeometrybank.cpp b/openglgeometrybank.cpp
index c1a7ca0a..ace1b78a 100644
--- a/openglgeometrybank.cpp
+++ b/openglgeometrybank.cpp
@@ -83,7 +83,7 @@ opengl_vbogeometrybank::draw_( gfx::geometry_handle const &Geometry, gfx::stream
             chunkrecord.index_count, GL_UNSIGNED_INT, reinterpret_cast<void const *>( chunkrecord.index_offset * sizeof( gfx::basic_index ) ),
             chunkrecord.vertex_offset );
 */
-        if (GLAD_GL_VERSION_3_2 || GLAD_GL_ARB_draw_elements_base_vertex) {
+        if (glDrawRangeElementsBaseVertex) {
             if( m_activestreams != Streams ) {
                 bind_streams( Units, Streams );
             }