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

(Android) Bump up versioncode

Browse Source 
(VideoCore EGL) Fix build
This commit is contained in:
twinaphex 2014-03-13 11:01:46 +01:00
parent 4b4b2858f4
commit c52c8cd5b5
2 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
android/phoenix/AndroidManifest.xml
View File

@ -1,6 +1,6 @@
<manifest xmlns:android="http://schemas.android.com/apk/res/android" <manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="com.retroarch" package="com.retroarch"
android:versionCode="36" android:versionCode="37"
android:versionName="1.0.0.2" > android:versionName="1.0.0.2" >
<uses-feature android:glEsVersion="0x00020000" /> <uses-feature android:glEsVersion="0x00020000" />
<uses-feature android:name="android.hardware.touchscreen" android:required="false"/> <uses-feature android:name="android.hardware.touchscreen" android:required="false"/>

11
gfx/context/vc_egl_ctx.c
View File

@ -297,7 +297,7 @@ static void gfx_ctx_destroy(void *data)
if (g_egl_ctx) if (g_egl_ctx)
{ {
gfx_ctx_bind_api(g_api, 0, 0); gfx_ctx_bind_api(data, g_api, 0, 0);
eglMakeCurrent(g_egl_dpy, EGL_NO_SURFACE, EGL_NO_SURFACE, EGL_NO_CONTEXT); eglMakeCurrent(g_egl_dpy, EGL_NO_SURFACE, EGL_NO_SURFACE, EGL_NO_CONTEXT);
eglDestroyContext(g_egl_dpy, g_egl_ctx); eglDestroyContext(g_egl_dpy, g_egl_ctx);
} }
@ -311,7 +311,7 @@ static void gfx_ctx_destroy(void *data)
if (g_egl_surf) if (g_egl_surf)
{ {
gfx_ctx_bind_api(g_api, 0, 0); gfx_ctx_bind_api(data, g_api, 0, 0);
eglDestroySurface(g_egl_dpy, g_egl_surf); eglDestroySurface(g_egl_dpy, g_egl_surf);
} }
@ -323,7 +323,7 @@ static void gfx_ctx_destroy(void *data)
eglBindAPI(EGL_OPENVG_API); eglBindAPI(EGL_OPENVG_API);
eglMakeCurrent(g_egl_dpy, EGL_NO_SURFACE, EGL_NO_SURFACE, EGL_NO_CONTEXT); eglMakeCurrent(g_egl_dpy, EGL_NO_SURFACE, EGL_NO_SURFACE, EGL_NO_CONTEXT);
gfx_ctx_bind_api(g_api, 0, 0); gfx_ctx_bind_api(data, g_api, 0, 0);
eglMakeCurrent(g_egl_dpy, EGL_NO_SURFACE, EGL_NO_SURFACE, EGL_NO_CONTEXT); eglMakeCurrent(g_egl_dpy, EGL_NO_SURFACE, EGL_NO_SURFACE, EGL_NO_CONTEXT);
eglTerminate(g_egl_dpy); eglTerminate(g_egl_dpy);
} }
@ -373,7 +373,6 @@ static float gfx_ctx_translate_aspect(void *data, unsigned width, unsigned heigh
static bool gfx_ctx_init_egl_image_buffer(void *data, const video_info_t *video) static bool gfx_ctx_init_egl_image_buffer(void *data, const video_info_t *video)
{ {
(void)data;
if (g_api == GFX_CTX_OPENVG_API) // don't bother, we just use VGImages for our EGLImage anyway if (g_api == GFX_CTX_OPENVG_API) // don't bother, we just use VGImages for our EGLImage anyway
{ {
return false; return false;
@ -421,7 +420,7 @@ static bool gfx_ctx_init_egl_image_buffer(void *data, const video_info_t *video)
goto fail; goto fail;
} }
gfx_ctx_bind_api(g_api, 0, 0); gfx_ctx_bind_api(data, g_api, 0, 0);
eglMakeCurrent(g_egl_dpy, g_egl_surf, g_egl_surf, g_egl_ctx); eglMakeCurrent(g_egl_dpy, g_egl_surf, g_egl_surf, g_egl_ctx);
g_smooth = video->smooth; g_smooth = video->smooth;
@ -440,7 +439,7 @@ fail:
g_pbuff_surf = EGL_NO_CONTEXT; g_pbuff_surf = EGL_NO_CONTEXT;
} }
gfx_ctx_bind_api(g_api, 0, 0); gfx_ctx_bind_api(data, g_api, 0, 0);
eglMakeCurrent(g_egl_dpy, g_egl_surf, g_egl_surf, g_egl_ctx); eglMakeCurrent(g_egl_dpy, g_egl_surf, g_egl_surf, g_egl_ctx);
return false; return false;