diff --git a/src/slic3r/GUI/GLShader.cpp b/src/slic3r/GUI/GLShader.cpp index 1e0b8d24d..5146f03fc 100644 --- a/src/slic3r/GUI/GLShader.cpp +++ b/src/slic3r/GUI/GLShader.cpp @@ -301,7 +301,6 @@ void GLShaderProgram::set_uniform(int id, const Matrix3f& value) const glsafe(::glUniformMatrix3fv(id, 1, GL_FALSE, static_cast(value.data()))); } -#if ENABLE_LEGACY_OPENGL_REMOVAL void GLShaderProgram::set_uniform(int id, const Matrix3d& value) const { set_uniform(id, (Matrix3f)value.cast()); @@ -317,9 +316,7 @@ void GLShaderProgram::set_uniform(int id, const Matrix4d& value) const { set_uniform(id, (Matrix4f)value.cast()); } -#endif // ENABLE_LEGACY_OPENGL_REMOVAL -#if ENABLE_GL_CORE_PROFILE void GLShaderProgram::set_uniform(int id, const Vec2f& value) const { if (id >= 0) @@ -330,7 +327,6 @@ void GLShaderProgram::set_uniform(int id, const Vec2d& value) const { set_uniform(id, static_cast(value.cast())); } -#endif // ENABLE_GL_CORE_PROFILE void GLShaderProgram::set_uniform(int id, const Vec3f& value) const { diff --git a/src/slic3r/GUI/GLShader.hpp b/src/slic3r/GUI/GLShader.hpp index 6ad4e01b3..935daaaea 100644 --- a/src/slic3r/GUI/GLShader.hpp +++ b/src/slic3r/GUI/GLShader.hpp @@ -62,15 +62,11 @@ public: void set_uniform(const char* name, const Transform3f& value) const { set_uniform(get_uniform_location(name), value); } void set_uniform(const char* name, const Transform3d& value) const { set_uniform(get_uniform_location(name), value); } void set_uniform(const char* name, const Matrix3f& value) const { set_uniform(get_uniform_location(name), value); } -#if ENABLE_LEGACY_OPENGL_REMOVAL void set_uniform(const char* name, const Matrix3d& value) const { set_uniform(get_uniform_location(name), value); } void set_uniform(const char* name, const Matrix4f& value) const { set_uniform(get_uniform_location(name), value); } void set_uniform(const char* name, const Matrix4d& value) const { set_uniform(get_uniform_location(name), value); } -#endif // ENABLE_LEGACY_OPENGL_REMOVAL -#if ENABLE_GL_CORE_PROFILE void set_uniform(const char* name, const Vec2f& value) const { set_uniform(get_uniform_location(name), value); } void set_uniform(const char* name, const Vec2d& value) const { set_uniform(get_uniform_location(name), value); } -#endif // ENABLE_GL_CORE_PROFILE void set_uniform(const char* name, const Vec3f& value) const { set_uniform(get_uniform_location(name), value); } void set_uniform(const char* name, const Vec3d& value) const { set_uniform(get_uniform_location(name), value); } void set_uniform(const char* name, const ColorRGB& value) const { set_uniform(get_uniform_location(name), value); } @@ -91,15 +87,11 @@ public: void set_uniform(int id, const Transform3f& value) const; void set_uniform(int id, const Transform3d& value) const; void set_uniform(int id, const Matrix3f& value) const; -#if ENABLE_LEGACY_OPENGL_REMOVAL void set_uniform(int id, const Matrix3d& value) const; void set_uniform(int id, const Matrix4f& value) const; void set_uniform(int id, const Matrix4d& value) const; -#endif // ENABLE_LEGACY_OPENGL_REMOVAL -#if ENABLE_GL_CORE_PROFILE void set_uniform(int id, const Vec2f& value) const; void set_uniform(int id, const Vec2d& value) const; -#endif // ENABLE_GL_CORE_PROFILE void set_uniform(int id, const Vec3f& value) const; void set_uniform(int id, const Vec3d& value) const; void set_uniform(int id, const ColorRGB& value) const;