From afce83c2b9778d2f498de77238a9998b5714c00e Mon Sep 17 00:00:00 2001 From: Erik Faye-Lund Date: Mon, 27 Feb 2023 12:55:47 +0100 Subject: util: remove defective arb-shader fallback We already call glCompileShader() without fallback to the ARB version in the CompileShaderText() function. In fact, we've been doing this for well over a decade now. The ARB-shader code-path is broken, and it seems nobody noticed until now. So let's just get rid of it. Reviewed-by: Hoe Hao Cheng --- src/util/shaderutil.c | 26 -------------------------- 1 file changed, 26 deletions(-) diff --git a/src/util/shaderutil.c b/src/util/shaderutil.c index 2c0dfb0a..51d0839b 100644 --- a/src/util/shaderutil.c +++ b/src/util/shaderutil.c @@ -69,32 +69,6 @@ ShadersSupported(void) GetAttribLocation = glGetAttribLocation; return GL_TRUE; } - else if (GLAD_GL_ARB_vertex_shader && GLAD_GL_ARB_fragment_shader - && GLAD_GL_ARB_shader_objects) { - fprintf(stderr, "Warning: Trying ARB GLSL instead of OpenGL 2.x. This may not work.\n"); - CreateShader = glCreateShaderObjectARB; - DeleteShader = glDeleteObjectARB; - ShaderSource = (PFNGLSHADERSOURCEPROC)glShaderSourceARB; - GetShaderiv = glGetObjectParameterivARB; - GetShaderInfoLog = glGetInfoLogARB; - CreateProgram = glCreateProgramObjectARB; - DeleteProgram = glDeleteObjectARB; - AttachShader = glAttachObjectARB; - LinkProgram = glLinkProgramARB; - UseProgram = glUseProgramObjectARB; - GetProgramiv = glGetObjectParameterivARB; - GetProgramInfoLog = glGetInfoLogARB; - ValidateProgram = glValidateProgramARB; - Uniform1i = glUniform1iARB; - Uniform1fv = glUniform1fvARB; - Uniform2fv = glUniform2fvARB; - Uniform3fv = glUniform3fvARB; - Uniform4fv = glUniform4fvARB; - UniformMatrix4fv = glUniformMatrix4fvARB; - GetActiveAttrib = glGetActiveAttribARB; - GetAttribLocation = glGetAttribLocationARB; - return GL_TRUE; - } fprintf(stderr, "Sorry, GLSL not supported with this OpenGL.\n"); return GL_FALSE; } -- cgit v1.2.1