X-Git-Url: http://git.tdb.fi/?p=libs%2Fgl.git;a=blobdiff_plain;f=source%2Fcore%2Fprogram.cpp;h=8ac13bbd0ce21454cb5af1b269dacc0fc6770205;hp=a82ac1d227279be4edd1175428af8e6c0dfe6ffd;hb=d9c437291135255422c71918cd0cab8a735848af;hpb=4291fcf9489087492085b70e7960bdb3dbb5dc9c diff --git a/source/core/program.cpp b/source/core/program.cpp index a82ac1d2..8ac13bbd 100644 --- a/source/core/program.cpp +++ b/source/core/program.cpp @@ -74,7 +74,6 @@ void Program::collect_uniforms(const SpirVModule &mod) reflect_data.uniform_blocks.emplace_back(); vector > block_uniform_names(1); - unsigned n_descriptor_sets = 0; for(const SpirVModule::Variable &v: mod.get_variables()) { if((v.storage==SpirVModule::UNIFORM || v.storage==SpirVModule::PUSH_CONSTANT) && v.struct_type) @@ -94,7 +93,7 @@ void Program::collect_uniforms(const SpirVModule &mod) info.bind_point = v.binding | (v.descriptor_set<<20); else info.bind_point = ReflectData::DEFAULT_BLOCK; - n_descriptor_sets = max(n_descriptor_sets, v.descriptor_set+1); + reflect_data.n_descriptor_sets = max(reflect_data.n_descriptor_sets, v.descriptor_set+1); } string prefix; @@ -113,7 +112,7 @@ void Program::collect_uniforms(const SpirVModule &mod) info.location = v.location; if(v.binding>=0) info.binding = v.binding | (v.descriptor_set<<20); - n_descriptor_sets = max(n_descriptor_sets, v.descriptor_set+1); + reflect_data.n_descriptor_sets = max(reflect_data.n_descriptor_sets, v.descriptor_set+1); info.array_size = max(v.array_size, 1U); info.type = v.type; } @@ -141,7 +140,6 @@ void Program::collect_uniforms(const SpirVModule &mod) block.update_layout_hash(); } - reflect_data.n_descriptor_sets = n_descriptor_sets; reflect_data.update_layout_hash(); }