diff options
| author | bubnikv <bubnikv@gmail.com> | 2018-07-16 18:07:49 +0300 |
|---|---|---|
| committer | bubnikv <bubnikv@gmail.com> | 2018-07-16 18:07:49 +0300 |
| commit | 6dc1bf5c08b7935dfbc55d35dea31148d09732f8 (patch) | |
| tree | 862e4d4149e6cd7fceb03208c3f3bcbfa1625301 /xs/src/slic3r/GUI/GLShader.hpp | |
| parent | 0bbd1dbc4f80ee4909f84d91931c13d757ba0af7 (diff) | |
| parent | d99b484ac6e67f00666530a1d7b78e7506e2ce6c (diff) | |
Merge branch 'master' into stable
Diffstat (limited to 'xs/src/slic3r/GUI/GLShader.hpp')
| -rw-r--r-- | xs/src/slic3r/GUI/GLShader.hpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/xs/src/slic3r/GUI/GLShader.hpp b/xs/src/slic3r/GUI/GLShader.hpp index d91463f19..032640d8d 100644 --- a/xs/src/slic3r/GUI/GLShader.hpp +++ b/xs/src/slic3r/GUI/GLShader.hpp @@ -16,7 +16,9 @@ public: {} ~GLShader(); - bool load(const char *fragment_shader, const char *vertex_shader); + bool load_from_text(const char *fragment_shader, const char *vertex_shader); + bool load_from_file(const char* fragment_shader_filename, const char* vertex_shader_filename); + void release(); int get_attrib_location(const char *name) const; |