From: Mikko Rasa Date: Sun, 16 Jul 2023 15:04:21 +0000 (+0300) Subject: Remove some old functions which are no longer used X-Git-Url: https://git.tdb.fi/?a=commitdiff_plain;h=64b593f1c3532f30753713e2e0bf5c43ea6f5c07;p=libs%2Fgl.git Remove some old functions which are no longer used --- diff --git a/source/core/program.cpp b/source/core/program.cpp index 6692ee0c..fe55fc28 100644 --- a/source/core/program.cpp +++ b/source/core/program.cpp @@ -217,28 +217,12 @@ void Program::collect_builtins(const SpirVModule::Structure &strct) reflect_data.n_clip_distances = m.array_size; } -const ReflectData::UniformBlockInfo &Program::get_uniform_block_info(const string &name) const -{ - auto i = find_member(reflect_data.uniform_blocks, name, &ReflectData::UniformBlockInfo::name); - if(i==reflect_data.uniform_blocks.end()) - throw key_error(name); - return *i; -} - int Program::get_uniform_block_binding(Tag tag) const { auto i = lower_bound_member(reflect_data.uniform_blocks, tag, &ReflectData::UniformBlockInfo::tag); return i!=reflect_data.uniform_blocks.end() && i->tag==tag ? i->bind_point : -1; } -const ReflectData::UniformInfo &Program::get_uniform_info(const string &name) const -{ - auto i = lower_bound_member(reflect_data.uniforms, Tag(name), &ReflectData::UniformInfo::tag); - if(i==reflect_data.uniforms.end() || i->name!=name) - throw key_error(name); - return *i; -} - const ReflectData::UniformInfo &Program::get_uniform_info(Tag tag) const { auto i = lower_bound_member(reflect_data.uniforms, tag, &ReflectData::UniformInfo::tag); diff --git a/source/core/program.h b/source/core/program.h index c0db59da..3bc72a78 100644 --- a/source/core/program.h +++ b/source/core/program.h @@ -79,10 +79,8 @@ public: unsigned get_n_descriptor_sets() const { return reflect_data.n_descriptor_sets; } unsigned get_push_constants_size() const { return reflect_data.push_constants_size; } const std::vector &get_uniform_blocks() const { return reflect_data.uniform_blocks; } - const ReflectData::UniformBlockInfo &get_uniform_block_info(const std::string &) const; int get_uniform_block_binding(Tag) const; const std::vector &get_uniforms() const { return reflect_data.uniforms; } - const ReflectData::UniformInfo &get_uniform_info(const std::string &) const; const ReflectData::UniformInfo &get_uniform_info(Tag) const; int get_uniform_location(const std::string &) const; int get_uniform_location(Tag) const;