Use standard fixed-size integer types

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

diff --git a/source/render/programdata.h b/source/render/programdata.h
index a90d868e3bb7e3598200f074791189ee85e0cc15..1bcd3aab42c6ea2158f5beb0fbdcaab8f200720e 100644 (file)
--- a/source/render/programdata.h
+++ b/source/render/programdata.h
@@ -8,6 +8,7 @@
 #include "matrix.h"
 #include "program.h"
 #include "tag.h"
+#include "uniform.h"
 #include "vector.h"
 
 namespace Msp {
@@ -22,7 +23,7 @@ public:
 
 class Buffer;
 class BufferBackedUniformBlock;
-class Uniform;
+class PipelineState;
 class UniformBlock;
 struct Color;
 
@@ -117,18 +118,18 @@ private:
                UniformBlock *block;
                union
                {
-                       UInt8 type_flag;
-                       UInt8 values[16];
+                       std::uint8_t type_flag;
+                       std::uint8_t values[16];
                        struct
                        {
-                               UInt8 type_flag;
-                               UInt8 *values;
+                               std::uint8_t type_flag;
+                               std::uint8_t *values;
                        } dynamic;
                } indices;
 
                SharedBlock(Program::LayoutHash);
 
-               const UInt8 *get_uniform_indices() const;
+               const std::uint8_t *get_uniform_indices() const;
        };
 
        struct ProgramBlock
@@ -152,11 +153,13 @@ private:
        // XXX All these mutables are a bit silly, but I'm out of better ideas
        const Program *tied_program;
        std::vector<TaggedUniform> uniforms;
+       unsigned generation;
        mutable std::vector<SharedBlock> blocks;
        mutable std::vector<ProgramBlock> programs;
        mutable BufferBackedUniformBlock *last_buffer_block;
        mutable Buffer *buffer;
        mutable Mask dirty;
+       std::string debug_name;
 
 public:
        ProgramData(const Program * = 0);
@@ -173,6 +176,7 @@ private:
        void uniform_array(Tag, unsigned, V);
        bool validate_tag(Tag) const;
        void add_uniform(Tag, Uniform *);
+       void mark_dirty(Mask);
 public:
        void uniform(Tag, const Uniform &);
        void uniform(Tag, int);
@@ -183,33 +187,25 @@ public:
        void uniform2(Tag, const float *);
        void uniform(Tag, int, int, int);
        void uniform(Tag, float, float, float);
-       void uniform(Tag, const Vector3 &);
        void uniform3(Tag, const int *);
        void uniform3(Tag, const float *);
        void uniform(Tag, int, int, int, int);
        void uniform(Tag, float, float, float, float);
-       void uniform(Tag, const Vector4 &);
        void uniform(Tag, const Color &);
        void uniform4(Tag, const int *);
        void uniform4(Tag, const float *);
-       void uniform(Tag, const LinAl::Matrix<float, 2, 2> &);
        void uniform_matrix2(Tag, const float *);
-       void uniform(Tag, const LinAl::Matrix<float, 2, 3> &);
        void uniform_matrix3x2(Tag, const float *);
-       void uniform(Tag, const LinAl::Matrix<float, 2, 4> &);
        void uniform_matrix4x2(Tag, const float *);
-       void uniform(Tag, const LinAl::Matrix<float, 3, 2> &);
        void uniform_matrix2x3(Tag, const float *);
-       void uniform(Tag, const LinAl::Matrix<float, 3, 3> &);
        void uniform_matrix3(Tag, const float *);
-       void uniform(Tag, const LinAl::Matrix<float, 3, 4> &);
        void uniform_matrix4x3(Tag, const float *);
-       void uniform(Tag, const LinAl::Matrix<float, 4, 2> &);
        void uniform_matrix2x4(Tag, const float *);
-       void uniform(Tag, const LinAl::Matrix<float, 4, 3> &);
        void uniform_matrix3x4(Tag, const float *);
        void uniform(Tag, const Matrix &);
        void uniform_matrix4(Tag, const float *);
+       void uniform_array(Tag, unsigned, const int *);
+       void uniform_array(Tag, unsigned, const float *);
        void uniform1_array(Tag, unsigned, const int *);
        void uniform1_array(Tag, unsigned, const float *);
        void uniform2_array(Tag, unsigned, const int *);
@@ -227,8 +223,23 @@ public:
        void uniform_matrix2x4_array(Tag, unsigned, const float *);
        void uniform_matrix3x4_array(Tag, unsigned, const float *);
        void uniform_matrix4_array(Tag, unsigned, const float *);
+
+       template<typename T, unsigned N>
+       void uniform(Tag, const LinAl::Vector<T, N> &);
+
+       template<typename T, unsigned R, unsigned C>
+       void uniform(Tag, const LinAl::Matrix<T, R, C> &);
+
+       template<typename T, unsigned N>
+       void uniform_array(Tag, unsigned, const LinAl::Vector<T, N> *);
+
+       template<typename T, unsigned R, unsigned C>
+       void uniform_array(Tag, unsigned, const LinAl::Matrix<T, R, C> *);
+
        void remove_uniform(Tag);
 
+       unsigned get_generation() const { return generation; }
+
        std::vector<Tag> get_uniform_tags() const;
        const Uniform &get_uniform(Tag) const;
        const Uniform *find_uniform(Tag) const;
@@ -239,12 +250,29 @@ private:
        void update_block_uniform_indices(SharedBlock &, const Program::UniformBlockInfo &) const;
        void update_block(SharedBlock &, const Program::UniformBlockInfo &) const;
 
+       std::vector<ProgramBlock>::const_iterator prepare_program(const Program &) const;
 public:
-       /** Applies uniform blocks for the currently bound program, creating them
-       if needed. */
-       void apply() const;
+       void apply(const Program &, PipelineState &) const;
+
+       void set_debug_name(const std::string &);
 };
 
+template<typename T, unsigned N>
+void ProgramData::uniform(Tag tag, const LinAl::Vector<T, N> &v)
+{ uniform<UniformVector<T, N> >(tag, &v.x); }
+
+template<typename T, unsigned R, unsigned C>
+void ProgramData::uniform(Tag tag, const LinAl::Matrix<T, R, C> &v)
+{ uniform<UniformMatrix<T, R, C> >(tag, &v(0, 0)); }
+
+template<typename T, unsigned N>
+void ProgramData::uniform_array(Tag tag, unsigned n, const LinAl::Vector<T, N> *v)
+{ uniform_array<UniformVector<T, N> >(tag, n, &v[0].x); }
+
+template<typename T, unsigned R, unsigned C>
+void ProgramData::uniform_array(Tag tag, unsigned n, const LinAl::Matrix<T, R, C> *v)
+{ uniform_array<UniformMatrix<T, R, C> >(tag, n, &v[0](0, 0)); }
+
 } // namespace GL
 } // namespace Msp