From cf94a0e8f807c1e94951a0c33d1c9dfcec9ef98a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Martin=20Gr=C3=A4=C3=9Flin?= Date: Sun, 30 Jan 2011 14:01:21 +0100 Subject: [PATCH] Binding shaders moved explicitly to ShaderManager. --- lib/kwinglutils.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/kwinglutils.h b/lib/kwinglutils.h index adb4ccf9e3..1ef3f426cd 100644 --- a/lib/kwinglutils.h +++ b/lib/kwinglutils.h @@ -278,8 +278,6 @@ class KWIN_EXPORT GLShader ~GLShader(); bool isValid() const { return mValid; } - void bind(); - void unbind(); int uniformLocation(const char* name); bool setUniform(const char* name, float value); @@ -311,6 +309,8 @@ class KWIN_EXPORT GLShader GLShader(); bool loadFromFiles(const QString& vertexfile, const QString& fragmentfile); bool load(const QString& vertexsource, const QString& fragmentsource); + void bind(); + void unbind(); private: