mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-03-25 16:44:01 +00:00
Code Issues Packages Projects Releases Wiki Activity

Rename gfx_ctx_ prefix

Browse Source
This commit is contained in:
twinaphex 2016-05-08 19:24:23 +02:00
parent bc74e7199b
commit 7399ba386a
6 changed files with 26 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
gfx/d3d/d3d.cpp
View File

@ -1100,7 +1100,7 @@ static const gfx_ctx_driver_t *d3d_get_context(void *data)
unsigned major = 9; unsigned major = 9;
enum gfx_ctx_api api = GFX_CTX_DIRECT3D9_API; enum gfx_ctx_api api = GFX_CTX_DIRECT3D9_API;
#endif #endif
return gfx_ctx_init_first(data, return video_driver_context_init_first(data,
settings->video.context_driver, settings->video.context_driver,
api, major, minor, false); api, major, minor, false);
} }

2
gfx/drivers/gl.c
View File

@ -2444,7 +2444,7 @@ static const gfx_ctx_driver_t *gl_get_context(gl_t *gl)
gl->shared_context_use = settings->video.shared_context gl->shared_context_use = settings->video.shared_context
&& hwr->context_type != RETRO_HW_CONTEXT_NONE; && hwr->context_type != RETRO_HW_CONTEXT_NONE;
return gfx_ctx_init_first(gl, settings->video.context_driver, return video_driver_context_init_first(gl, settings->video.context_driver,
api, major, minor, gl->shared_context_use); api, major, minor, gl->shared_context_use);
} }

2
gfx/drivers/vg.c
View File

@ -94,7 +94,7 @@ static void *vg_init(const video_info_t *video,
VGfloat clearColor[4] = {0, 0, 0, 1}; VGfloat clearColor[4] = {0, 0, 0, 1};
settings_t *settings = config_get_ptr(); settings_t *settings = config_get_ptr();
vg_t *vg = (vg_t*)calloc(1, sizeof(vg_t)); vg_t *vg = (vg_t*)calloc(1, sizeof(vg_t));
const gfx_ctx_driver_t *ctx = gfx_ctx_init_first( const gfx_ctx_driver_t *ctx = video_driver_context_init_first(
vg, settings->video.context_driver, vg, settings->video.context_driver,
GFX_CTX_OPENVG_API, 0, 0, false); GFX_CTX_OPENVG_API, 0, 0, false);

3
gfx/drivers/vulkan.c
View File

@ -70,7 +70,8 @@ static const gfx_ctx_driver_t *vulkan_get_context(vk_t *vk)
settings_t *settings = config_get_ptr(); settings_t *settings = config_get_ptr();
enum gfx_ctx_api api = GFX_CTX_VULKAN_API; enum gfx_ctx_api api = GFX_CTX_VULKAN_API;
return gfx_ctx_init_first(vk, settings->video.context_driver, return video_driver_context_init_first(
vk, settings->video.context_driver,
api, major, minor, false); api, major, minor, false);
} }

37
gfx/video_context_driver.c
View File

