X-Git-Url: http://git.tdb.fi/?p=libs%2Fgl.git;a=blobdiff_plain;f=source%2Fcore%2Funiformblock.h;h=1144158d2ee3ae760bb994be535b8657c9650faa;hp=18b651c7b4e498c12f2bdccba4c190dbe5c30663;hb=HEAD;hpb=9b3bce7ae76ff8c0c81315d2505ea96bf422a318

diff --git a/source/core/uniformblock.h b/source/core/uniformblock.h
index 18b651c7..1144158d 100644
--- a/source/core/uniformblock.h
+++ b/source/core/uniformblock.h
@@ -1,68 +1,42 @@
 #ifndef MSP_GL_UNIFORMBLOCK_H_
 #define MSP_GL_UNIFORMBLOCK_H_
 
-#include <map>
 #include <vector>
+#include <msp/core/noncopyable.h>
 #include "bufferable.h"
-#include "program.h"
-#include "vector.h"
+#include "reflectdata.h"
+#include "uniformblock_backend.h"
 
 namespace Msp {
 namespace GL {
 
-class BufferRange;
-class Matrix;
-class Uniform;
-struct Color;
-
 /**
-Stores uniforms with a specific layout.  Both named and default uniform blocks
-are supported.
-*/
-class UniformBlock: public NonCopyable
-{
-protected:
-	UniformBlock() { }
-public:
-	virtual ~UniformBlock() { }
+Stores uniform values in a block of memory.
 
-	virtual void attach(const Program::UniformInfo &, const Uniform &) = 0;
-};
-
-/** Stores uniforms for the default uniform block.  Uniforms are associated
-with locations, as returned by Program::get_uniform_location. */
-class DefaultUniformBlock: public UniformBlock
-{
-private:
-	std::vector<const Uniform *> uniforms;
+For named uniform blocks the values are stored according to the reflected
+layout of the block, ready for use by shaders.  For the default uniform block,
+the location of the uniform is multiplied by 16 to obtain the memory offset.
 
-public:
-	DefaultUniformBlock();
-
-	virtual void attach(const Program::UniformInfo &, const Uniform &);
-	void attach(int, const Uniform &);
-	void apply() const;
-};
-
-/** Stores uniforms for a buffer-backed uniform block.  Uniform values are
-stored in a memory block which can be uploaded into a buffer and bound for use
-by a Program. */
-class BufferBackedUniformBlock: public UniformBlock, public Bufferable
+Applications normally don't need to deal with UniformBlocks directly.  They're
+managed by the ProgramData class, which provides a higher-level interface for
+setting uniform values.
+*/
+class UniformBlock: public UniformBlockBackend, public Bufferable
 {
 private:
-	unsigned size;
 	std::vector<char> data;
 
 public:
-	BufferBackedUniformBlock(unsigned);
+	UniformBlock(const ReflectData::UniformBlockInfo &);
 
-	virtual unsigned get_data_size() const { return size; }
-private:
+	virtual std::size_t get_data_size() const { return data.size(); }
 	virtual const void *get_data_pointer() const { return &data[0]; }
-	virtual unsigned get_alignment() const;
+private:
+	virtual std::size_t get_alignment() const;
 
 public:
-	void attach(const Program::UniformInfo &, const Uniform &);
+	void store(const ReflectData::UniformInfo &, std::size_t, const void *);
+	void check_store_range(std::size_t, std::size_t);
 };
 
 } // namespace GL