libgui|GLShader: Shader instances are reference counted

Shaders can be shared by multiple programs; reference counting solves lifetime management in this situation.
skyjake · Apr 21, 2013 · a524c1f · a524c1f
1 parent 25fc2ba
commit a524c1f
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 1 deletion.
diff --git a/doomsday/libgui/include/de/gui/glshader.h b/doomsday/libgui/include/de/gui/glshader.h
@@ -21,6 +21,7 @@
 
 #include <de/libdeng2.h>
 #include <de/Error>
+#include <de/Counted>
 #include <de/Asset>
 #include <de/IByteArray>
 
@@ -32,9 +33,12 @@ namespace de {
 /**
  * GL shader.
  *
+ * Shader instances are reference-counted so that they can be shared by many
+ * programs.
+ *
  * @ingroup gl
  */
-class LIBGUI_PUBLIC GLShader : public Asset
+class LIBGUI_PUBLIC GLShader : public Counted, public Asset
 {
 public:
     enum Type
@@ -52,6 +56,8 @@ class LIBGUI_PUBLIC GLShader : public Asset
 public:
     GLShader();
 
+    GLShader(Type shaderType, IByteArray const &source);
+
     Type type() const;
 
     GLuint glName() const;

diff --git a/doomsday/libgui/src/glshader.cpp b/doomsday/libgui/src/glshader.cpp
@@ -62,6 +62,11 @@ DENG2_PIMPL(GLShader)
 GLShader::GLShader() : d(new Instance(this))
 {}
 
+GLShader::GLShader(Type shaderType, IByteArray const &source)
+{
+    compile(shaderType, source);
+}
+
 GLShader::Type GLShader::type() const
 {
     return d->type;