mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-02-06 18:40:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

Qt: try to fix wrong parameter being set in a different way

Browse Source
This commit is contained in:
Brad Parker 2018-08-21 21:01:56 -04:00
parent 0b9adb3938
commit 67653ba5f0
1 changed files with 6 additions and 71 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

77
ui/drivers/qt/shaderparamsdialog.cpp
View File

@ -323,50 +323,18 @@ void ShaderParamsDialog::onShaderPassMoveDownClicked()
if (video_shader)
{
int i;
if (pass >= static_cast<int>(video_shader->passes) - 1)
return;
std::swap(video_shader->pass[pass], video_shader->pass[pass + 1]);
for (i = 0; i < static_cast<int>(video_shader->num_parameters); i++)
{
struct video_shader_parameter *param = &video_shader->parameters[i];
if (param->pass == pass)
{
param->pass += 1;
}
else if (param->pass == pass + 1)
{
param->pass -= 1;
}
}
}
if (menu_shader)
{
int i;
if (pass >= static_cast<int>(menu_shader->passes) - 1)
return;
std::swap(menu_shader->pass[pass], menu_shader->pass[pass + 1]);
for (i = 0; i < static_cast<int>(menu_shader->num_parameters); i++)
{
struct video_shader_parameter *param = &menu_shader->parameters[i];
if (param->pass == pass)
{
param->pass += 1;
}
else if (param->pass == pass + 1)
{
param->pass -= 1;
}
}
}
command_event(CMD_EVENT_SHADERS_APPLY_CHANGES, NULL);
@ -401,50 +369,18 @@ void ShaderParamsDialog::onShaderPassMoveUpClicked()
if (video_shader)
{
int i;
if (pass > static_cast<int>(video_shader->passes) - 1)
return;
std::swap(video_shader->pass[pass - 1], video_shader->pass[pass]);
for (i = 0; i < static_cast<int>(video_shader->num_parameters); i++)
{
struct video_shader_parameter *param = &video_shader->parameters[i];
if (param->pass == pass)
{
param->pass -= 1;
}
else if (param->pass == pass - 1)
{
param->pass += 1;
}
}
}
if (menu_shader)
{
int i;
if (pass > static_cast<int>(menu_shader->passes) - 1)
return;
std::swap(menu_shader->pass[pass - 1], menu_shader->pass[pass]);
for (i = 0; i < static_cast<int>(menu_shader->num_parameters); i++)
{
struct video_shader_parameter *param = &menu_shader->parameters[i];
if (param->pass == pass)
{
param->pass -= 1;
}
else if (param->pass == pass - 1)
{
param->pass += 1;
}
}
}
command_event(CMD_EVENT_SHADERS_APPLY_CHANGES, NULL);
@ -858,16 +794,15 @@ void ShaderParamsDialog::buildLayout()
if (video_shader->passes == 0)
setWindowTitle(msg_hash_to_str(MENU_ENUM_LABEL_VALUE_SHADER_OPTIONS));
}
else if (menu_shader)
{
avail_shader = menu_shader;
if (menu_shader->passes == 0)
setWindowTitle(msg_hash_to_str(MENU_ENUM_LABEL_VALUE_SHADER_OPTIONS));
}
else
{
setWindowTitle(msg_hash_to_str(MENU_ENUM_LABEL_VALUE_SHADER_OPTIONS));
/* video_shader isn't available yet, just keep retrying until it is */
QTimer::singleShot(0, this, SLOT(buildLayout()));
return;
}
clearLayout();
/* Only check video_shader for the path, menu_shader seems stale... e.g. if you remove all the shader passes,