This commit is contained in:
twinaphex 2020-07-15 03:08:56 +02:00
parent 07b075c16f
commit 47f86711a5
2 changed files with 36 additions and 19 deletions

View File

@ -32959,21 +32959,7 @@ static const gfx_ctx_driver_t *video_context_driver_init(
return ctx;
}
/**
* video_context_driver_init_first:
* @data : Input data.
* @ident : Identifier of graphics context driver to find.
* @api : API of higher-level graphics API.
* @major : Major version number of higher-level graphics API.
* @minor : Minor version number of higher-level graphics API.
* @hw_render_ctx : Request a graphics context driver capable of
* hardware rendering?
*
* Finds first suitable graphics context driver and initializes.
*
* Returns: graphics context driver if found, otherwise NULL.
**/
const gfx_ctx_driver_t *video_context_driver_init_first(void *data,
static const gfx_ctx_driver_t *gl_context_driver_init_first(void *data,
const char *ident, enum gfx_ctx_api api, unsigned major,
unsigned minor, bool hw_render_ctx, void **ctx_data)
{
@ -32995,7 +32981,7 @@ const gfx_ctx_driver_t *video_context_driver_init_first(void *data,
{
const gfx_ctx_driver_t *ctx =
video_context_driver_init(data, gfx_ctx_drivers[i], ident,
api, major, minor, hw_render_ctx, ctx_data);
api, major, minor, hw_render_ctx, ctx_data);
if (ctx)
{
@ -33007,6 +32993,40 @@ const gfx_ctx_driver_t *video_context_driver_init_first(void *data,
return NULL;
}
/**
* video_context_driver_init_first:
* @data : Input data.
* @ident : Identifier of graphics context driver to find.
* @api : API of higher-level graphics API.
* @major : Major version number of higher-level graphics API.
* @minor : Minor version number of higher-level graphics API.
* @hw_render_ctx : Request a graphics context driver capable of
* hardware rendering?
*
* Finds first suitable graphics context driver and initializes.
*
* Returns: graphics context driver if found, otherwise NULL.
**/
const gfx_ctx_driver_t *video_context_driver_init_first(void *data,
const char *ident, enum gfx_ctx_api api, unsigned major,
unsigned minor, bool hw_render_ctx, void **ctx_data)
{
switch (api)
{
case GFX_CTX_OPENGL_API:
case GFX_CTX_OPENGL_ES_API:
case GFX_CTX_OPENVG_API:
case GFX_CTX_VULKAN_API:
gl_context_driver_init_first(data, ident, api, major, minor,
hw_render_ctx, ctx_data);
default:
break;
}
return NULL;
}
bool video_context_driver_write_to_image_buffer(gfx_ctx_image_t *img)
{
struct rarch_state *p_rarch = &rarch_st;
@ -33263,8 +33283,6 @@ enum gfx_ctx_api video_context_driver_get_api(void)
return GFX_CTX_VULKAN_API;
else if (string_is_equal(video_ident, "metal"))
return GFX_CTX_METAL_API;
else if (string_is_equal(video_ident, "network"))
return GFX_CTX_NETWORK_VIDEO_API;
return GFX_CTX_NONE;
}

View File

@ -799,7 +799,6 @@ enum gfx_ctx_api
GFX_CTX_DIRECT3D12_API,
GFX_CTX_OPENVG_API,
GFX_CTX_VULKAN_API,
GFX_CTX_NETWORK_VIDEO_API,
GFX_CTX_METAL_API,
GFX_CTX_GDI_API,
GFX_CTX_GX_API,