(PS3) Integrated local shader_cg.c into ps3_video_psgl.c

This commit is contained in:
Twinaphex 2012-03-23 01:19:44 +01:00
parent 4a5104bfcf
commit 42b756480b
6 changed files with 1208 additions and 1305 deletions

View File

@ -56,7 +56,6 @@ PPU_SRCS = fifo_buffer.c \
movie.c \
netplay.c \
ps3/ps3_video_psgl.c \
ps3/shader_cg.c \
gfx/snes_state.c \
patch.c \
audio/hermite.c \

View File

@ -36,7 +36,6 @@
#include "shared.h"
#include "../file.h"
#include "../general.h"
#include "../gfx/shader_cg.h"
#include "menu-port-defines.h"
#include "menu.h"

File diff suppressed because it is too large Load Diff

View File

@ -41,6 +41,9 @@
#define IS_TIMER_EXPIRED(getter) (!(IS_TIMER_NOT_EXPIRED(getter)))
#define SET_TIMER_EXPIRATION(setter, value) setter = g_frame_count + value;
#define SSNES_CG_MAX_SHADERS 16
#define SSNES_CG_MENU_SHADER_INDEX (SSNES_CG_MAX_SHADERS - 1)
enum
{
ASPECT_RATIO_4_3,
@ -101,6 +104,24 @@ typedef struct gl
void *empty_buf;
} gl_t;
struct gl_cg_cgp_info
{
const char *shader[2];
bool filter_linear[2];
bool render_to_texture;
float fbo_scale;
const char *lut_texture_path;
const char *lut_texture_id;
bool lut_texture_absolute;
};
struct gl_cg_lut_info
{
char id[64];
GLuint tex;
};
bool ps3_setup_texture(void);
const char * ps3_get_resolution_label(uint32_t resolution);
@ -120,6 +141,13 @@ void ps3graphics_set_vsync(uint32_t vsync);
void ps3graphics_video_init(bool get_all_resolutions);
void ps3graphics_video_reinit(void);
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);
extern void *g_gl;
extern unsigned g_frame_count;

File diff suppressed because it is too large Load Diff

View File

@ -1,81 +0,0 @@
/* SSNES - A Super Nintendo Entertainment System (SNES) Emulator frontend for libsnes.
* Copyright (C) 2010-2012 - Hans-Kristian Arntzen
*
* Some code herein may be based on code found in BSNES.
*
* SSNES 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.
*
* SSNES 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 SSNES.
* If not, see <http://www.gnu.org/licenses/>.
*/
#ifndef __SSNES_CG_H
#define __SSNES_CG_H
#include "../boolean.h"
#include "../gfx/gl_common.h"
#include <stdint.h>
bool gl_cg_init(const char *path);
bool gl_cg_reinit(const char *path);
void gl_cg_deinit(void);
void gl_cg_set_proj_matrix(void);
void gl_cg_set_params(unsigned width, unsigned height,
unsigned tex_width, unsigned tex_height,
unsigned out_width, unsigned out_height,
unsigned frame_count,
const struct gl_tex_info *info,
const struct gl_tex_info *prev_info,
const struct gl_tex_info *fbo_info,
unsigned fbo_info_cnt);
void gl_cg_use(unsigned index);
unsigned gl_cg_num(void);
bool gl_cg_filter_type(unsigned index, bool *smooth);
void gl_cg_shader_scale(unsigned index, struct gl_fbo_scale *scale);
// Used on PS3, but not really platform specific.
#define SSNES_CG_MAX_SHADERS 16
#define SSNES_CG_MENU_SHADER_INDEX (SSNES_CG_MAX_SHADERS - 1)
void gl_cg_set_menu_shader(const char *path);
void gl_cg_set_compiler_args(const char **argv);
bool gl_cg_load_shader(unsigned index, const char *path);
struct gl_cg_cgp_info
{
const char *shader[2];
bool filter_linear[2];
bool render_to_texture;
float fbo_scale;
const char *lut_texture_path;
const char *lut_texture_id;
bool lut_texture_absolute;
};
bool gl_cg_save_cgp(const char *path, const struct gl_cg_cgp_info *info);
void gl_cg_invalidate_context(void); // Call when resetting GL context on PS3.
struct gl_cg_lut_info
{
char id[64];
GLuint tex;
};
unsigned gl_cg_get_lut_info(struct gl_cg_lut_info *info, unsigned elems);
#endif