Commit 8ba7e86a authored by Martin Flöser's avatar Martin Flöser
Browse files

Binding shaders moved explicitly to ShaderManager.

parent 78f9b3b6
...@@ -278,8 +278,6 @@ class KWIN_EXPORT GLShader ...@@ -278,8 +278,6 @@ class KWIN_EXPORT GLShader
~GLShader(); ~GLShader();
bool isValid() const { return mValid; } bool isValid() const { return mValid; }
void bind();
void unbind();
int uniformLocation(const char* name); int uniformLocation(const char* name);
bool setUniform(const char* name, float value); bool setUniform(const char* name, float value);
...@@ -311,6 +309,8 @@ class KWIN_EXPORT GLShader ...@@ -311,6 +309,8 @@ class KWIN_EXPORT GLShader
GLShader(); GLShader();
bool loadFromFiles(const QString& vertexfile, const QString& fragmentfile); bool loadFromFiles(const QString& vertexfile, const QString& fragmentfile);
bool load(const QString& vertexsource, const QString& fragmentsource); bool load(const QString& vertexsource, const QString& fragmentsource);
void bind();
void unbind();
private: private:
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment