From 8512b1a8f6172aa3058d2ddc7d7eaba5024041a2 Mon Sep 17 00:00:00 2001 From: Alex Szpakowski Date: Mon, 18 Nov 2019 21:16:51 -0400 Subject: [PATCH] Remove some dead code. --HG-- branch : minor --- src/modules/graphics/opengl/Shader.cpp | 22 ---------------------- src/modules/graphics/opengl/Shader.h | 3 --- 2 files changed, 25 deletions(-) diff --git a/src/modules/graphics/opengl/Shader.cpp b/src/modules/graphics/opengl/Shader.cpp index eac6fadba..62bfda382 100644 --- a/src/modules/graphics/opengl/Shader.cpp +++ b/src/modules/graphics/opengl/Shader.cpp @@ -756,28 +756,6 @@ void Shader::updateBuiltinUniforms(love::graphics::Graphics *gfx, int viewportW, glUniform4fv(location, 13, (const GLfloat *) &data); } -std::string Shader::getGLSLVersion() -{ - const char *tmp = (const char *) glGetString(GL_SHADING_LANGUAGE_VERSION); - - if (tmp == nullptr) - return "0.0"; - - // the version string always begins with a version number of the format - // major_number.minor_number - // or - // major_number.minor_number.release_number - // we can keep release_number, since it does not affect the check below. - std::string versionstring(tmp); - size_t minorendpos = versionstring.find(' '); - return versionstring.substr(0, minorendpos); -} - -bool Shader::isSupported() -{ - return GLAD_ES_VERSION_2_0 || (getGLSLVersion() >= "1.2"); -} - int Shader::getUniformTypeComponents(GLenum type) const { if (getUniformBaseType(type) == UNIFORM_SAMPLER) diff --git a/src/modules/graphics/opengl/Shader.h b/src/modules/graphics/opengl/Shader.h index b1bc402c0..38bc4ef7b 100644 --- a/src/modules/graphics/opengl/Shader.h +++ b/src/modules/graphics/opengl/Shader.h @@ -69,9 +69,6 @@ public: void updatePointSize(float size); void updateBuiltinUniforms(love::graphics::Graphics *gfx, int viewportW, int viewportH); - static std::string getGLSLVersion(); - static bool isSupported(); - private: struct TextureUnit