@ -89,7 +89,7 @@ static const gfx_ctx_driver_t *current_video_context = NULL;
static void *video_context_data = NULL; static void *video_context_data = NULL;
/** /**
* find_gfx_ctx_driver_index: * find_video_driver_context_driver_index:
* @ident : Identifier of resampler driver to find. * @ident : Identifier of resampler driver to find.
* *
* Finds graphics context driver index by @ident name. * Finds graphics context driver index by @ident name.
@ -97,7 +97,7 @@ static void *video_context_data = NULL;
* Returns: graphics context driver index if driver was found, otherwise * Returns: graphics context driver index if driver was found, otherwise
* -1. * -1.
**/ **/
static int find_gfx_ctx_driver_index(const char *ident) static int find_video_driver_context_index(const char *ident)
{ {
unsigned i; unsigned i;
for (i = 0; gfx_ctx_drivers[i]; i++) for (i = 0; gfx_ctx_drivers[i]; i++)
@ -111,10 +111,10 @@ static int find_gfx_ctx_driver_index(const char *ident)
* *
* Finds previous driver in graphics context driver array. * Finds previous driver in graphics context driver array.
**/ **/
static bool gfx_ctl_find_prev_driver(void) static bool video_driver_context_find_prev_driver(void)
{ {
settings_t *settings = config_get_ptr(); settings_t *settings = config_get_ptr();
int i = find_gfx_ctx_driver_index( int i = find_video_driver_context_index(
settings->video.context_driver); settings->video.context_driver);
if (i > 0) if (i > 0)
@ -134,10 +134,10 @@ static bool gfx_ctl_find_prev_driver(void)
* *
* Finds next driver in graphics context driver array. * Finds next driver in graphics context driver array.
**/ **/
static bool gfx_ctl_find_next_driver(void) static bool video_driver_context_find_next_driver(void)
{ {
settings_t *settings = config_get_ptr(); settings_t *settings = config_get_ptr();
int i = find_gfx_ctx_driver_index(settings->video.context_driver); int i = find_video_driver_context_index(settings->video.context_driver);
if (i >= 0 && gfx_ctx_drivers[i + 1]) if (i >= 0 && gfx_ctx_drivers[i + 1])
{ {
@ -152,7 +152,7 @@ static bool gfx_ctl_find_next_driver(void)
} }
/** /**
* gfx_ctx_init: * video_driver_context_init:
* @data : Input data. * @data : Input data.
* @ctx : Graphics context driver to initialize. * @ctx : Graphics context driver to initialize.
* @ident : Identifier of graphics context driver to find. * @ident : Identifier of graphics context driver to find.
@ -166,7 +166,8 @@ static bool gfx_ctl_find_next_driver(void)
* *
* Returns: graphics context driver if successfully initialized, otherwise NULL. * Returns: graphics context driver if successfully initialized, otherwise NULL.
**/ **/
static const gfx_ctx_driver_t *gfx_ctx_init(void *data, static const gfx_ctx_driver_t *video_driver_context_init(
void *data,
const gfx_ctx_driver_t *ctx, const gfx_ctx_driver_t *ctx,
const char *ident, const char *ident,
enum gfx_ctx_api api, unsigned major, enum gfx_ctx_api api, unsigned major,
@ -198,7 +199,7 @@ static const gfx_ctx_driver_t *gfx_ctx_init(void *data,
} }
/** /**
* gfx_ctx_find_driver: * video_driver_context_find_driver:
* @data : Input data. * @data : Input data.
* @ident : Identifier of graphics context driver to find. * @ident : Identifier of graphics context driver to find.
* @api : API of higher-level graphics API. * @api : API of higher-level graphics API.
@ -211,21 +212,21 @@ static const gfx_ctx_driver_t *gfx_ctx_init(void *data,
* *
* Returns: graphics context driver if found, otherwise NULL. * Returns: graphics context driver if found, otherwise NULL.
**/ **/
static const gfx_ctx_driver_t *gfx_ctx_find_driver(void *data, static const gfx_ctx_driver_t *video_driver_context_find_driver(void *data,
const char *ident, const char *ident,
enum gfx_ctx_api api, unsigned major, enum gfx_ctx_api api, unsigned major,
unsigned minor, bool hw_render_ctx) unsigned minor, bool hw_render_ctx)
{ {
int i = find_gfx_ctx_driver_index(ident); int i = find_video_driver_context_index(ident);
if (i >= 0) if (i >= 0)
return gfx_ctx_init(data, gfx_ctx_drivers[i], ident, return video_driver_context_init(data, gfx_ctx_drivers[i], ident,
api, major, minor, hw_render_ctx); api, major, minor, hw_render_ctx);
for (i = 0; gfx_ctx_drivers[i]; i++) for (i = 0; gfx_ctx_drivers[i]; i++)
{ {
const gfx_ctx_driver_t *ctx = const gfx_ctx_driver_t *ctx =
gfx_ctx_init(data, gfx_ctx_drivers[i], ident, video_driver_context_init(data, gfx_ctx_drivers[i], ident,
api, major, minor, hw_render_ctx); api, major, minor, hw_render_ctx);
if (ctx) if (ctx)
@ -236,7 +237,7 @@ static const gfx_ctx_driver_t *gfx_ctx_find_driver(void *data,
} }
/** /**
* gfx_ctx_init_first: * video_driver_context_init_first:
* @data : Input data. * @data : Input data.
* @ident : Identifier of graphics context driver to find. * @ident : Identifier of graphics context driver to find.
* @api : API of higher-level graphics API. * @api : API of higher-level graphics API.
@ -249,11 +250,11 @@ static const gfx_ctx_driver_t *gfx_ctx_find_driver(void *data,
* *
* Returns: graphics context driver if found, otherwise NULL. * Returns: graphics context driver if found, otherwise NULL.
**/ **/
const gfx_ctx_driver_t *gfx_ctx_init_first(void *data, const gfx_ctx_driver_t *video_driver_context_init_first(void *data,
const char *ident, enum gfx_ctx_api api, unsigned major, const char *ident, enum gfx_ctx_api api, unsigned major,
unsigned minor, bool hw_render_ctx) unsigned minor, bool hw_render_ctx)
{ {
return gfx_ctx_find_driver(data, ident, api, return video_driver_context_find_driver(data, ident, api,
major, minor, hw_render_ctx); major, minor, hw_render_ctx);
} }
@ -281,11 +282,11 @@ bool gfx_ctx_ctl(enum gfx_ctx_ctl_state state, void *data)
} }
break; break;
case GFX_CTL_FIND_PREV_DRIVER: case GFX_CTL_FIND_PREV_DRIVER:
if (!gfx_ctl_find_prev_driver()) if (!video_driver_context_find_prev_driver())
return false; return false;
break; break;
case GFX_CTL_FIND_NEXT_DRIVER: case GFX_CTL_FIND_NEXT_DRIVER:
if (!gfx_ctl_find_next_driver()) if (!video_driver_context_find_next_driver())
return false; return false;
break; break;
case GFX_CTL_IMAGE_BUFFER_INIT: case GFX_CTL_IMAGE_BUFFER_INIT:

4
gfx/video_context_driver.h
View File

@ -284,7 +284,7 @@ extern const gfx_ctx_driver_t gfx_ctx_opendingux_fbdev;
extern const gfx_ctx_driver_t gfx_ctx_null; extern const gfx_ctx_driver_t gfx_ctx_null;
/** /**
* gfx_ctx_init_first: * video_driver_context_init_first:
* @data : Input data. * @data : Input data.
* @ident : Identifier of graphics context driver to find. * @ident : Identifier of graphics context driver to find.
* @api : API of higher-level graphics API. * @api : API of higher-level graphics API.
@ -297,7 +297,7 @@ extern const gfx_ctx_driver_t gfx_ctx_null;
* *
* Returns: graphics context driver if found, otherwise NULL. * Returns: graphics context driver if found, otherwise NULL.
**/ **/
const gfx_ctx_driver_t *gfx_ctx_init_first(void *data, const char *ident, const gfx_ctx_driver_t *video_driver_context_init_first(void *data, const char *ident,
enum gfx_ctx_api api, unsigned major, unsigned minor, bool hw_render_ctx); enum gfx_ctx_api api, unsigned major, unsigned minor, bool hw_render_ctx);
bool gfx_ctx_ctl(enum gfx_ctx_ctl_state state, void *data); bool gfx_ctx_ctl(enum gfx_ctx_ctl_state state, void *data);