X-Git-Url: http://git.tdb.fi/?p=libs%2Fgl.git;a=blobdiff_plain;f=source%2Fprogram.h;fp=source%2Fprogram.h;h=36f380a2a9821835d930e0e29736ef2e706778d2;hp=e78c8ccd0bfef96d0da006827bd6e22dee527973;hb=259254bc46e3aec6f719e1aea5e4936569c15b6e;hpb=c44e9005200af76266ef44c158688e112ad4bb32 diff --git a/source/program.h b/source/program.h index e78c8ccd..36f380a2 100644 --- a/source/program.h +++ b/source/program.h @@ -35,6 +35,7 @@ public: void vertex_shader(const std::string &); }; + typedef unsigned LayoutHash; struct UniformBlockInfo; struct UniformInfo @@ -54,7 +55,7 @@ public: unsigned data_size; unsigned bind_point; std::vector uniforms; - unsigned layout_hash; + LayoutHash layout_hash; }; typedef std::list ShaderList; @@ -68,7 +69,7 @@ private: bool linked; UniformBlockMap uniform_blocks; UniformMap uniforms; - unsigned uniform_layout_hash; + LayoutHash uniform_layout_hash; bool legacy_vars; public: @@ -97,13 +98,13 @@ public: void link(); private: - static unsigned compute_layout_hash(const std::vector &); + static LayoutHash compute_layout_hash(const std::vector &); static bool uniform_location_compare(const UniformInfo *, const UniformInfo *); public: bool is_linked() const { return linked; } std::string get_info_log() const; - unsigned get_uniform_layout_hash() const { return uniform_layout_hash; } + LayoutHash get_uniform_layout_hash() const { return uniform_layout_hash; } const UniformBlockMap &get_uniform_blocks() const { return uniform_blocks; } const UniformBlockInfo &get_uniform_block_info(const std::string &) const; const UniformMap &get_uniforms() const { return uniforms; }