mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-03-02 19:13:34 +00:00
Code Issues Packages Projects Releases Wiki Activity

(menu_shader) Remove some unnecessary functions

Browse Source
This commit is contained in:
twinaphex 2019-04-13 06:40:21 +02:00
parent 70373dba9a
commit a7abd77141
5 changed files with 11 additions and 73 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
menu/cbs/menu_cbs_left.c
View File

@ -341,7 +341,7 @@ static int action_left_shader_num_passes(unsigned type, const char *label,
return menu_cbs_exit();
if (pass_count > 0)
menu_shader_manager_decrement_amount_passes();
shader->passes--;
menu_entries_ctl(MENU_ENTRIES_CTL_SET_REFRESH, &refresh);
menu_driver_ctl(RARCH_MENU_CTL_SET_PREVENT_POPULATE, NULL);

2
menu/cbs/menu_cbs_right.c
View File

@ -362,7 +362,7 @@ static int action_right_shader_num_passes(unsigned type, const char *label,
return menu_cbs_exit();
if (pass_count < GFX_MAX_SHADERS)
menu_shader_manager_increment_amount_passes();
shader->passes++;
menu_entries_ctl(MENU_ENTRIES_CTL_SET_REFRESH, &refresh);
menu_driver_ctl(RARCH_MENU_CTL_SET_PREVENT_POPULATE, NULL);

20
menu/menu_shader.c
View File

@ -44,26 +44,6 @@ struct video_shader *menu_shader_get(void)
return NULL;
}
void menu_shader_manager_decrement_amount_passes(void)
{
struct video_shader *shader = menu_shader_get();
if (!shader)
return;
shader->passes--;
}
void menu_shader_manager_increment_amount_passes(void)
{
struct video_shader *shader = menu_shader_get();
if (!shader)
return;
shader->passes++;
}
void menu_shader_manager_free(void)
{
if (menu_driver_shader)

4
menu/menu_shader.h
View File

@ -82,10 +82,6 @@ void menu_shader_manager_clear_pass_scale(unsigned i);
void menu_shader_manager_clear_pass_path(unsigned i);
void menu_shader_manager_decrement_amount_passes(void);
void menu_shader_manager_increment_amount_passes(void);
RETRO_END_DECLS
#endif

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

@ -150,9 +150,7 @@ void ShaderParamsDialog::clearLayout()
if (m_scrollArea)
{
foreach (QObject *obj, children())
{
obj->deleteLater();
}
}
m_layout = new QVBoxLayout();
@ -179,25 +177,17 @@ void ShaderParamsDialog::getShaders(struct video_shader **menu_shader, struct vi
if (menu_shader)
{
if (shader)
{
*menu_shader = shader;
}
else
{
*menu_shader = NULL;
}
}
if (video_shader)
{
if (shader)
{
*video_shader = shader_info.data;
}
else
{
*video_shader = NULL;
}
}
if (video_shader)
@ -215,13 +205,9 @@ void ShaderParamsDialog::getShaders(struct video_shader **menu_shader, struct vi
}
if (shader_info.data)
{
*video_shader = shader_info.data;
}
else
{
*video_shader = NULL;
}
}
}
@ -272,11 +258,11 @@ void ShaderParamsDialog::onFilterComboBoxIndexChanged(int)
void ShaderParamsDialog::onScaleComboBoxIndexChanged(int)
{
QComboBox *comboBox = qobject_cast<QComboBox*>(sender());
QVariant passVariant;
int pass = 0;
bool ok = false;
struct video_shader *menu_shader = NULL;
QComboBox *comboBox = qobject_cast<QComboBox*>(sender());
int pass = 0;
bool ok = false;
struct video_shader *menu_shader = NULL;
struct video_shader *video_shader = NULL;
getShaders(&menu_shader, &video_shader);
@ -345,10 +331,7 @@ void ShaderParamsDialog::onShaderPassMoveDownClicked()
pass = passVariant.toInt(&ok);
if (!ok)
return;
if (pass < 0)
if (!ok || pass < 0)
return;
if (video_shader)
@ -364,13 +347,9 @@ void ShaderParamsDialog::onShaderPassMoveDownClicked()
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;
}
}
tempPass = ShaderPass(&video_shader->pass[pass]);
@ -391,13 +370,9 @@ void ShaderParamsDialog::onShaderPassMoveDownClicked()
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;
}
}
tempPass = ShaderPass(&menu_shader->pass[pass]);
@ -429,10 +404,7 @@ void ShaderParamsDialog::onShaderPassMoveUpClicked()
pass = passVariant.toInt(&ok);
if (!ok)
return;
if (pass <= 0)
if (!ok || pass <= 0)
return;
if (video_shader)
@ -448,13 +420,9 @@ void ShaderParamsDialog::onShaderPassMoveUpClicked()
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;
}
}
tempPass = ShaderPass(&video_shader->pass[pass - 1]);
@ -475,13 +443,9 @@ void ShaderParamsDialog::onShaderPassMoveUpClicked()
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;
}
}
tempPass = ShaderPass(&menu_shader->pass[pass - 1]);
@ -684,7 +648,7 @@ void ShaderParamsDialog::onShaderAddPassClicked()
pathData = pathArray.constData();
if (menu_shader->passes < GFX_MAX_SHADERS)
menu_shader_manager_increment_amount_passes();
menu_shader->passes++;
else
return;
@ -811,7 +775,7 @@ void ShaderParamsDialog::onShaderClearAllPassesClicked()
return;
while (menu_shader->passes > 0)
menu_shader_manager_decrement_amount_passes();
menu_shader->passes--;
onShaderApplyClicked();
}
@ -846,11 +810,9 @@ void ShaderParamsDialog::onShaderRemovePassClicked()
/* move selected pass to the bottom */
for (i = pass; i < static_cast<int>(menu_shader->passes) - 1; i++)
{
std::swap(menu_shader->pass[i], menu_shader->pass[i + 1]);
}
menu_shader_manager_decrement_amount_passes();
menu_shader->passes--;
onShaderApplyClicked();
}