opengl error fixes

Globals.cpp

@@ -371,6 +371,7 @@ global_settings::ConfigParse(cParser &Parser) {
                 GfxRenderer = "default";
             }
             BasicRenderer = ( GfxRenderer == "simple" );
+            LegacyRenderer = ( GfxRenderer != "default" );
         }
         else if( token == "shadows" ) {
             // shadow render toggle
@@ -728,8 +729,11 @@ global_settings::ConfigParse(cParser &Parser) {
 #endif
 		else if (token == "compresstex") {
             Parser.getTokens( 1 );
+            if( false == gfx_usegles ) {
+                // ogl es use requires compression to be disabled
                 Parser >> compress_tex;
             }
+		}
         else if (token == "gfx.framebuffer.width")
         {
             Parser.getTokens(1, false);
@@ -813,18 +817,22 @@ global_settings::ConfigParse(cParser &Parser) {
             Parser.getTokens(1);
             Parser >> gfx_extraeffects;
         }
-/*
+        /*
         else if (token == "gfx.usegles")
         {
             Parser.getTokens(1);
             Parser >> gfx_usegles;
+            if( true == gfx_usegles ) {
+                compress_tex = false;
+                gfx_shadergamma = true;
+            }
         }
-*/
         else if (token == "gfx.shadergamma")
         {
             Parser.getTokens(1);
             Parser >> gfx_shadergamma;
         }
+        */
         else if (token == "python.mipmaps")
 		{
 			Parser.getTokens(1);

Globals.h

@@ -113,6 +113,7 @@ struct global_settings {
     int DynamicLightCount{ 3 };
     bool ScaleSpecularValues{ true };
     std::string GfxRenderer{ "default" };
+    bool LegacyRenderer{ false };
     bool BasicRenderer{ false };
     bool RenderShadows{ true };
     int RenderCabShadowsRange{ 0 };

Texture.cpp

@@ -826,8 +826,10 @@ opengl_texture::create() {
             if (data_components == GL_DEPTH_COMPONENT)
             {
 				glTexParameteri(target, GL_TEXTURE_COMPARE_MODE, GL_COMPARE_REF_TO_TEXTURE);
+                if( false == Global.gfx_usegles ) {
                     float borderColor[] = { 0.0f, 0.0f, 0.0f, 0.0f };
-				glTexParameterfv(target, GL_TEXTURE_BORDER_COLOR, borderColor);
+                    glTexParameterfv( target, GL_TEXTURE_BORDER_COLOR, borderColor );
+                }
 			}
 
             if (Global.gfx_usegles)
@@ -1026,7 +1028,7 @@ opengl_texture::set_filtering() const {
         ::glTexParameterf( GL_TEXTURE_2D, GL_TEXTURE_MAX_ANISOTROPY_EXT, Global.AnisotropicFiltering );
     }
 
-    if( false == Global.gfx_usegles ) {
+    if( Global.LegacyRenderer ) {
 
         bool sharpen{ false };
         for( auto const &trait : traits ) {
@@ -1040,11 +1042,11 @@ opengl_texture::set_filtering() const {
 
         if( true == sharpen ) {
             // #: sharpen more
-            ::glTexEnvf( GL_TEXTURE_FILTER_CONTROL, GL_TEXTURE_LOD_BIAS, -2.0 );
+            ::glTexEnvf( GL_TEXTURE_FILTER_CONTROL, GL_TEXTURE_LOD_BIAS, -2.0f );
         }
         else {
             // regular texture sharpening
-            ::glTexEnvf( GL_TEXTURE_FILTER_CONTROL, GL_TEXTURE_LOD_BIAS, -1.0 );
+            ::glTexEnvf( GL_TEXTURE_FILTER_CONTROL, GL_TEXTURE_LOD_BIAS, -1.0f );
         }
     }
 }

Texture.h

@@ -36,7 +36,7 @@ struct opengl_texture {
     void
         release();
     void
-        alloc_rendertarget( GLint format, GLint components, int width, int height, int samples = 1, GLint wrap = GL_CLAMP_TO_BORDER );
+        alloc_rendertarget( GLint format, GLint components, int width, int height, int samples = 1, GLint wrap = GL_CLAMP_TO_EDGE );
     void
         set_components_hint( GLint hint );
     static void

gl/buffer.cpp

@@ -39,6 +39,8 @@ void gl::buffer::bind_base(targets target, GLuint index)
 
 void gl::buffer::unbind(targets target)
 {
+    if( binding_points[ target ] == 0 ) { return; }
+
     glBindBuffer(glenum_target(target), 0);
     binding_points[target] = 0;
 }

gl/query.cpp

@@ -34,6 +34,7 @@ void gl::query::end()
 
 std::optional<int64_t> gl::query::result()
 {
+    end(); // intercept potential error if the result check is called for still active object
     GLuint ready;
 	glGetQueryObjectuiv(*this, GL_QUERY_RESULT_AVAILABLE, &ready);
 	int64_t value = 0;

opengl33renderer.cpp

@@ -26,8 +26,25 @@ int const EU07_PICKBUFFERSIZE{1024}; // size of (square) textures bound with the
 
 auto const gammacorrection { glm::vec3( 2.2f ) };
 
+void GLAPIENTRY
+ErrorCallback( GLenum source, GLenum type, GLuint id, GLenum severity, GLsizei length, const GLchar* message, const void* userParam ) {
+
+    ErrorLog(
+        "bad gfx code: " + std::string( type == GL_DEBUG_TYPE_ERROR ? "** GL ERROR **" : "" )
+        + " type = " + to_hex_str( id )
+        + ", severity = " + to_hex_str( severity )
+        + ", message = " + message );
+}
+
 bool opengl33_renderer::Init(GLFWwindow *Window)
 {
+/*
+    if( false == Global.gfx_usegles ) {
+        // enable for gles after move to 3.2+
+        glEnable( GL_DEBUG_OUTPUT );
+        glDebugMessageCallback( ErrorCallback, 0 );
+    }
+*/
 	if (!Init_caps())
 		return false;
 
@@ -1691,11 +1708,13 @@ void opengl33_renderer::Bind_Material_Shadow(material_handle const Material)
 			m_textures.bind(0, material.textures[0]);
 			m_alpha_shadow_shader->bind();
 		}
-		else
+        else {
             m_shadow_shader->bind();
         }
-	else
+	}
+    else {
         m_shadow_shader->bind();
+    }
 }
 
 opengl_material const &opengl33_renderer::Material(material_handle const Material) const
@@ -2440,14 +2459,17 @@ bool opengl33_renderer::Render_cab(TDynamicObject const *Dynamic, float const Li
 
 			break;
 		}
-		case rendermode::cabshadows:
+        case rendermode::cabshadows: {
-			if (true == Alpha)
+            if( true == Alpha ) {
                 // translucent parts
-				Render_Alpha(Dynamic->mdKabina, Dynamic->Material(), 0.0);
+                Render_Alpha( Dynamic->mdKabina, Dynamic->Material(), 0.0 );
-			else
+            }
+            else {
                 // opaque parts
-				Render(Dynamic->mdKabina, Dynamic->Material(), 0.0);
+                Render( Dynamic->mdKabina, Dynamic->Material(), 0.0 );
+            }
             break;
+        }
 		case rendermode::pickcontrols:
 		{
 			Render(Dynamic->mdKabina, Dynamic->Material(), 0.0);

stdafx.h

@@ -77,9 +77,9 @@
 
 #include "glad/glad.h"
 
-#include "GL/glu.h"
+//#include "GL/glu.h"
 
-#define GLFW_INCLUDE_NONE
+#define GLFW_INCLUDE_GLU
 #include <GLFW/glfw3.h>
 
 #ifndef GLFW_TRUE

uilayer.cpp

@@ -92,7 +92,7 @@ ui_layer::init( GLFWwindow *Window ) {
     if( Global.GfxRenderer == "default" ) {
         // opengl 3.3 render path
         if( Global.gfx_usegles ) {
-            ImGui_ImplOpenGL3_Init( "#version 300 es\nprecision highp float;" );
+            ImGui_ImplOpenGL3_Init( "#version 300 es" );
         }
         else {
             ImGui_ImplOpenGL3_Init( "#version 330 core" );