Minor fixes, courtesy of Apple's compiler

[libs/gl.git] / source / programdata.h

diff --git a/source/programdata.h b/source/programdata.h
index cf642e6141222d3033d80bc6d92e50ff6c99e863..f51ad788884aa0ebbbbf545d4a7d8c8cda2da350 100644 (file)
--- a/source/programdata.h
+++ b/source/programdata.h
@@ -4,20 +4,25 @@
 #include <map>
 #include <msp/datafile/objectloader.h>
 #include "program.h"
+#include "vector.h"
 
 namespace Msp {
 namespace GL {
 
 class Buffer;
-class Color;
 class Matrix;
 class Uniform;
 class UniformBlock;
-class Vector3;
-class Vector4;
+struct Color;
 
 /**
-Stores uniform variables for a shader program.
+Stores uniform variables for shader programs.  The uniforms are stored in a
+program-independent way, and UniformBlocks are created to match the uniform
+layouts of different programs.  If multiple programs have the same layout, the
+same block is used for them.
+
+The class is optimized for an access pattern where the set of uniforms and
+programs stays constants, with only the values changing.
 */
 class ProgramData
 {
@@ -61,10 +66,10 @@ private:
        mutable Buffer *buffer;
        mutable Changes changes;
 
-       ProgramData &operator=(const ProgramData &);
 public:
        ProgramData();
        ProgramData(const ProgramData &);
+       ProgramData &operator=(const ProgramData &);
        ~ProgramData();
 
 private:
@@ -81,8 +86,10 @@ public:
        void uniform(const std::string &, const Vector4 &);
        void uniform(const std::string &, const Color &);
        void uniform4(const std::string &, const float *);
+       void uniform_matrix2(const std::string &, const float *);
+       void uniform_matrix3(const std::string &, const float *);
+       void uniform(const std::string &, const Matrix &);
        void uniform_matrix4(const std::string &, const float *);
-       void uniform_matrix4(const std::string &, const Matrix &);
        void uniform1_array(const std::string &, unsigned, const float *);
        void uniform2_array(const std::string &, unsigned, const float *);
        void uniform3_array(const std::string &, unsigned, const float *);
@@ -93,9 +100,14 @@ private:
        void find_uniforms_for_block(Block &, const Program::UniformBlockInfo &) const;
        UniformBlock *create_block(const Program::UniformBlockInfo &) const;
        const UniformBlock *get_block(const Program &, const Program::UniformBlockInfo *) const;
+
 public:
-       const UniformBlock *get_block(const Program &, const std::string &) const;
+       /** Returns a UniformBlock matching the program's layout.  If name is empty,
+       uniforms for the default uniform block (outside any uniform block
+       declarations) are returned. */
+       const UniformBlock *get_block(const Program &prog, const std::string &name) const;
 
+       /// Creates blocks for the currently bound program and applies them.
        void apply() const;
 };