Tech ENABLE_GL_CORE_PROFILE - Use OpenGL core profile context - 1st installment
Fixed conflicts during rebase with master
This commit is contained in:
parent
1b09628b0d
commit
389dc36053
39 changed files with 542 additions and 46 deletions
|
@ -69,6 +69,10 @@ public:
|
|||
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_GL_IMGUI_SHADERS
|
||||
#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); }
|
||||
|
@ -96,6 +100,10 @@ public:
|
|||
void set_uniform(int id, const Matrix4f& value) const;
|
||||
void set_uniform(int id, const Matrix4d& value) const;
|
||||
#endif // ENABLE_GL_IMGUI_SHADERS
|
||||
#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;
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue