unsigned matrix_stride;
DataType type;
Tag tag;
+ int binding;
UniformInfo();
};
};
private:
- struct Bindings
+ enum Stage
+ {
+ VERTEX,
+ GEOMETRY,
+ FRAGMENT,
+ MAX_STAGES
+ };
+
+ struct TransientData
{
std::map<std::string, unsigned> textures;
std::map<std::string, unsigned> blocks;
+ std::map<unsigned, int> spec_values;
};
unsigned id;
- std::vector<unsigned> stage_ids;
+ unsigned stage_ids[MAX_STAGES];
const Module *module;
- Bindings *bindings;
+ TransientData *transient;
bool linked;
std::vector<UniformBlockInfo> uniform_blocks;
std::vector<UniformInfo> uniforms;
LayoutHash uniform_layout_hash;
std::vector<AttributeInfo> attributes;
+ std::string debug_name;
public:
/// Constructs an empty Program with no shader stages attached.
void add_stages(const Module &, const std::map<std::string, int> & = std::map<std::string, int>());
private:
- unsigned add_stage(GLenum);
+ bool has_stages() const;
+ unsigned add_stage(Stage);
void add_glsl_stages(const GlslModule &, const std::map<std::string, int> &);
void compile_glsl_stage(unsigned);
void add_spirv_stages(const SpirVModule &, const std::map<std::string, int> &);
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_tag_compare(const UniformInfo &, const UniformInfo &);
- template<typename T, typename A, A T::*>
- static bool search(const T &, const A &);
public:
bool is_linked() const { return linked; }
DEPRECATED std::string get_info_log() 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;
void bind() const;
static void unbind();
+
+ void set_debug_name(const std::string &);
+private:
+ void set_stage_debug_name(unsigned, Stage);
};
} // namespace GL