Use persistent uniform blocks for Camera, Lighting and Clipping

[libs/gl.git] / source / core / clipplane.cpp

diff --git a/source/core/clipplane.cpp b/source/core/clipplane.cpp
index 4adf2bf5a45d55b1707b85f40629cd7597189ee7..b27464ca20249cffa5fe0c70affed87195ab3390 100644 (file)
--- a/source/core/clipplane.cpp
+++ b/source/core/clipplane.cpp
@@ -9,20 +9,24 @@ namespace Msp {
 namespace GL {
 
 ClipPlane::ClipPlane():
-       eq(0, 0, 0, 1)
+       eq(0, 0, 0, 1),
+       generation(0)
 { }
 
 ClipPlane::ClipPlane(const Vector4 &e):
-       eq(e)
+       eq(e),
+       generation(0)
 { }
 
 ClipPlane::ClipPlane(const Vector3 &p, const Vector3 &d):
-       eq(compose(d, -dot(p, d)))
+       eq(compose(d, -dot(p, d))),
+       generation(0)
 { }
 
 void ClipPlane::set_equation(const Vector4 &e)
 {
        eq = e;
+       ++generation;
 }
 
 void ClipPlane::set_plane(const Vector3 &p, const Vector3 &d)
@@ -31,9 +35,9 @@ void ClipPlane::set_plane(const Vector3 &p, const Vector3 &d)
        set_equation(compose(nd, -dot(p, nd)));
 }
 
-void ClipPlane::update_shader_data(ProgramData &shdata, const Matrix &view_inverse, unsigned i) const
+void ClipPlane::update_shader_data(ProgramData &shdata, unsigned i) const
 {
-       shdata.uniform(format("clip_planes[%d].equation", i), eq*view_inverse);
+       shdata.uniform(format("clip_planes[%d].equation", i), eq);
 }
 
 } // namespace GL