Support overriding uniforms in inherited Techniques

[libs/gl.git] / source / blend.h

diff --git a/source/blend.h b/source/blend.h
index c4c78d7d51e516fe9e7278c0983dad6446cf6f12..e7b291e617dab5c2044e787c99ee7a09a7dfcac5 100644 (file)
--- a/source/blend.h
+++ b/source/blend.h
@@ -1,24 +1,14 @@
-/* $Id$
-
-This file is part of libmspgl
-Copyright © 2008, 2010  Mikko Rasa, Mikkosoft Productions
-Distributed under the LGPL
-*/
-
 #ifndef MSP_GL_BLEND_H_
 #define MSP_GL_BLEND_H_
 
+#include <msp/strings/lexicalcast.h>
 #include "bindable.h"
 #include "gl.h"
+#include <msp/gl/extensions/ext_blend_minmax.h>
 
 namespace Msp {
 namespace GL {
 
-enum
-{
-       BLEND = GL_BLEND
-};
-
 enum BlendEquation
 {
        ADD              = GL_FUNC_ADD,
@@ -63,12 +53,15 @@ public:
 
        void bind() const;
 
-       static const Blend &alpha();
        static void unbind();
+
+       static const Blend &alpha();
+       static const Blend &additive();
+       static const Blend &additive_alpha();
 };
 
-void blend_equation(BlendEquation eq);
-void blend_func(BlendFactor src, BlendFactor dst);
+void operator>>(const LexicalConverter &, BlendFactor &);
+void operator<<(LexicalConverter &, BlendFactor);
 
 } // namespace GL
 } // namespace Msp