diff --git a/Makefile.ps3.rgl b/Makefile.ps3.rgl index d48b0d621e..d3b590dd65 100644 --- a/Makefile.ps3.rgl +++ b/Makefile.ps3.rgl @@ -1,6 +1,6 @@ #which compiler to build with - GCC or SNC #set to GCC for debug builds for use with debugger -CELL_BUILD_TOOLS = SNC +CELL_BUILD_TOOLS = GCC CELL_GPU_TYPE = RSX DEBUG = 0 diff --git a/console/console_ext.h b/console/console_ext.h index 299c8f33e8..4ef5611d11 100644 --- a/console/console_ext.h +++ b/console/console_ext.h @@ -31,6 +31,21 @@ VIDEO ============================================================ */ +#define MIN_SCALING_FACTOR (1.0f) + +#if defined(__CELLOS_LV2__) +#define MAX_SCALING_FACTOR (5.0f) +#else +#define MAX_SCALING_FACTOR (2.0f) +#endif + +enum +{ + FBO_DEINIT = 0, + FBO_INIT, + FBO_REINIT +}; + enum aspect_ratio { ASPECT_RATIO_1_1 = 0, diff --git a/ps3/main.c b/ps3/main.c index 9a5fb096d6..1ae53780b1 100644 --- a/ps3/main.c +++ b/ps3/main.c @@ -40,7 +40,6 @@ #include #include "ps3_input.h" -#include "ps3_video_psgl.h" #include "../console/console_ext.h" #include "../conf/config_file.h" diff --git a/ps3/menu.c b/ps3/menu.c index 6d6a9da13c..27b513d51f 100644 --- a/ps3/menu.c +++ b/ps3/menu.c @@ -28,7 +28,6 @@ #include "../console/console_ext.h" -#include "ps3_video_psgl.h" #include "../gfx/gl_common.h" #include "shared.h" @@ -148,6 +147,9 @@ static menu menu_controlssettings = { items_generalsettings /* items */ }; +//forward decls +extern const char *ps3_get_resolution_label(unsigned resolution); + static void display_menubar(uint32_t menu_enum) { gl_t *gl = driver.video_data; diff --git a/ps3/ps3_input.c b/ps3/ps3_input.c index 546d8c7312..f4f4559ee6 100644 --- a/ps3/ps3_input.c +++ b/ps3/ps3_input.c @@ -24,9 +24,8 @@ #include #include "ps3_input.h" -#include "ps3_video_psgl.h" #include "../driver.h" -#include "../console/console_ext_input.h" +#include "../console/console_ext.h" #include "../libretro.h" #include "../general.h" #include "shared.h" diff --git a/ps3/ps3_video_psgl.h b/ps3/ps3_video_psgl.h deleted file mode 100644 index 13efd8880d..0000000000 --- a/ps3/ps3_video_psgl.h +++ /dev/null @@ -1,43 +0,0 @@ -/* RetroArch - A frontend for libretro. - * Copyright (C) 2010-2012 - Hans-Kristian Arntzen - * Copyright (C) 2011-2012 - 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 . - */ - -#ifndef _PS3_VIDEO_PSGL_H -#define _PS3_VIDEO_PSGL_H - -#include "../gfx/gl_common.h" -#include "../gfx/gfx_common.h" -#include "../gfx/image.h" -#include "../console/console_ext.h" - -enum -{ - FBO_DEINIT = 0, - FBO_INIT, - FBO_REINIT -}; - -#define MIN_SCALING_FACTOR (1.0f) -#define MAX_SCALING_FACTOR (5.0f) - -const char * ps3_get_resolution_label(uint32_t resolution); - -bool gl_cg_reinit(const char *path); -bool gl_cg_save_cgp(const char *path, const struct gl_cg_cgp_info *info); -bool gl_cg_load_shader(unsigned index, const char *path); - -unsigned gl_cg_get_lut_info(struct gl_cg_lut_info *info, unsigned elems); - -#endif