Refresh lighting and culling uniforms if the camera changes in pop_state

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

diff --git a/source/blend.cpp b/source/blend.cpp
index 8b82772fded1e7fc6acc755c312964ac867a0b3b..184d5ad534f1aca6bcf441726b54e8c80af94a1b 100644 (file)
--- a/source/blend.cpp
+++ b/source/blend.cpp
@@ -1,13 +1,6 @@
-/* $Id$
-
-This file is part of libmspgl
-Copyright © 2008, 2010  Mikko Rasa, Mikkosoft Productions
-Distributed under the LGPL
-*/
-
+#include <msp/gl/extensions/ext_blend_minmax.h>
+#include <msp/gl/extensions/ext_blend_subtract.h>
 #include "blend.h"
-#include "extension.h"
-#include "version_1_2.h"
 
 namespace Msp {
 namespace GL {
@@ -29,8 +22,10 @@ Blend::Blend(BlendEquation e, BlendFactor sf, BlendFactor df):
        src_factor(sf),
        dst_factor(df)
 {
-       if(eq!=ADD)
-               static RequireVersion _ver(1, 2);
+       if(eq==MIN || eq==MAX)
+               static Require _req(EXT_blend_minmax);
+       else if(eq==SUBTRACT || eq==REVERSE_SUBTRACT)
+               static Require _req(EXT_blend_subtract);
 }
 
 void Blend::bind() const
@@ -38,34 +33,22 @@ void Blend::bind() const
        if(set_current(this))
        {
                glEnable(GL_BLEND);
-               // XXX Don't try to set equation if version < 1.2
-               glBlendEquation(eq);
+               if(EXT_blend_minmax)
+                       glBlendEquation(eq);
                glBlendFunc(src_factor, dst_factor);
        }
 }
 
-const Blend &Blend::alpha()
-{
-       static Blend blend(SRC_ALPHA, ONE_MINUS_SRC_ALPHA);
-       return blend;
-}
-
 void Blend::unbind()
 {
        if(set_current(0))
                glDisable(GL_BLEND);
 }
 
-
-void blend_equation(BlendEquation eq)
-{
-       static RequireVersion _ver(1, 2);
-       glBlendEquation(eq);
-}
-
-void blend_func(BlendFactor src, BlendFactor dst)
+const Blend &Blend::alpha()
 {
-       glBlendFunc(src, dst);
+       static Blend blend(SRC_ALPHA, ONE_MINUS_SRC_ALPHA);
+       return blend;
 }
 
 } // namespace GL