#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();
};
};
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;
std::vector<UniformBlockInfo> uniform_blocks;
std::vector<UniformInfo> uniforms;
void update_layout_hash();
static LayoutHash compute_layout_hash(const std::vector<const UniformInfo *> &);
static bool uniform_location_compare(const UniformInfo *, const UniformInfo *);
- static bool uniform_name_compare(const UniformInfo &, const UniformInfo &);
- template<typename T>
- static bool name_search(const T &, const std::string &);
public:
bool is_linked() const { return linked; }
DEPRECATED std::string get_info_log() const;
const UniformBlockInfo &get_uniform_block_info(const std::string &) const;
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;
+ 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;