mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-02-01 09:32:58 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/libretro/RetroArch

Browse Source
This commit is contained in:
twinaphex 2019-12-23 19:58:42 +01:00
commit 764f1d846e
2 changed files with 0 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
menu/cbs/menu_cbs_ok.c
View File

@ -5499,9 +5499,7 @@ static int action_ok_push_dropdown_item_video_shader_num_pass(const char *path,
const char *label, unsigned type, size_t idx, size_t entry_idx)
{
#if defined(HAVE_CG) || defined(HAVE_GLSL) || defined(HAVE_SLANG) || defined(HAVE_HLSL)
bool refresh = false;
struct video_shader *shader = menu_shader_get();
unsigned pass_count = shader ? shader->passes : 0;
if (!shader)
return menu_cbs_exit();

1
menu/menu_displaylist.c
View File

@ -7023,7 +7023,6 @@ static unsigned menu_displaylist_build_shader_parameter(
float min = 0;
float max = 0;
unsigned i = 0;
struct video_shader *shader = menu_shader_get();
struct video_shader_parameter *param = NULL;
unsigned offset = entry_type - _offset;