yukijoou/kwin
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Binding shaders moved explicitly to ShaderManager.

Browse source
This commit is contained in:
Martin Gräßlin 2011-01-30 14:01:21 +01:00
parent 45c7610d22
commit cf94a0e8f8
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
lib/kwinglutils.h
View file

@ -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
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: