Use persistent uniform blocks for Camera, Lighting and Clipping

[libs/gl.git] / source / core / clipping.h

diff --git a/source/core/clipping.h b/source/core/clipping.h
index e42c28e6394b6c1c519afc26f182957b1f75be20..d74763ab7c697f9cade4e94ab4b15bdb518e0a10 100644 (file)
--- a/source/core/clipping.h
+++ b/source/core/clipping.h
@@ -2,27 +2,40 @@
 #define MSP_GL_CLIPPING_H_
 
 #include <vector>
+#include <msp/core/attributes.h>
 #include "bindable.h"
+#include "programdata.h"
 
 namespace Msp {
 namespace GL {
 
 class ClipPlane;
 class Matrix;
-class ProgramData;
 
 class Clipping: public Bindable<Clipping>
 {
 private:
-       std::vector<const ClipPlane *> planes;
+       struct AttachedPlane
+       {
+               const ClipPlane *plane;
+               mutable unsigned generation;
+
+               AttachedPlane(const ClipPlane *p): plane(p), generation(0) { }
+       };
+
+       std::vector<AttachedPlane> planes;
+       mutable ProgramData shdata;
 
 public:
        static unsigned get_n_attach_points();
 
-       void attach(unsigned, const ClipPlane &);
-       void detach(unsigned);
+       void attach(const ClipPlane &);
+       void detach(const ClipPlane &);
+
+       DEPRECATED void attach(unsigned, const ClipPlane &p) { attach(p); }
+       DEPRECATED void detach(unsigned);
 
-       void update_shader_data(ProgramData &, const Matrix &) const;
+       const ProgramData &get_shader_data() const;
 
        void bind() const;