mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-04-09 21:45:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

Cleanups

Browse Source
This commit is contained in:
twinaphex 2017-05-18 14:27:37 +02:00
parent 374f8e8a19
commit cb529822c6
2 changed files with 12 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
gfx/drivers_shader/shader_null.c
View File

@ -72,11 +72,6 @@ static bool shader_null_get_feedback_pass(void *data, unsigned *idx)
return false; return false;
} }
static struct video_shader *shader_null_get_current_shader(void *data)
{
return NULL;
}
static bool shader_null_compile_program( static bool shader_null_compile_program(
void *data, void *data,
unsigned idx, unsigned idx,
@ -103,7 +98,7 @@ const shader_backend_t shader_null_backend = {
shader_null_get_prev_textures, shader_null_get_prev_textures,
shader_null_get_feedback_pass, shader_null_get_feedback_pass,
NULL, NULL,
shader_null_get_current_shader, NULL,
RARCH_SHADER_NONE, RARCH_SHADER_NONE,
"nullshader" "nullshader"

18
gfx/video_shader_driver.c
View File

@ -52,7 +52,6 @@ static const shader_backend_t *video_shader_set_backend(enum rarch_shader_type t
{ {
case RARCH_SHADER_CG: case RARCH_SHADER_CG:
{ {
#ifdef HAVE_CG #ifdef HAVE_CG
gfx_ctx_flags_t flags; gfx_ctx_flags_t flags;
video_context_driver_get_flags(&flags); video_context_driver_get_flags(&flags);
@ -86,7 +85,7 @@ static const shader_backend_t *video_shader_set_backend(enum rarch_shader_type t
bool video_shader_driver_get_prev_textures(video_shader_ctx_texture_t *texture) bool video_shader_driver_get_prev_textures(video_shader_ctx_texture_t *texture)
{ {
if (!texture || !current_shader) if (!texture)
{ {
if (texture) if (texture)
texture->id = 0; texture->id = 0;
@ -99,7 +98,7 @@ bool video_shader_driver_get_prev_textures(video_shader_ctx_texture_t *texture)
bool video_shader_driver_get_ident(video_shader_ctx_ident_t *ident) bool video_shader_driver_get_ident(video_shader_ctx_ident_t *ident)
{ {
if (!current_shader || !ident) if (!ident)
return false; return false;
ident->ident = current_shader->ident; ident->ident = current_shader->ident;
return true; return true;
@ -119,11 +118,8 @@ bool video_shader_driver_get_current_shader(video_shader_ctx_t *shader)
bool video_shader_driver_direct_get_current_shader(video_shader_ctx_t *shader) bool video_shader_driver_direct_get_current_shader(video_shader_ctx_t *shader)
{ {
shader->data = NULL;
if (!current_shader || !current_shader->get_current_shader)
return false;
shader->data = current_shader->get_current_shader(shader_data); shader->data = current_shader->get_current_shader(shader_data);
return true; return true;
} }
@ -178,6 +174,12 @@ static void video_shader_driver_use_null(void *data,
(void)set_active; (void)set_active;
} }
static struct video_shader *video_shader_driver_get_current_shader_null(void *data)
{
return NULL;
}
static void video_shader_driver_set_params_null(void *data, void *shader_data, static void video_shader_driver_set_params_null(void *data, void *shader_data,
unsigned width, unsigned height, unsigned width, unsigned height,
unsigned tex_width, unsigned tex_height, unsigned tex_width, unsigned tex_height,
@ -235,6 +237,8 @@ static void video_shader_driver_reset_to_defaults(void)
current_shader->filter_type = video_shader_driver_filter_type_null; current_shader->filter_type = video_shader_driver_filter_type_null;
if (!current_shader->num_shaders) if (!current_shader->num_shaders)
current_shader->num_shaders = video_shader_driver_num_null; current_shader->num_shaders = video_shader_driver_num_null;
if (!current_shader->get_current_shader)
current_shader->get_current_shader= video_shader_driver_get_current_shader_null;
} }
/* Finds first suitable shader context driver. */ /* Finds first suitable shader context driver. */