Build fix for targets with shaders - get rid of now

obsolete menu_common_backend.h header
This commit is contained in:
twinaphex 2014-10-02 11:36:52 +02:00
parent e07ae03047
commit 780c3220a0
7 changed files with 35 additions and 60 deletions

View File

@ -20,7 +20,8 @@
#include <string.h>
#include <limits.h>
#include <ctype.h>
#include "menu_common_backend.h"
#include "../menu_common.h"
#include "../../../settings_data.h"
#include "menu_backend.h"
#include "../menu_action.h"
#include "../menu_entries.h"

View File

@ -1,23 +0,0 @@
/* RetroArch - A frontend for libretro.
* Copyright (C) 2010-2014 - Hans-Kristian Arntzen
* Copyright (C) 2011-2014 - Daniel De Matteis
*
* RetroArch is free software: you can redistribute it and/or modify it under the terms
* of the GNU General Public License as published by the Free Software Found-
* ation, either version 3 of the License, or (at your option) any later version.
*
* RetroArch is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
* without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
* PURPOSE. See the GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License along with RetroArch.
* If not, see <http://www.gnu.org/licenses/>.
*/
#ifndef _MENU_COMMON_BACKEND_H
#define _MENU_COMMON_BACKEND_H
#include "../menu_common.h"
#include "../../../settings_data.h"
#endif

View File

@ -24,7 +24,6 @@
#include "../menu_common.h"
#include "../menu_driver.h"
#include "menu_display.h"
#include "../backend/menu_common_backend.h"
#include "../../../general.h"
#include "../../../gfx/gfx_common.h"
#include "../../../gfx/shader/shader_gl_common.h"

View File

@ -25,7 +25,6 @@
#include "../menu_driver.h"
#include "../menu_common.h"
#include "menu_display.h"
#include "../backend/menu_common_backend.h"
#include "../../../general.h"
#include "../../../gfx/gfx_common.h"
#include "../../../gfx/gl_common.h"

View File

@ -22,7 +22,6 @@
#include <limits.h>
#include "../menu_driver.h"
#include "../backend/menu_common_backend.h"
#include "../menu_common.h"
#include "../../../general.h"
#include "../../../gfx/gfx_common.h"

View File

@ -16,7 +16,6 @@
#include "menu_entries.h"
#include "menu_action.h"
#include "backend/menu_common_backend.h"
#include "../../settings_data.h"
#include "../../file_ext.h"

View File

@ -315,6 +315,39 @@ unsigned menu_shader_manager_get_type(const struct gfx_shader *shader)
return type;
}
static int handle_shader_pass_setting(struct gfx_shader *shader, unsigned action)
{
switch (action)
{
case MENU_ACTION_START:
if (shader && shader->passes)
shader->passes = 0;
driver.menu->need_refresh = true;
break;
case MENU_ACTION_LEFT:
if (shader && shader->passes)
shader->passes--;
driver.menu->need_refresh = true;
break;
case MENU_ACTION_RIGHT:
case MENU_ACTION_OK:
if (shader && (shader->passes < GFX_MAX_SHADERS))
shader->passes++;
driver.menu->need_refresh = true;
break;
default:
break;
}
if (driver.menu->need_refresh)
gfx_shader_resolve_parameters(NULL, driver.menu->shader);
return 0;
}
int menu_shader_manager_setting_toggle(
unsigned id, const char *label, unsigned action)
{
@ -503,38 +536,6 @@ int menu_shader_manager_setting_toggle(
return 0;
}
static int handle_shader_pass_setting(struct gfx_shader *shader, unsigned action)
{
switch (action)
{
case MENU_ACTION_START:
if (shader && shader->passes)
shader->passes = 0;
driver.menu->need_refresh = true;
break;
case MENU_ACTION_LEFT:
if (shader && shader->passes)
shader->passes--;
driver.menu->need_refresh = true;
break;
case MENU_ACTION_RIGHT:
case MENU_ACTION_OK:
if (shader && (shader->passes < GFX_MAX_SHADERS))
shader->passes++;
driver.menu->need_refresh = true;
break;
default:
break;
}
if (driver.menu->need_refresh)
gfx_shader_resolve_parameters(NULL, driver.menu->shader);
return 0;
}
void menu_shader_manager_apply_changes(void)
{