Remove some auto variables

This commit is contained in:
twinaphex 2020-01-22 19:07:10 +01:00
parent 528edf7e82
commit ff9701685f
2 changed files with 20 additions and 18 deletions

View File

@ -2270,14 +2270,14 @@ gl_core_filter_chain_t *gl_core_filter_chain_create_from_preset(
} }
else else
{ {
auto &param = shader->parameters[shader->num_parameters]; video_shader_parameter *param = &shader->parameters[shader->num_parameters];
strlcpy(param.id, meta_param.id.c_str(), sizeof(param.id)); strlcpy(param->id, meta_param.id.c_str(), sizeof(param->id));
strlcpy(param.desc, meta_param.desc.c_str(), sizeof(param.desc)); strlcpy(param->desc, meta_param.desc.c_str(), sizeof(param->desc));
param.current = meta_param.initial; param->current = meta_param.initial;
param.initial = meta_param.initial; param->initial = meta_param.initial;
param.minimum = meta_param.minimum; param->minimum = meta_param.minimum;
param.maximum = meta_param.maximum; param->maximum = meta_param.maximum;
param.step = meta_param.step; param->step = meta_param.step;
chain->add_parameter(i, shader->num_parameters, meta_param.id); chain->add_parameter(i, shader->num_parameters, meta_param.id);
shader->num_parameters++; shader->num_parameters++;
} }

View File

@ -901,8 +901,9 @@ bool vulkan_filter_chain::init_feedback()
bool use_feedback = false; bool use_feedback = false;
for (auto &pass : passes) for (auto &pass : passes)
{ {
auto &r = pass->get_reflection(); const slang_reflection &r = pass->get_reflection();
auto &feedbacks = r.semantic_textures[SLANG_TEXTURE_SEMANTIC_PASS_FEEDBACK]; auto &feedbacks = r.semantic_textures[
SLANG_TEXTURE_SEMANTIC_PASS_FEEDBACK];
if (i < feedbacks.size() && feedbacks[i].texture) if (i < feedbacks.size() && feedbacks[i].texture)
{ {
@ -2038,6 +2039,7 @@ void Pass::build_semantic_texture_array_vec4(uint8_t *data, slang_texture_semant
unsigned index, unsigned width, unsigned height) unsigned index, unsigned width, unsigned height)
{ {
auto &refl = reflection.semantic_textures[semantic]; auto &refl = reflection.semantic_textures[semantic];
if (index >= refl.size()) if (index >= refl.size())
return; return;
@ -2699,14 +2701,14 @@ vulkan_filter_chain_t *vulkan_filter_chain_create_from_preset(
} }
else else
{ {
auto &param = shader->parameters[shader->num_parameters]; video_shader_parameter *param = &shader->parameters[shader->num_parameters];
strlcpy(param.id, meta_param.id.c_str(), sizeof(param.id)); strlcpy(param->id, meta_param.id.c_str(), sizeof(param->id));
strlcpy(param.desc, meta_param.desc.c_str(), sizeof(param.desc)); strlcpy(param->desc, meta_param.desc.c_str(), sizeof(param->desc));
param.current = meta_param.initial; param->current = meta_param.initial;
param.initial = meta_param.initial; param->initial = meta_param.initial;
param.minimum = meta_param.minimum; param->minimum = meta_param.minimum;
param.maximum = meta_param.maximum; param->maximum = meta_param.maximum;
param.step = meta_param.step; param->step = meta_param.step;
chain->add_parameter(i, shader->num_parameters, meta_param.id); chain->add_parameter(i, shader->num_parameters, meta_param.id);
shader->num_parameters++; shader->num_parameters++;
} }