Avoid creating blocks for which there are no uniforms

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

diff --git a/source/programdata.h b/source/programdata.h
index 495ea22f3a5be143fe498c1d9ce8ae7ee5bb91d3..cf642e6141222d3033d80bc6d92e50ff6c99e863 100644 (file)
--- a/source/programdata.h
+++ b/source/programdata.h
@@ -1,42 +1,101 @@
-/* $Id$
-
-This file is part of libmspgl
-Copyright © 2007  Mikko Rasa, Mikkosoft Productions
-Distributed under the LGPL
-*/
-
 #ifndef MSP_GL_PROGRAMDATA_H_
 #define MSP_GL_PROGRAMDATA_H_
 
 #include <map>
+#include <msp/datafile/objectloader.h>
+#include "program.h"
 
 namespace Msp {
 namespace GL {
 
-class Program;
+class Buffer;
+class Color;
+class Matrix;
 class Uniform;
+class UniformBlock;
+class Vector3;
+class Vector4;
 
+/**
+Stores uniform variables for a shader program.
+*/
 class ProgramData
 {
+public:
+       class Loader: public DataFile::ObjectLoader<ProgramData>
+       {
+       public:
+               Loader(ProgramData &);
+       private:
+               void uniform1i(const std::string &, int);
+               void uniform1f(const std::string &, float);
+               void uniform2f(const std::string &, float, float);
+               void uniform3f(const std::string &, float, float, float);
+               void uniform4f(const std::string &, float, float, float, float);
+       };
+
 private:
-       std::map<int, Uniform *> data;
+       enum Changes
+       {
+               NO_CHANGES,
+               VALUES_CHANGED,
+               KEYS_CHANGED
+       };
+
+       struct Block
+       {
+               Changes changes;
+               UniformBlock *block;
+               std::map<unsigned, const Uniform *const *> uniforms;
+
+               Block();
+       };
+
+       typedef std::map<std::string, Uniform *> UniformMap;
+       typedef std::map<unsigned, Block> BlockMap;
+
+       // XXX All these mutables are a bit silly, but I'm out of better ideas
+       UniformMap uniforms;
+       mutable BlockMap blocks;
+       mutable UniformBlock *last_block;
+       mutable Buffer *buffer;
+       mutable Changes changes;
 
-       ProgramData(const ProgramData &);
        ProgramData &operator=(const ProgramData &);
 public:
        ProgramData();
+       ProgramData(const ProgramData &);
        ~ProgramData();
 
-       void uniform(int, Uniform *);
-       void uniform(int, int);
-       void uniform(int, float);
-       void uniform(int, float, float);
-       void uniform2(int, const float *);
-       void uniform(int, float, float, float);
-       void uniform3(int, const float *);
-       void uniform(int, float, float, float, float);
-       void uniform4(int, const float *);
-       void uniform_matrix4(int, const float *);
+private:
+       void uniform(const std::string &, Uniform *);
+public:
+       void uniform(const std::string &, int);
+       void uniform(const std::string &, float);
+       void uniform(const std::string &, float, float);
+       void uniform2(const std::string &, const float *);
+       void uniform(const std::string &, float, float, float);
+       void uniform(const std::string &, const Vector3 &);
+       void uniform3(const std::string &, const float *);
+       void uniform(const std::string &, float, float, float, float);
+       void uniform(const std::string &, const Vector4 &);
+       void uniform(const std::string &, const Color &);
+       void uniform4(const std::string &, const float *);
+       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 *);
+       void uniform4_array(const std::string &, unsigned, const float *);
+       void uniform_matrix4_array(const std::string &, unsigned, const float *);
+
+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;
+
        void apply() const;
 };