mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-03-29 22:20:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

slang_preprocess_parse_parameters - get rid of one local variable

Browse Source
This commit is contained in:
twinaphex 2021-04-11 01:49:41 +02:00
parent f29a4b51cc
commit a8f410ed40
1 changed files with 7 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
gfx/drivers_shader/slang_process.cpp
View File

@ -333,9 +333,9 @@ bool slang_preprocess_parse_parameters(glslang_meta& meta,
* initialized to something sane. */
for (i = 0; i < meta.parameters.size(); i++)
{
bool mismatch_dup = false;
bool dup = false;
auto itr = std::find_if(shader->parameters,
struct video_shader_parameter *p = NULL;
bool mismatch_dup = false;
auto itr = std::find_if(shader->parameters,
shader->parameters + shader->num_parameters,
[&](const video_shader_parameter &parsed_param)
{
@ -344,7 +344,6 @@ bool slang_preprocess_parse_parameters(glslang_meta& meta,
if (itr != shader->parameters + shader->num_parameters)
{
dup = true;
/* Allow duplicate #pragma parameter, but only
* if they are exactly the same. */
if ( meta.parameters[i].desc != itr->desc ||
@ -358,21 +357,18 @@ bool slang_preprocess_parse_parameters(glslang_meta& meta,
itr->id);
mismatch_dup = true;
}
else
continue;
}
if (dup && !mismatch_dup)
continue;
if (mismatch_dup || shader->num_parameters == GFX_MAX_PARAMETERS)
{
shader->num_parameters = old_num_parameters;
return false;
}
struct video_shader_parameter *p = (struct video_shader_parameter*)
&shader->parameters[shader->num_parameters++];
if (!p)
if (!(p = (struct video_shader_parameter*)
&shader->parameters[shader->num_parameters++]))
continue;
strlcpy(p->id, meta.parameters[i].id.c_str(), sizeof(p->id));