summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorErik Faye-Lund <erik.faye-lund@collabora.com>2023-02-27 12:55:47 +0100
committerErik Faye-Lund <erik.faye-lund@collabora.com>2023-03-06 09:56:16 +0100
commitafce83c2b9778d2f498de77238a9998b5714c00e (patch)
treefd7cfb51f7a8b0ee931f96a64ff978478ff87191
parent604a8fb2b457ea80ee9ec5e86315ff350aab6ee7 (diff)
downloadmesa-demos-afce83c2b9778d2f498de77238a9998b5714c00e.tar.gz
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 <haochengho12907@gmail.com>
-rw-r--r--src/util/shaderutil.c26
1 files changed, 0 insertions, 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;
}