ShuriZma
/
RetroArch
mirror of https://github.com/libretro/RetroArch.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Rename gfx_shader* to video_shader*

This commit is contained in:
twinaphex 2015-01-19 21:24:08 +01:00
parent 77a7b39e88
commit da88bcdd91
21 changed files with 87 additions and 87 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
gfx/d3d/d3d.cpp
View File

@ -1179,7 +1179,7 @@ static bool d3d_init_multipass(d3d_video_t *d3d)
if (use_extra_pass) if (use_extra_pass)
{ {
d3d->shader.passes++; d3d->shader.passes++;
gfx_shader_pass *dummy_pass = (gfx_shader_pass*) video_shader_pass *dummy_pass = (video_shader_pass*)
&d3d->shader.pass[d3d->shader.passes - 1]; &d3d->shader.pass[d3d->shader.passes - 1];
dummy_pass->fbo.scale_x = dummy_pass->fbo.scale_y = 1.0f; dummy_pass->fbo.scale_x = dummy_pass->fbo.scale_y = 1.0f;
@ -1188,7 +1188,7 @@ static bool d3d_init_multipass(d3d_video_t *d3d)
} }
else else
{ {
gfx_shader_pass *pass = (gfx_shader_pass*) video_shader_pass *pass = (video_shader_pass*)
&d3d->shader.pass[d3d->shader.passes - 1]; &d3d->shader.pass[d3d->shader.passes - 1];
pass->fbo.scale_x = pass->fbo.scale_y = 1.0f; pass->fbo.scale_x = pass->fbo.scale_y = 1.0f;
@ -1233,11 +1233,11 @@ static void d3d_set_font_rect(d3d_video_t *d3d,
static bool d3d_init_singlepass(d3d_video_t *d3d) static bool d3d_init_singlepass(d3d_video_t *d3d)
{ {
#ifndef _XBOX #ifndef _XBOX
gfx_shader_pass *pass = NULL; video_shader_pass *pass = NULL;
memset(&d3d->shader, 0, sizeof(d3d->shader)); memset(&d3d->shader, 0, sizeof(d3d->shader));
d3d->shader.passes = 1; d3d->shader.passes = 1;
pass = (gfx_shader_pass*)&d3d->shader.pass[0]; pass = (video_shader_pass*)&d3d->shader.pass[0];
pass->fbo.valid = true; pass->fbo.valid = true;
pass->fbo.scale_x = pass->fbo.scale_y = 1.0; pass->fbo.scale_x = pass->fbo.scale_y = 1.0;

2
gfx/d3d/d3d.h
View File

@ -131,7 +131,7 @@ typedef struct d3d_video
std::string cg_shader; std::string cg_shader;
#ifndef _XBOX #ifndef _XBOX
struct gfx_shader shader; struct video_shader shader;
#endif #endif
video_info_t video_info; video_info_t video_info;

2
gfx/d3d/render_chain.h
View File

@ -32,7 +32,7 @@ struct Vertex
struct LinkInfo struct LinkInfo
{ {
unsigned tex_w, tex_h; unsigned tex_w, tex_h;
struct gfx_shader_pass *pass; struct video_shader_pass *pass;
}; };
enum PixelFormat enum PixelFormat

2
gfx/drivers/gl.c
View File

@ -3094,7 +3094,7 @@ static void gl_show_mouse(void *data, bool state)
gl->ctx_driver->show_mouse(gl, state); gl->ctx_driver->show_mouse(gl, state);
} }
static struct gfx_shader *gl_get_current_shader(void *data) static struct video_shader *gl_get_current_shader(void *data)
{ {
gl_t *gl = (gl_t*)data; gl_t *gl = (gl_t*)data;
return (gl && gl->shader) ? gl->shader->get_current_shader() : NULL; return (gl && gl->shader) ? gl->shader->get_current_shader() : NULL;

8
gfx/drivers_shader/shader_gl_cg.c
View File

@ -147,7 +147,7 @@ typedef struct cg_shader_data
unsigned cg_attrib_idx; unsigned cg_attrib_idx;
CGprofile cgVProf; CGprofile cgVProf;
CGprofile cgFProf; CGprofile cgFProf;
struct gfx_shader *cg_shader; struct video_shader *cg_shader;
state_tracker_t *state_tracker; state_tracker_t *state_tracker;
GLuint lut_textures[GFX_MAX_TEXTURES]; GLuint lut_textures[GFX_MAX_TEXTURES];
CGparameter cg_attribs[PREV_TEXTURES + 1 + 4 + GFX_MAX_SHADERS]; CGparameter cg_attribs[PREV_TEXTURES + 1 + 4 + GFX_MAX_SHADERS];
@ -570,7 +570,7 @@ static bool load_plain(cg_shader_data_t *cg, const char *path)
if (!load_stock(cg)) if (!load_stock(cg))
return false; return false;
cg->cg_shader = (struct gfx_shader*)calloc(1, sizeof(*cg->cg_shader)); cg->cg_shader = (struct video_shader*)calloc(1, sizeof(*cg->cg_shader));
if (!cg->cg_shader) if (!cg->cg_shader)
return false; return false;
@ -672,7 +672,7 @@ static bool load_preset(cg_shader_data_t *cg, const char *path)
return false; return false;
} }
cg->cg_shader = (struct gfx_shader*)calloc(1, sizeof(*cg->cg_shader)); cg->cg_shader = (struct video_shader*)calloc(1, sizeof(*cg->cg_shader));
if (!cg->cg_shader) if (!cg->cg_shader)
return false; return false;
@ -1051,7 +1051,7 @@ static bool gl_cg_mipmap_input(unsigned idx)
return false; return false;
} }
static struct gfx_shader *gl_cg_get_current_shader(void) static struct video_shader *gl_cg_get_current_shader(void)
{ {
cg_shader_data_t *cg = (cg_shader_data_t*)driver.video_shader_data; cg_shader_data_t *cg = (cg_shader_data_t*)driver.video_shader_data;
if (!cg) if (!cg)

10
gfx/drivers_shader/shader_glsl.c
View File

@ -205,7 +205,7 @@ static const char *stock_fragment_core_blend =
typedef struct glsl_shader_data typedef struct glsl_shader_data
{ {
struct gfx_shader *glsl_shader; struct video_shader *glsl_shader;
struct shader_uniforms gl_uniforms[GFX_MAX_SHADERS]; struct shader_uniforms gl_uniforms[GFX_MAX_SHADERS];
struct cache_vbo glsl_vbo[GFX_MAX_SHADERS]; struct cache_vbo glsl_vbo[GFX_MAX_SHADERS];
char glsl_alias_define[1024]; char glsl_alias_define[1024];
@ -430,7 +430,7 @@ static GLuint compile_program(glsl_shader_data_t *glsl,
return prog; return prog;
} }
static bool load_source_path(struct gfx_shader_pass *pass, static bool load_source_path(struct video_shader_pass *pass,
const char *path) const char *path)
{ {
if (read_file(path, (void**)&pass->source.string.vertex) <= 0) if (read_file(path, (void**)&pass->source.string.vertex) <= 0)
@ -448,7 +448,7 @@ static bool compile_programs(glsl_shader_data_t *glsl, GLuint *gl_prog)
{ {
const char *vertex = NULL; const char *vertex = NULL;
const char *fragment = NULL; const char *fragment = NULL;
struct gfx_shader_pass *pass = (struct gfx_shader_pass*) struct video_shader_pass *pass = (struct video_shader_pass*)
&glsl->glsl_shader->pass[i]; &glsl->glsl_shader->pass[i];
/* If we load from GLSLP (CGP), /* If we load from GLSLP (CGP),
@ -741,7 +741,7 @@ static bool gl_glsl_init(void *data, const char *path)
} }
#endif #endif
glsl->glsl_shader = (struct gfx_shader*)calloc(1, sizeof(*glsl->glsl_shader)); glsl->glsl_shader = (struct video_shader*)calloc(1, sizeof(*glsl->glsl_shader));
if (!glsl->glsl_shader) if (!glsl->glsl_shader)
{ {
free(glsl); free(glsl);
@ -1332,7 +1332,7 @@ static bool gl_glsl_mipmap_input(unsigned idx)
return false; return false;
} }
static struct gfx_shader *gl_glsl_get_current_shader(void) static struct video_shader *gl_glsl_get_current_shader(void)
{ {
glsl_shader_data_t *glsl = (glsl_shader_data_t*)driver.video_shader_data; glsl_shader_data_t *glsl = (glsl_shader_data_t*)driver.video_shader_data;
if (!glsl) if (!glsl)

8
gfx/drivers_shader/shader_hlsl.c
View File

@ -84,7 +84,7 @@ typedef struct hlsl_shader_data
{ {
struct hlsl_program prg[RARCH_HLSL_MAX_SHADERS]; struct hlsl_program prg[RARCH_HLSL_MAX_SHADERS];
unsigned active_idx; unsigned active_idx;
struct gfx_shader *cg_shader; struct video_shader *cg_shader;
} hlsl_shader_data_t; } hlsl_shader_data_t;
@ -243,7 +243,7 @@ static bool load_plain(hlsl_shader_data_t *hlsl, void *data, const char *path)
if (!load_stock(hlsl, data)) if (!load_stock(hlsl, data))
return false; return false;
hlsl->cg_shader = (struct gfx_shader*)calloc(1, sizeof(*hlsl->cg_shader)); hlsl->cg_shader = (struct video_shader*)calloc(1, sizeof(*hlsl->cg_shader));
if (!hlsl->cg_shader) if (!hlsl->cg_shader)
return false; return false;
@ -312,7 +312,7 @@ static bool load_preset(hlsl_shader_data_t *hlsl, void *data, const char *path)
} }
if (!hlsl->cg_shader) if (!hlsl->cg_shader)
hlsl->cg_shader = (struct gfx_shader*)calloc(1, sizeof(*hlsl->cg_shader)); hlsl->cg_shader = (struct video_shader*)calloc(1, sizeof(*hlsl->cg_shader));
if (!hlsl->cg_shader) if (!hlsl->cg_shader)
return false; return false;
@ -463,7 +463,7 @@ static bool hlsl_mipmap_input(unsigned idx)
return false; return false;
} }
static struct gfx_shader *hlsl_get_current_shader(void) static struct video_shader *hlsl_get_current_shader(void)
{ {
return NULL; return NULL;
} }

2
gfx/drivers_shader/shader_null.c
View File

@ -118,7 +118,7 @@ static bool shader_null_mipmap_input(unsigned idx)
return false; return false;
} }
static struct gfx_shader *shader_null_get_current_shader(void) static struct video_shader *shader_null_get_current_shader(void)
{ {
return NULL; return NULL;
} }

2
gfx/gl_common.c
View File

@ -47,7 +47,7 @@ void gl_load_texture_data(GLuint obj, const struct texture_image *img,
#endif #endif
} }
bool gl_load_luts(const struct gfx_shader *generic_shader, bool gl_load_luts(const struct video_shader *generic_shader,
GLuint *textures_lut) GLuint *textures_lut)
{ {
unsigned i; unsigned i;

2
gfx/gl_common.h
View File

@ -406,7 +406,7 @@ void gl_set_viewport(gl_t *gl, unsigned width, unsigned height,
void gl_load_texture_data(GLuint obj, const struct texture_image *img, void gl_load_texture_data(GLuint obj, const struct texture_image *img,
GLenum wrap, bool linear, bool mipmap); GLenum wrap, bool linear, bool mipmap);
bool gl_load_luts(const struct gfx_shader *generic_shader, bool gl_load_luts(const struct video_shader *generic_shader,
GLuint *lut_textures); GLuint *lut_textures);
#endif #endif

2
gfx/video_driver.h
View File

@ -107,7 +107,7 @@ typedef struct video_poke_interface
void (*show_mouse)(void *data, bool state); void (*show_mouse)(void *data, bool state);
void (*grab_mouse_toggle)(void *data); void (*grab_mouse_toggle)(void *data);
struct gfx_shader *(*get_current_shader)(void *data); struct video_shader *(*get_current_shader)(void *data);
} video_poke_interface_t; } video_poke_interface_t;
typedef struct video_driver typedef struct video_driver

2
gfx/video_shader_driver.h
View File

@ -47,7 +47,7 @@ typedef struct shader_backend
unsigned (*get_prev_textures)(void); unsigned (*get_prev_textures)(void);
bool (*mipmap_input)(unsigned index); bool (*mipmap_input)(unsigned index);
struct gfx_shader *(*get_current_shader)(void); struct video_shader *(*get_current_shader)(void);
enum rarch_shader_type type; enum rarch_shader_type type;

26
gfx/video_shader_parse.c
View File

@ -82,7 +82,7 @@ static enum gfx_wrap_type wrap_str_to_mode(const char *wrap_mode)
* *
* Returns: true (1) if successful, otherwise false (0). * Returns: true (1) if successful, otherwise false (0).
**/ **/
static bool video_shader_parse_pass(config_file_t *conf, struct gfx_shader_pass *pass, unsigned i) static bool video_shader_parse_pass(config_file_t *conf, struct video_shader_pass *pass, unsigned i)
{ {
char shader_name[64], filter_name_buf[64], wrap_name_buf[64], wrap_mode[64]; char shader_name[64], filter_name_buf[64], wrap_name_buf[64], wrap_mode[64];
char frame_count_mod_buf[64], srgb_output_buf[64], fp_fbo_buf[64]; char frame_count_mod_buf[64], srgb_output_buf[64], fp_fbo_buf[64];
@ -253,7 +253,7 @@ static bool video_shader_parse_pass(config_file_t *conf, struct gfx_shader_pass
* Returns: true (1) if successful, otherwise false (0). * Returns: true (1) if successful, otherwise false (0).
**/ **/
static bool video_shader_parse_textures(config_file_t *conf, static bool video_shader_parse_textures(config_file_t *conf,
struct gfx_shader *shader) struct video_shader *shader)
{ {
const char *id; const char *id;
char *save; char *save;
@ -312,8 +312,8 @@ static bool video_shader_parse_textures(config_file_t *conf,
* *
* Returns: handle to shader parameter if successful, otherwise NULL. * Returns: handle to shader parameter if successful, otherwise NULL.
**/ **/
static struct gfx_shader_parameter *video_shader_parse_find_parameter( static struct video_shader_parameter *video_shader_parse_find_parameter(
struct gfx_shader_parameter *params, unsigned num_params, const char *id) struct video_shader_parameter *params, unsigned num_params, const char *id)
{ {
unsigned i; unsigned i;
@ -336,13 +336,13 @@ static struct gfx_shader_parameter *video_shader_parse_find_parameter(
* Returns: true (1) if successful, otherwise false (0). * Returns: true (1) if successful, otherwise false (0).
**/ **/
bool video_shader_resolve_parameters(config_file_t *conf, bool video_shader_resolve_parameters(config_file_t *conf,
struct gfx_shader *shader) struct video_shader *shader)
{ {
unsigned i; unsigned i;
struct gfx_shader_parameter *param = NULL; struct video_shader_parameter *param = NULL;
shader->num_parameters = 0; shader->num_parameters = 0;
param = (struct gfx_shader_parameter*) param = (struct video_shader_parameter*)
&shader->parameters[shader->num_parameters]; &shader->parameters[shader->num_parameters];
/* Find all parameters in our shaders. */ /* Find all parameters in our shaders. */
@ -398,7 +398,7 @@ bool video_shader_resolve_parameters(config_file_t *conf,
for (id = strtok_r(parameters, ";", &save); id; for (id = strtok_r(parameters, ";", &save); id;
id = strtok_r(NULL, ";", &save)) id = strtok_r(NULL, ";", &save))
{ {
struct gfx_shader_parameter *parameter = (struct gfx_shader_parameter*) struct video_shader_parameter *parameter = (struct video_shader_parameter*)
video_shader_parse_find_parameter(shader->parameters, shader->num_parameters, id); video_shader_parse_find_parameter(shader->parameters, shader->num_parameters, id);
if (!parameter) if (!parameter)
@ -425,7 +425,7 @@ bool video_shader_resolve_parameters(config_file_t *conf,
* Returns: true (1) if successful, otherwise false (0). * Returns: true (1) if successful, otherwise false (0).
**/ **/
static bool video_shader_parse_imports(config_file_t *conf, static bool video_shader_parse_imports(config_file_t *conf,
struct gfx_shader *shader) struct video_shader *shader)
{ {
char imports[1024]; char imports[1024];
const char *id; const char *id;
@ -534,7 +534,7 @@ static bool video_shader_parse_imports(config_file_t *conf,
* *
* Returns: true (1) if successful, otherwise false (0). * Returns: true (1) if successful, otherwise false (0).
**/ **/
bool video_shader_read_conf_cgp(config_file_t *conf, struct gfx_shader *shader) bool video_shader_read_conf_cgp(config_file_t *conf, struct video_shader *shader)
{ {
unsigned shaders, i; unsigned shaders, i;
@ -701,7 +701,7 @@ static void shader_write_variable(config_file_t *conf,
* textures, imports, etc) to disk. * textures, imports, etc) to disk.
**/ **/
void video_shader_write_conf_cgp(config_file_t *conf, void video_shader_write_conf_cgp(config_file_t *conf,
struct gfx_shader *shader) struct video_shader *shader)
{ {
unsigned i; unsigned i;
@ -710,7 +710,7 @@ void video_shader_write_conf_cgp(config_file_t *conf,
for (i = 0; i < shader->passes; i++) for (i = 0; i < shader->passes; i++)
{ {
char key[64]; char key[64];
const struct gfx_shader_pass *pass = &shader->pass[i]; const struct video_shader_pass *pass = &shader->pass[i];
snprintf(key, sizeof(key), "shader%u", i); snprintf(key, sizeof(key), "shader%u", i);
config_set_string(conf, key, pass->source.path); config_set_string(conf, key, pass->source.path);
@ -855,7 +855,7 @@ enum rarch_shader_type video_shader_parse_type(const char *path,
* Resolves relative shader path (@ref_path) into absolute * Resolves relative shader path (@ref_path) into absolute
* shader paths. * shader paths.
**/ **/
void video_shader_resolve_relative(struct gfx_shader *shader, void video_shader_resolve_relative(struct video_shader *shader,
const char *ref_path) const char *ref_path)
{ {
unsigned i; unsigned i;

22
gfx/video_shader_parse.h
View File

@ -87,7 +87,7 @@ struct gfx_fbo_scale
bool valid; bool valid;
}; };
struct gfx_shader_parameter struct video_shader_parameter
{ {
char id[64]; char id[64];
char desc[64]; char desc[64];
@ -98,7 +98,7 @@ struct gfx_shader_parameter
float step; float step;
}; };
struct gfx_shader_pass struct video_shader_pass
{ {
struct struct
{ {
@ -118,7 +118,7 @@ struct gfx_shader_pass
bool mipmap; bool mipmap;
}; };
struct gfx_shader_lut struct video_shader_lut
{ {
char id[64]; char id[64];
char path[PATH_MAX_LENGTH]; char path[PATH_MAX_LENGTH];
@ -129,7 +129,7 @@ struct gfx_shader_lut
/* This is pretty big, shouldn't be put on the stack. /* This is pretty big, shouldn't be put on the stack.
* Avoid lots of allocation for convenience. */ * Avoid lots of allocation for convenience. */
struct gfx_shader struct video_shader
{ {
enum rarch_shader_type type; enum rarch_shader_type type;
@ -137,12 +137,12 @@ struct gfx_shader
char prefix[64]; char prefix[64];
unsigned passes; unsigned passes;
struct gfx_shader_pass pass[GFX_MAX_SHADERS]; struct video_shader_pass pass[GFX_MAX_SHADERS];
unsigned luts; unsigned luts;
struct gfx_shader_lut lut[GFX_MAX_TEXTURES]; struct video_shader_lut lut[GFX_MAX_TEXTURES];
struct gfx_shader_parameter parameters[GFX_MAX_PARAMETERS]; struct video_shader_parameter parameters[GFX_MAX_PARAMETERS];
unsigned num_parameters; unsigned num_parameters;
unsigned variables; unsigned variables;
@ -163,7 +163,7 @@ struct gfx_shader
* Returns: true (1) if successful, otherwise false (0). * Returns: true (1) if successful, otherwise false (0).
**/ **/
bool video_shader_read_conf_cgp(config_file_t *conf, bool video_shader_read_conf_cgp(config_file_t *conf,
struct gfx_shader *shader); struct video_shader *shader);
/** /**
* video_shader_write_conf_cgp: * video_shader_write_conf_cgp:
@ -174,7 +174,7 @@ bool video_shader_read_conf_cgp(config_file_t *conf,
* textures, imports, etc) to disk. * textures, imports, etc) to disk.
**/ **/
void video_shader_write_conf_cgp(config_file_t *conf, void video_shader_write_conf_cgp(config_file_t *conf,
struct gfx_shader *shader); struct video_shader *shader);
/** /**
* video_shader_resolve_relative: * video_shader_resolve_relative:
@ -184,7 +184,7 @@ void video_shader_write_conf_cgp(config_file_t *conf,
* Resolves relative shader path (@ref_path) into absolute * Resolves relative shader path (@ref_path) into absolute
* shader paths. * shader paths.
**/ **/
void video_shader_resolve_relative(struct gfx_shader *shader, void video_shader_resolve_relative(struct video_shader *shader,
const char *ref_path); const char *ref_path);
/** /**
@ -197,7 +197,7 @@ void video_shader_resolve_relative(struct gfx_shader *shader,
* Returns: true (1) if successful, otherwise false (0). * Returns: true (1) if successful, otherwise false (0).
**/ **/
bool video_shader_resolve_parameters(config_file_t *conf, bool video_shader_resolve_parameters(config_file_t *conf,
struct gfx_shader *shader); struct video_shader *shader);
/** /**
* video_shader_parse_type: * video_shader_parse_type:

2
gfx/video_thread_wrapper.c
View File

@ -844,7 +844,7 @@ static void thread_apply_state_changes(void *data)
/* This is read-only state which should not /* This is read-only state which should not
* have any kind of race condition. */ * have any kind of race condition. */
static struct gfx_shader *thread_get_current_shader(void *data) static struct video_shader *thread_get_current_shader(void *data)
{ {
thread_video_t *thr = (thread_video_t*)data; thread_video_t *thr = (thread_video_t*)data;
if (!thr) if (!thr)

2
menu/menu.c
View File

@ -188,7 +188,7 @@ void *menu_init(const void *data)
g_extern.core_info_current = (core_info_t*)calloc(1, sizeof(core_info_t)); g_extern.core_info_current = (core_info_t*)calloc(1, sizeof(core_info_t));
#ifdef HAVE_SHADER_MANAGER #ifdef HAVE_SHADER_MANAGER
menu->shader = (struct gfx_shader*)calloc(1, sizeof(struct gfx_shader)); menu->shader = (struct video_shader*)calloc(1, sizeof(struct video_shader));
#endif #endif
menu->push_start_screen = g_settings.menu_show_start_screen; menu->push_start_screen = g_settings.menu_show_start_screen;
g_settings.menu_show_start_screen = false; g_settings.menu_show_start_screen = false;

2
menu/menu_driver.h
View File

@ -108,7 +108,7 @@ typedef struct
bool load_no_content; bool load_no_content;
struct gfx_shader *shader; struct video_shader *shader;
struct menu_bind_state binds; struct menu_bind_state binds;

52
menu/menu_entries_cbs.c
View File

@ -927,8 +927,8 @@ static int action_start_shader_action_parameter(unsigned type, const char *label
unsigned action) unsigned action)
{ {
#ifdef HAVE_SHADER_MANAGER #ifdef HAVE_SHADER_MANAGER
struct gfx_shader *shader = NULL; struct video_shader *shader = NULL;
struct gfx_shader_parameter *param = NULL; struct video_shader_parameter *param = NULL;
if (driver.video_poke && driver.video_data && driver.video_poke->get_current_shader) if (driver.video_poke && driver.video_data && driver.video_poke->get_current_shader)
shader = driver.video_poke->get_current_shader(driver.video_data); shader = driver.video_poke->get_current_shader(driver.video_data);
@ -948,8 +948,8 @@ static int action_start_shader_action_preset_parameter(unsigned type, const char
unsigned action) unsigned action)
{ {
#ifdef HAVE_SHADER_MANAGER #ifdef HAVE_SHADER_MANAGER
struct gfx_shader *shader = NULL; struct video_shader *shader = NULL;
struct gfx_shader_parameter *param = NULL; struct video_shader_parameter *param = NULL;
if (!(shader = driver.menu->shader)) if (!(shader = driver.menu->shader))
return 0; return 0;
@ -966,8 +966,8 @@ static int shader_action_parameter_toggle(unsigned type, const char *label,
unsigned action) unsigned action)
{ {
#ifdef HAVE_SHADER_MANAGER #ifdef HAVE_SHADER_MANAGER
struct gfx_shader *shader = NULL; struct video_shader *shader = NULL;
struct gfx_shader_parameter *param = NULL; struct video_shader_parameter *param = NULL;
if (driver.video_poke && driver.video_data && driver.video_poke->get_current_shader) if (driver.video_poke && driver.video_data && driver.video_poke->get_current_shader)
shader = driver.video_poke->get_current_shader(driver.video_data); shader = driver.video_poke->get_current_shader(driver.video_data);
@ -1001,8 +1001,8 @@ static int shader_action_parameter_preset_toggle(unsigned type, const char *labe
unsigned action) unsigned action)
{ {
#ifdef HAVE_SHADER_MANAGER #ifdef HAVE_SHADER_MANAGER
struct gfx_shader *shader = NULL; struct video_shader *shader = NULL;
struct gfx_shader_parameter *param = NULL; struct video_shader_parameter *param = NULL;
if (!(shader = driver.menu->shader)) if (!(shader = driver.menu->shader))
return 0; return 0;
@ -1098,8 +1098,8 @@ static int action_start_shader_pass(unsigned type, const char *label,
{ {
#ifdef HAVE_SHADER_MANAGER #ifdef HAVE_SHADER_MANAGER
hack_shader_pass = type - MENU_SETTINGS_SHADER_PASS_0; hack_shader_pass = type - MENU_SETTINGS_SHADER_PASS_0;
struct gfx_shader *shader = driver.menu->shader; struct video_shader *shader = driver.menu->shader;
struct gfx_shader_pass *shader_pass = NULL; struct video_shader_pass *shader_pass = NULL;
if (shader) if (shader)
shader_pass = &shader->pass[hack_shader_pass]; shader_pass = &shader->pass[hack_shader_pass];
@ -1132,8 +1132,8 @@ static int action_start_shader_scale_pass(unsigned type, const char *label,
{ {
#ifdef HAVE_SHADER_MANAGER #ifdef HAVE_SHADER_MANAGER
unsigned pass = type - MENU_SETTINGS_SHADER_PASS_SCALE_0; unsigned pass = type - MENU_SETTINGS_SHADER_PASS_SCALE_0;
struct gfx_shader *shader = driver.menu->shader; struct video_shader *shader = driver.menu->shader;
struct gfx_shader_pass *shader_pass = &shader->pass[pass]; struct video_shader_pass *shader_pass = &shader->pass[pass];
if (shader) if (shader)
{ {
@ -1260,8 +1260,8 @@ static int action_toggle_shader_scale_pass(unsigned type, const char *label,
{ {
#ifdef HAVE_SHADER_MANAGER #ifdef HAVE_SHADER_MANAGER
unsigned pass = type - MENU_SETTINGS_SHADER_PASS_SCALE_0; unsigned pass = type - MENU_SETTINGS_SHADER_PASS_SCALE_0;
struct gfx_shader *shader = driver.menu->shader; struct video_shader *shader = driver.menu->shader;
struct gfx_shader_pass *shader_pass = &shader->pass[pass]; struct video_shader_pass *shader_pass = &shader->pass[pass];
switch (action) switch (action)
{ {
@ -1289,8 +1289,8 @@ static int action_start_shader_filter_pass(unsigned type, const char *label,
{ {
#ifdef HAVE_SHADER_MANAGER #ifdef HAVE_SHADER_MANAGER
unsigned pass = type - MENU_SETTINGS_SHADER_PASS_FILTER_0; unsigned pass = type - MENU_SETTINGS_SHADER_PASS_FILTER_0;
struct gfx_shader *shader = driver.menu->shader; struct video_shader *shader = driver.menu->shader;
struct gfx_shader_pass *shader_pass = &shader->pass[pass]; struct video_shader_pass *shader_pass = &shader->pass[pass];
if (shader && shader_pass) if (shader && shader_pass)
shader_pass->filter = RARCH_FILTER_UNSPEC; shader_pass->filter = RARCH_FILTER_UNSPEC;
@ -1304,8 +1304,8 @@ static int action_toggle_shader_filter_pass(unsigned type, const char *label,
{ {
#ifdef HAVE_SHADER_MANAGER #ifdef HAVE_SHADER_MANAGER
unsigned pass = type - MENU_SETTINGS_SHADER_PASS_FILTER_0; unsigned pass = type - MENU_SETTINGS_SHADER_PASS_FILTER_0;
struct gfx_shader *shader = driver.menu->shader; struct video_shader *shader = driver.menu->shader;
struct gfx_shader_pass *shader_pass = &shader->pass[pass]; struct video_shader_pass *shader_pass = &shader->pass[pass];
switch (action) switch (action)
{ {
@ -1338,7 +1338,7 @@ static int action_start_shader_num_passes(unsigned type, const char *label,
unsigned action) unsigned action)
{ {
#ifdef HAVE_SHADER_MANAGER #ifdef HAVE_SHADER_MANAGER
struct gfx_shader *shader = driver.menu->shader; struct video_shader *shader = driver.menu->shader;
if (!shader) if (!shader)
return -1; return -1;
@ -1402,7 +1402,7 @@ static int action_toggle_shader_num_passes(unsigned type, const char *label,
unsigned action) unsigned action)
{ {
#ifdef HAVE_SHADER_MANAGER #ifdef HAVE_SHADER_MANAGER
struct gfx_shader *shader = driver.menu->shader; struct video_shader *shader = driver.menu->shader;
if (!shader) if (!shader)
return -1; return -1;
@ -1804,7 +1804,7 @@ static int deferred_push_performance_counters(void *data, void *userdata,
return 0; return 0;
} }
static inline struct gfx_shader *shader_manager_get_current_shader( static inline struct video_shader *shader_manager_get_current_shader(
menu_handle_t *menu, const char *label, unsigned type) menu_handle_t *menu, const char *label, unsigned type)
{ {
if (!strcmp(label, "video_shader_preset_parameters")) if (!strcmp(label, "video_shader_preset_parameters"))
@ -1817,7 +1817,7 @@ static inline struct gfx_shader *shader_manager_get_current_shader(
static int deferred_push_video_shader_parameters_common(void *data, void *userdata, static int deferred_push_video_shader_parameters_common(void *data, void *userdata,
const char *path, const char *label, unsigned type, const char *path, const char *label, unsigned type,
struct gfx_shader *shader, unsigned base_parameter) struct video_shader *shader, unsigned base_parameter)
{ {
unsigned i; unsigned i;
file_list_t *list = (file_list_t*)data; file_list_t *list = (file_list_t*)data;
@ -1855,7 +1855,7 @@ static int deferred_push_video_shader_preset_parameters(void *data, void *userda
static int deferred_push_video_shader_parameters(void *data, void *userdata, static int deferred_push_video_shader_parameters(void *data, void *userdata,
const char *path, const char *label, unsigned type) const char *path, const char *label, unsigned type)
{ {
struct gfx_shader *shader = NULL; struct video_shader *shader = NULL;
if (driver.video_poke && driver.video_data && driver.video_poke->get_current_shader) if (driver.video_poke && driver.video_data && driver.video_poke->get_current_shader)
shader = driver.video_poke->get_current_shader(driver.video_data); shader = driver.video_poke->get_current_shader(driver.video_data);
@ -1945,9 +1945,9 @@ static int deferred_push_shader_options(void *data, void *userdata,
const char *path, const char *label, unsigned type) const char *path, const char *label, unsigned type)
{ {
unsigned i; unsigned i;
struct gfx_shader *shader = NULL; struct video_shader *shader = NULL;
file_list_t *list = (file_list_t*)data; file_list_t *list = (file_list_t*)data;
file_list_t *menu_list = (file_list_t*)userdata; file_list_t *menu_list = (file_list_t*)userdata;
if (!list || !menu_list) if (!list || !menu_list)
return -1; return -1;

8
menu/menu_shader.c
View File

@ -29,7 +29,7 @@ void menu_shader_manager_init(void *data)
#ifdef HAVE_SHADER_MANAGER #ifdef HAVE_SHADER_MANAGER
char preset_path[PATH_MAX_LENGTH]; char preset_path[PATH_MAX_LENGTH];
const char *ext; const char *ext;
struct gfx_shader *shader = NULL; struct video_shader *shader = NULL;
config_file_t *conf = NULL; config_file_t *conf = NULL;
const char *config_path = NULL; const char *config_path = NULL;
menu_handle_t *menu = (menu_handle_t*)data; menu_handle_t *menu = (menu_handle_t*)data;
@ -37,7 +37,7 @@ void menu_shader_manager_init(void *data)
if (!menu) if (!menu)
return; return;
shader = (struct gfx_shader*)menu->shader; shader = (struct video_shader*)menu->shader;
if (*g_extern.core_specific_config_path if (*g_extern.core_specific_config_path
&& g_settings.core_specific_config) && g_settings.core_specific_config)
@ -119,7 +119,7 @@ void menu_shader_manager_init(void *data)
* *
* Sets shader preset. * Sets shader preset.
**/ **/
void menu_shader_manager_set_preset(struct gfx_shader *shader, void menu_shader_manager_set_preset(struct video_shader *shader,
unsigned type, const char *preset_path) unsigned type, const char *preset_path)
{ {
#ifdef HAVE_SHADER_MANAGER #ifdef HAVE_SHADER_MANAGER
@ -261,7 +261,7 @@ void menu_shader_manager_save_preset(
* *
* Returns: type of shader. * Returns: type of shader.
**/ **/
unsigned menu_shader_manager_get_type(const struct gfx_shader *shader) unsigned menu_shader_manager_get_type(const struct video_shader *shader)
{ {
#ifndef HAVE_SHADER_MANAGER #ifndef HAVE_SHADER_MANAGER
return RARCH_SHADER_NONE; return RARCH_SHADER_NONE;

4
menu/menu_shader.h
View File

@ -39,7 +39,7 @@ void menu_shader_manager_init(void *data);
* Sets shader preset. * Sets shader preset.
**/ **/
void menu_shader_manager_set_preset( void menu_shader_manager_set_preset(
struct gfx_shader *shader, struct video_shader *shader,
unsigned type, const char *preset_path); unsigned type, const char *preset_path);
/** /**
@ -61,7 +61,7 @@ void menu_shader_manager_save_preset(
* Returns: type of shader. * Returns: type of shader.
**/ **/
unsigned menu_shader_manager_get_type( unsigned menu_shader_manager_get_type(
const struct gfx_shader *shader); const struct video_shader *shader);
/** /**
* menu_shader_manager_apply_changes: * menu_shader_manager_apply_changes:

6
settings_data.c
View File

@ -2844,13 +2844,13 @@ void setting_data_get_label(char *type_str,
else if (type >= MENU_SETTINGS_SHADER_PARAMETER_0 else if (type >= MENU_SETTINGS_SHADER_PARAMETER_0
&& type <= MENU_SETTINGS_SHADER_PARAMETER_LAST) && type <= MENU_SETTINGS_SHADER_PARAMETER_LAST)
{ {
struct gfx_shader *shader = NULL; struct video_shader *shader = NULL;
if (driver.video_poke && driver.video_data && driver.video_poke->get_current_shader) if (driver.video_poke && driver.video_data && driver.video_poke->get_current_shader)
shader = driver.video_poke->get_current_shader(driver.video_data); shader = driver.video_poke->get_current_shader(driver.video_data);
if (shader) if (shader)
{ {
const struct gfx_shader_parameter *param = const struct video_shader_parameter *param =
&shader->parameters[type - MENU_SETTINGS_SHADER_PARAMETER_0]; &shader->parameters[type - MENU_SETTINGS_SHADER_PARAMETER_0];
snprintf(type_str, type_str_size, "%.2f [%.2f %.2f]", snprintf(type_str, type_str_size, "%.2f [%.2f %.2f]",
param->current, param->minimum, param->maximum); param->current, param->minimum, param->maximum);
@ -2861,7 +2861,7 @@ void setting_data_get_label(char *type_str,
{ {
if (driver.menu->shader) if (driver.menu->shader)
{ {
const struct gfx_shader_parameter *param = const struct video_shader_parameter *param =
&driver.menu->shader->parameters[type - MENU_SETTINGS_SHADER_PRESET_PARAMETER_0]; &driver.menu->shader->parameters[type - MENU_SETTINGS_SHADER_PRESET_PARAMETER_0];
snprintf(type_str, type_str_size, "%.2f [%.2f %.2f]", snprintf(type_str, type_str_size, "%.2f [%.2f %.2f]",
param->current, param->minimum, param->maximum); param->current, param->minimum, param->maximum);