X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fcore%2Fprogram.h;h=939521dcd804866a65f52d544b6aa722e773c798;hb=fa2b4c8a93ebad2497cacfdeaa9a2c20be486520;hp=6f84cfd26436e314b6d48d02dac8e7c0e2b51154;hpb=7af200475facc657a0bbffaa17520d3ec9d809af;p=libs%2Fgl.git diff --git a/source/core/program.h b/source/core/program.h index 6f84cfd2..939521dc 100644 --- a/source/core/program.h +++ b/source/core/program.h @@ -8,6 +8,7 @@ #include "datatype.h" #include "gl.h" #include "module.h" +#include "tag.h" #include "vertexformat.h" namespace Msp { @@ -63,11 +64,18 @@ public: { std::string name; const UniformBlockInfo *block; - unsigned location; + union + { + int location; + unsigned offset; + }; unsigned array_size; unsigned array_stride; unsigned matrix_stride; DataType type; + Tag tag; + + UniformInfo(); }; struct UniformBlockInfo @@ -77,6 +85,8 @@ public: int bind_point; std::vector uniforms; LayoutHash layout_hash; + + UniformBlockInfo(); }; struct AttributeInfo @@ -85,21 +95,26 @@ public: unsigned location; unsigned array_size; DataType type; - }; - typedef std::map UniformMap; - typedef std::map UniformBlockMap; - typedef std::map AttributeMap; + AttributeInfo(); + }; private: + struct Bindings + { + std::map textures; + std::map blocks; + }; + unsigned id; std::vector stage_ids; const Module *module; + Bindings *bindings; bool linked; - UniformBlockMap uniform_blocks; - UniformMap uniforms; + std::vector uniform_blocks; + std::vector uniforms; LayoutHash uniform_layout_hash; - AttributeMap attributes; + std::vector attributes; public: /// Constructs an empty Program with no shader stages attached. @@ -142,22 +157,27 @@ private: void query_uniform_blocks(const std::vector &); void query_attributes(); void collect_uniforms(); - void collect_block_uniforms(UniformBlockInfo &, const SpirVModule::Structure &, const std::string &, unsigned); + void collect_block_uniforms(const SpirVModule::Structure &, const std::string &, unsigned, std::vector &); void collect_attributes(); void update_layout_hash(); static LayoutHash compute_layout_hash(const std::vector &); static bool uniform_location_compare(const UniformInfo *, const UniformInfo *); + static bool uniform_tag_compare(const UniformInfo &, const UniformInfo &); + template + static bool search(const T &, const A &); public: bool is_linked() const { return linked; } DEPRECATED std::string get_info_log() const; LayoutHash get_uniform_layout_hash() const { return uniform_layout_hash; } - const UniformBlockMap &get_uniform_blocks() const { return uniform_blocks; } + const std::vector &get_uniform_blocks() const { return uniform_blocks; } const UniformBlockInfo &get_uniform_block_info(const std::string &) const; - const UniformMap &get_uniforms() const { return uniforms; } + const std::vector &get_uniforms() const { return uniforms; } const UniformInfo &get_uniform_info(const std::string &) const; + const UniformInfo &get_uniform_info(Tag) const; int get_uniform_location(const std::string &) const; - const AttributeMap &get_attributes() const { return attributes; } + int get_uniform_location(Tag) const; + const std::vector &get_attributes() const { return attributes; } const AttributeInfo &get_attribute_info(const std::string &) const; int get_attribute_location(const std::string &) const;