mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-04-07 13:23:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

(EGL) Create egl_bind_api

Browse Source
This commit is contained in:
twinaphex 2020-01-04 15:09:42 +01:00
parent 3d950b2324
commit 53dbd69751
9 changed files with 37 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
gfx/common/egl_common.c
View File

@ -395,6 +395,11 @@ bool egl_init_context(egl_ctx_data_t *egl,
return true; return true;
} }
bool egl_bind_api(EGLenum egl_api)
{
return eglBindAPI(egl_api);
}
bool egl_create_context(egl_ctx_data_t *egl, const EGLint *egl_attribs) bool egl_create_context(egl_ctx_data_t *egl, const EGLint *egl_attribs)
{ {
EGLContext ctx = eglCreateContext(egl->dpy, egl->config, EGL_NO_CONTEXT, EGLContext ctx = eglCreateContext(egl->dpy, egl->config, EGL_NO_CONTEXT,

2
gfx/common/egl_common.h
View File

@ -100,6 +100,8 @@ bool egl_init_context(egl_ctx_data_t *egl,
const EGLint *attrib_ptr, const EGLint *attrib_ptr,
egl_accept_config_cb_t cb); egl_accept_config_cb_t cb);
bool egl_bind_api(EGLenum egl_api);
bool egl_create_context(egl_ctx_data_t *egl, const EGLint *egl_attribs); bool egl_create_context(egl_ctx_data_t *egl, const EGLint *egl_attribs);
bool egl_create_surface(egl_ctx_data_t *egl, void *native_window); bool egl_create_surface(egl_ctx_data_t *egl, void *native_window);

6
gfx/drivers_context/drm_ctx.c
View File

@ -839,7 +839,7 @@ static bool gfx_ctx_drm_bind_api(void *video_driver,
if ((major * 1000 + minor) >= 3001) if ((major * 1000 + minor) >= 3001)
return false; return false;
#endif #endif
return eglBindAPI(EGL_OPENGL_API); return egl_bind_api(EGL_OPENGL_API);
#else #else
break; break;
#endif #endif
@ -850,13 +850,13 @@ static bool gfx_ctx_drm_bind_api(void *video_driver,
if (major >= 3) if (major >= 3)
return false; return false;
#endif #endif
return eglBindAPI(EGL_OPENGL_ES_API); return egl_bind_api(EGL_OPENGL_ES_API);
#else #else
break; break;
#endif #endif
case GFX_CTX_OPENVG_API: case GFX_CTX_OPENVG_API:
#if defined(HAVE_EGL) && defined(HAVE_VG) #if defined(HAVE_EGL) && defined(HAVE_VG)
return eglBindAPI(EGL_OPENVG_API); return egl_bind_api(EGL_OPENVG_API);
#endif #endif
case GFX_CTX_NONE: case GFX_CTX_NONE:
default: default:

2
gfx/drivers_context/emscriptenegl_ctx.c
View File

@ -273,7 +273,7 @@ static bool gfx_ctx_emscripten_bind_api(void *data,
switch (api) switch (api)
{ {
case GFX_CTX_OPENGL_ES_API: case GFX_CTX_OPENGL_ES_API:
return eglBindAPI(EGL_OPENGL_ES_API); return egl_bind_api(EGL_OPENGL_ES_API);
default: default:
break; break;
} }

2
gfx/drivers_context/orbis_ctx.c
View File

@ -203,7 +203,7 @@ static bool orbis_ctx_bind_api(void *data,
ctx_orbis_api = api; ctx_orbis_api = api;
if (api == GFX_CTX_OPENGL_ES_API) if (api == GFX_CTX_OPENGL_ES_API)
if (eglBindAPI(EGL_OPENGL_ES_API) != EGL_FALSE) if (egl_bind_api(EGL_OPENGL_ES_API))
return true; return true;
return false; return false;

2
gfx/drivers_context/switch_ctx.c
View File

@ -213,7 +213,7 @@ static bool switch_ctx_bind_api(void *data,
ctx_nx_api = api; ctx_nx_api = api;
if (api == GFX_CTX_OPENGL_API) if (api == GFX_CTX_OPENGL_API)
if (eglBindAPI(EGL_OPENGL_API) != EGL_FALSE) if (egl_bind_api(EGL_OPENGL_API))
return true; return true;
return false; return false;

27
gfx/drivers_context/vc_egl_ctx.c
View File

@ -377,11 +377,11 @@ static bool gfx_ctx_vc_bind_api(void *data,
switch (api) switch (api)
{ {
case GFX_CTX_OPENGL_API: case GFX_CTX_OPENGL_API:
return eglBindAPI(EGL_OPENGL_API); return egl_bind_api(EGL_OPENGL_API);
case GFX_CTX_OPENGL_ES_API: case GFX_CTX_OPENGL_ES_API:
return eglBindAPI(EGL_OPENGL_ES_API); return egl_bind_api(EGL_OPENGL_ES_API);
case GFX_CTX_OPENVG_API: case GFX_CTX_OPENVG_API:
return eglBindAPI(EGL_OPENVG_API); return egl_bind_api(EGL_OPENVG_API);
default: default:
break; break;
} }
@ -406,7 +406,7 @@ static void gfx_ctx_vc_destroy(void *data)
{ {
if (vc->eglBuffer[i] && peglDestroyImageKHR) if (vc->eglBuffer[i] && peglDestroyImageKHR)
{ {
eglBindAPI(EGL_OPENVG_API); egl_bind_api(EGL_OPENVG_API);
eglMakeCurrent(vc->egl.dpy, eglMakeCurrent(vc->egl.dpy,
vc->pbuff_surf, vc->pbuff_surf, vc->eglimage_ctx); vc->pbuff_surf, vc->pbuff_surf, vc->eglimage_ctx);
peglDestroyImageKHR(vc->egl.dpy, vc->eglBuffer[i]); peglDestroyImageKHR(vc->egl.dpy, vc->eglBuffer[i]);
@ -414,7 +414,7 @@ static void gfx_ctx_vc_destroy(void *data)
if (vc->vgimage[i]) if (vc->vgimage[i])
{ {
eglBindAPI(EGL_OPENVG_API); egl_bind_api(EGL_OPENVG_API);
eglMakeCurrent(vc->egl.dpy, eglMakeCurrent(vc->egl.dpy,
vc->pbuff_surf, vc->pbuff_surf, vc->eglimage_ctx); vc->pbuff_surf, vc->pbuff_surf, vc->eglimage_ctx);
vgDestroyImage(vc->vgimage[i]); vgDestroyImage(vc->vgimage[i]);
@ -434,7 +434,7 @@ static void gfx_ctx_vc_destroy(void *data)
if (vc->eglimage_ctx) if (vc->eglimage_ctx)
{ {
eglBindAPI(EGL_OPENVG_API); egl_bind_api(EGL_OPENVG_API);
eglMakeCurrent(vc->egl.dpy, eglMakeCurrent(vc->egl.dpy,
EGL_NO_SURFACE, EGL_NO_SURFACE, EGL_NO_CONTEXT); EGL_NO_SURFACE, EGL_NO_SURFACE, EGL_NO_CONTEXT);
eglDestroyContext(vc->egl.dpy, vc->eglimage_ctx); eglDestroyContext(vc->egl.dpy, vc->eglimage_ctx);
@ -448,11 +448,11 @@ static void gfx_ctx_vc_destroy(void *data)
if (vc->pbuff_surf) if (vc->pbuff_surf)
{ {
eglBindAPI(EGL_OPENVG_API); egl_bind_api(EGL_OPENVG_API);
eglDestroySurface(vc->egl.dpy, vc->pbuff_surf); eglDestroySurface(vc->egl.dpy, vc->pbuff_surf);
} }
eglBindAPI(EGL_OPENVG_API); egl_bind_api(EGL_OPENVG_API);
eglMakeCurrent(vc->egl.dpy, eglMakeCurrent(vc->egl.dpy,
EGL_NO_SURFACE, EGL_NO_SURFACE, EGL_NO_CONTEXT); EGL_NO_SURFACE, EGL_NO_SURFACE, EGL_NO_CONTEXT);
gfx_ctx_vc_bind_api(data, vc_api, 0, 0); gfx_ctx_vc_bind_api(data, vc_api, 0, 0);
@ -544,8 +544,10 @@ static bool gfx_ctx_vc_image_buffer_init(void *data,
vc->res = video->input_scale * RARCH_SCALE_BASE; vc->res = video->input_scale * RARCH_SCALE_BASE;
eglBindAPI(EGL_OPENVG_API); egl_bind_api(EGL_OPENVG_API);
vc->pbuff_surf = eglCreatePbufferSurface(vc->egl.dpy, vc->egl.config, pbufsurface_list); vc->pbuff_surf = eglCreatePbufferSurface(
vc->egl.dpy, vc->egl.config, pbufsurface_list);
if (vc->pbuff_surf == EGL_NO_SURFACE) if (vc->pbuff_surf == EGL_NO_SURFACE)
{ {
RARCH_ERR("[VideoCore:EGLImage] failed to create PbufferSurface\n"); RARCH_ERR("[VideoCore:EGLImage] failed to create PbufferSurface\n");
@ -601,8 +603,9 @@ static bool gfx_ctx_vc_image_buffer_write(void *data, const void *frame, unsigne
if (!vc || index >= MAX_EGLIMAGE_TEXTURES) if (!vc || index >= MAX_EGLIMAGE_TEXTURES)
goto error; goto error;
eglBindAPI(EGL_OPENVG_API); egl_bind_api(EGL_OPENVG_API);
eglMakeCurrent(vc->egl.dpy, vc->pbuff_surf, vc->pbuff_surf, vc->eglimage_ctx); eglMakeCurrent(vc->egl.dpy, vc->pbuff_surf,
vc->pbuff_surf, vc->eglimage_ctx);
if (!vc->eglBuffer[index] || !vc->vgimage[index]) if (!vc->eglBuffer[index] || !vc->vgimage[index])
{ {

6
gfx/drivers_context/wayland_ctx.c
View File

@ -1768,7 +1768,7 @@ static bool gfx_ctx_wl_bind_api(void *video_driver,
return false; return false;
#endif #endif
#ifdef HAVE_EGL #ifdef HAVE_EGL
if (eglBindAPI(EGL_OPENGL_API) == EGL_TRUE) if (egl_bind_api(EGL_OPENGL_API))
return true; return true;
#endif #endif
#endif #endif
@ -1780,7 +1780,7 @@ static bool gfx_ctx_wl_bind_api(void *video_driver,
return false; return false;
#endif #endif
#ifdef HAVE_EGL #ifdef HAVE_EGL
if (eglBindAPI(EGL_OPENGL_ES_API) == EGL_TRUE) if (egl_bind_api(EGL_OPENGL_ES_API))
return true; return true;
#endif #endif
#endif #endif
@ -1788,7 +1788,7 @@ static bool gfx_ctx_wl_bind_api(void *video_driver,
case GFX_CTX_OPENVG_API: case GFX_CTX_OPENVG_API:
#ifdef HAVE_VG #ifdef HAVE_VG
#ifdef HAVE_EGL #ifdef HAVE_EGL
if (eglBindAPI(EGL_OPENVG_API) == EGL_TRUE) if (egl_bind_api(EGL_OPENVG_API))
return true; return true;
#endif #endif
#endif #endif

6
gfx/drivers_context/xegl_ctx.c
View File

@ -495,16 +495,16 @@ static bool gfx_ctx_xegl_bind_api(void *video_driver,
if ((major * 1000 + minor) >= 3001) if ((major * 1000 + minor) >= 3001)
break; break;
#endif #endif
return eglBindAPI(EGL_OPENGL_API); return egl_bind_api(EGL_OPENGL_API);
case GFX_CTX_OPENGL_ES_API: case GFX_CTX_OPENGL_ES_API:
#ifndef EGL_KHR_create_context #ifndef EGL_KHR_create_context
if (major >= 3) if (major >= 3)
break; break;
#endif #endif
return eglBindAPI(EGL_OPENGL_ES_API); return egl_bind_api(EGL_OPENGL_ES_API);
case GFX_CTX_OPENVG_API: case GFX_CTX_OPENVG_API:
#ifdef HAVE_VG #ifdef HAVE_VG
return eglBindAPI(EGL_OPENVG_API); return egl_bind_api(EGL_OPENVG_API);
#endif #endif
default: default:
break; break;