#ifndef MSP_GL_PROGRAMDATA_H_
#define MSP_GL_PROGRAMDATA_H_
-#include <map>
#include <stdexcept>
#include <msp/datafile/objectloader.h>
#include "datatype.h"
#include "matrix.h"
-#include "program.h"
+#include "reflectdata.h"
#include "tag.h"
#include "vector.h"
};
class Buffer;
-class BufferBackedUniformBlock;
-class Uniform;
+class PipelineState;
+class Program;
class UniformBlock;
struct Color;
struct TaggedUniform
{
Tag tag;
- Uniform *value;
-
- TaggedUniform();
-
- void replace_value(Uniform *);
+ DataType type = VOID;
+ unsigned array_size = 0;
+ unsigned data_offset = 0;
+ unsigned data_size = 0;
};
struct SharedBlock
{
- Program::LayoutHash block_hash;
+ ReflectData::LayoutHash block_hash;
Mask used;
Mask dirty;
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);
+ SharedBlock(ReflectData::LayoutHash);
- const UInt8 *get_uniform_indices() const;
+ const std::uint8_t *get_uniform_indices() const;
};
struct ProgramBlock
{
- Program::LayoutHash prog_hash;
+ ReflectData::LayoutHash prog_hash;
int bind_point;
int block_index;
union
} masks;
};
- ProgramBlock(Program::LayoutHash);
+ ProgramBlock(ReflectData::LayoutHash);
};
// XXX All these mutables are a bit silly, but I'm out of better ideas
const Program *tied_program;
std::vector<TaggedUniform> uniforms;
+ std::vector<char> uniform_data;
+ unsigned generation;
mutable std::vector<SharedBlock> blocks;
mutable std::vector<ProgramBlock> programs;
- mutable BufferBackedUniformBlock *last_buffer_block;
+ mutable UniformBlock *last_buffer_block;
mutable Buffer *buffer;
mutable Mask dirty;
+ std::string debug_name;
public:
ProgramData(const Program * = 0);
~ProgramData();
private:
- void uniform(Tag, Uniform *);
- template<typename T, typename V>
- void uniform(Tag, V);
- template<typename T, typename V>
- void uniform_array(Tag, unsigned, V);
+ void uniform(Tag, DataType, unsigned, const void *);
bool validate_tag(Tag) const;
- void add_uniform(Tag, Uniform *);
+ void mark_dirty(Mask);
public:
- void uniform(Tag, const Uniform &);
void uniform(Tag, int);
void uniform(Tag, float);
void uniform(Tag, int, int);
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 *);
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;
+ void copy_uniform(const ProgramData &, Tag);
private:
int find_uniform_index(Tag) const;
std::vector<ProgramBlock>::iterator get_program(const Program &) const;
- void update_block_uniform_indices(SharedBlock &, const Program::UniformBlockInfo &) const;
- void update_block(SharedBlock &, const Program::UniformBlockInfo &) const;
+ void update_block_uniform_indices(SharedBlock &, const ReflectData::UniformBlockInfo &) const;
+ void update_block(SharedBlock &, const ReflectData::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(tag, TypeTraits<LinAl::Vector<T, N>>::type, 1, &v.x); }
+
+template<typename T, unsigned R, unsigned C>
+void ProgramData::uniform(Tag tag, const LinAl::Matrix<T, R, C> &v)
+{ uniform(tag, TypeTraits<LinAl::Matrix<T, R, C>>::type, 1, &v(0, 0)); }
+
+template<typename T, unsigned N>
+void ProgramData::uniform_array(Tag tag, unsigned n, const LinAl::Vector<T, N> *v)
+{ uniform(tag, TypeTraits<LinAl::Vector<T, N>>::type, 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(tag, TypeTraits<LinAl::Matrix<T, R, C>>::type, n, &v[0](0, 0)); }
+
} // namespace GL
} // namespace Msp
projects / libs / gl.git / blobdiff