3DPrinting/PrusaSlicer-NonPlainar
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Techs ENABLE_LEGACY_OPENGL_REMOVAL and ENABLE_GL_CORE_PROFILE set as default into GLShaderProgram

Browse Source
This commit is contained in:
enricoturri1966 2022-04-05 11:31:01 +02:00
parent 3df99ab974
commit 7b3db7a88a
2 changed files with 0 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/slic3r/GUI/GLShader.cpp
View File

@ -301,7 +301,6 @@ void GLShaderProgram::set_uniform(int id, const Matrix3f& value) const
glsafe(::glUniformMatrix3fv(id, 1, GL_FALSE, static_cast<const GLfloat*>(value.data()))); glsafe(::glUniformMatrix3fv(id, 1, GL_FALSE, static_cast<const GLfloat*>(value.data())));
} }
#if ENABLE_LEGACY_OPENGL_REMOVAL
void GLShaderProgram::set_uniform(int id, const Matrix3d& value) const void GLShaderProgram::set_uniform(int id, const Matrix3d& value) const
{ {
set_uniform(id, (Matrix3f)value.cast<float>()); set_uniform(id, (Matrix3f)value.cast<float>());
@ -317,9 +316,7 @@ void GLShaderProgram::set_uniform(int id, const Matrix4d& value) const
{ {
set_uniform(id, (Matrix4f)value.cast<float>()); set_uniform(id, (Matrix4f)value.cast<float>());
} }
#endif // ENABLE_LEGACY_OPENGL_REMOVAL
#if ENABLE_GL_CORE_PROFILE
void GLShaderProgram::set_uniform(int id, const Vec2f& value) const void GLShaderProgram::set_uniform(int id, const Vec2f& value) const
{ {
if (id >= 0) if (id >= 0)
@ -330,7 +327,6 @@ void GLShaderProgram::set_uniform(int id, const Vec2d& value) const
{ {
set_uniform(id, static_cast<Vec2f>(value.cast<float>())); set_uniform(id, static_cast<Vec2f>(value.cast<float>()));
} }
#endif // ENABLE_GL_CORE_PROFILE
void GLShaderProgram::set_uniform(int id, const Vec3f& value) const void GLShaderProgram::set_uniform(int id, const Vec3f& value) const
{ {

8
src/slic3r/GUI/GLShader.hpp
View File

@ -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 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 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); } 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 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 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); } 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 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); } 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 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 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); } 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 Transform3f& value) const;
void set_uniform(int id, const Transform3d& value) const; void set_uniform(int id, const Transform3d& value) const;
void set_uniform(int id, const Matrix3f& 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 Matrix3d& value) const;
void set_uniform(int id, const Matrix4f& value) const; void set_uniform(int id, const Matrix4f& value) const;
void set_uniform(int id, const Matrix4d& 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 Vec2f& value) const;
void set_uniform(int id, const Vec2d& 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 Vec3f& value) const;
void set_uniform(int id, const Vec3d& value) const; void set_uniform(int id, const Vec3d& value) const;
void set_uniform(int id, const ColorRGB& value) const; void set_uniform(int id, const ColorRGB& value) const;