#include "datatype.h"
#include "gl.h"
#include "module.h"
+#include "tag.h"
#include "vertexformat.h"
namespace Msp {
unsigned array_stride;
unsigned matrix_stride;
DataType type;
+ Tag tag;
+ int binding;
UniformInfo();
};
AttributeInfo();
};
- typedef std::map<std::string, UniformInfo> UniformMap;
- typedef std::map<std::string, UniformBlockInfo> UniformBlockMap;
- typedef std::map<std::string, AttributeInfo> AttributeMap;
-
private:
+ struct Bindings
+ {
+ std::map<std::string, unsigned> textures;
+ std::map<std::string, unsigned> blocks;
+ };
+
unsigned id;
std::vector<unsigned> stage_ids;
const Module *module;
+ Bindings *bindings;
bool linked;
- UniformBlockMap uniform_blocks;
- UniformMap uniforms;
+ std::vector<UniformBlockInfo> uniform_blocks;
+ std::vector<UniformInfo> uniforms;
LayoutHash uniform_layout_hash;
- AttributeMap attributes;
+ std::vector<AttributeInfo> attributes;
public:
/// Constructs an empty Program with no shader stages attached.
void query_uniform_blocks(const std::vector<UniformInfo *> &);
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<std::string> &);
void collect_attributes();
void update_layout_hash();
static LayoutHash compute_layout_hash(const std::vector<const UniformInfo *> &);
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<UniformBlockInfo> &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<UniformInfo> &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;
+ int get_uniform_binding(Tag) const;
+ const std::vector<AttributeInfo> &get_attributes() const { return attributes; }
const AttributeInfo &get_attribute_info(const std::string &) const;
int get_attribute_location(const std::string &) const;