Redesign depth and stencil test and blend state management

[libs/gl.git] / tools / viewer.cpp

diff --git a/tools/viewer.cpp b/tools/viewer.cpp
index b05e6695c0a9d2438295ce2421d60e60bc75024d..2c950e18e2acc22714ee9d3030ed7467371a0fe0 100644 (file)
--- a/tools/viewer.cpp
+++ b/tools/viewer.cpp
@@ -23,7 +23,6 @@
 #include <msp/gl/resources.h>
 #include <msp/gl/simplescene.h>
 #include <msp/gl/technique.h>
 #include <msp/gl/resources.h>
 #include <msp/gl/simplescene.h>
 #include <msp/gl/technique.h>

-#include <msp/gl/tests.h>

 #include <msp/gl/windowview.h>
 #include <msp/input/mouse.h>
 #include <msp/io/print.h>
 #include <msp/gl/windowview.h>
 #include <msp/input/mouse.h>
 #include <msp/io/print.h>


@@ -238,8 +237,8 @@ Viewer::Viewer(int argc, char **argv):
                sequence = new GL::Sequence(view);
                GL::Sequence::Step &step = sequence->add_step(0, *renderable);
                step.set_lighting(&lighting);
                sequence = new GL::Sequence(view);
                GL::Sequence::Step &step = sequence->add_step(0, *renderable);
                step.set_lighting(&lighting);

-               step.set_depth_test(&GL::DepthTest::lequal());
-               step.set_blend(&GL::Blend::alpha());
+               step.set_depth_test(GL::LEQUAL);
+               step.set_blend(GL::Blend(GL::SRC_ALPHA, GL::ONE_MINUS_SRC_ALPHA));

        }
 
        view.set_content(sequence);
        }
 
        view.set_content(sequence);