diff --git a/apple/common/RetroArch_Apple.h b/apple/common/RetroArch_Apple.h index 2f3e8eaeae..1676b98d15 100644 --- a/apple/common/RetroArch_Apple.h +++ b/apple/common/RetroArch_Apple.h @@ -23,9 +23,6 @@ #include "../../core_info.h" #include "../../settings_data.h" -#define GSEVENT_TYPE_KEYDOWN 10 -#define GSEVENT_TYPE_KEYUP 11 - @protocol RetroArch_Platform - (void)loadingCore:(NSString*)core withFile:(const char*)file; - (void)unloadingCore; diff --git a/apple/common/contentview_camera_ios.m.inl b/apple/common/contentview_camera_ios.m.inl index 068afe2cb8..323ef6c292 100644 --- a/apple/common/contentview_camera_ios.m.inl +++ b/apple/common/contentview_camera_ios.m.inl @@ -22,8 +22,9 @@ void event_process_camera_frame(void* pixelBufferPtr) // create a texture from our render target. // textureCache will be what you previously made with CVOpenGLESTextureCacheCreate ret = CVOpenGLESTextureCacheCreateTextureFromImage(kCFAllocatorDefault, - textureCache, pixelBuffer, NULL, GL_TEXTURE_2D, - GL_RGBA, (GLsizei)width, (GLsizei)height, GL_BGRA, GL_UNSIGNED_BYTE, 0, &renderTexture); + textureCache, pixelBuffer, NULL, GL_TEXTURE_2D, + GL_RGBA, (GLsizei)width, (GLsizei)height, GL_BGRA, GL_UNSIGNED_BYTE, 0, &renderTexture); + if (!renderTexture || ret) { RARCH_ERR("ioscamera: CVOpenGLESTextureCacheCreateTextureFromImage failed.\n"); diff --git a/apple/iOS/platform.m b/apple/iOS/platform.m index 9bdd2c0009..a27fdc9cb7 100644 --- a/apple/iOS/platform.m +++ b/apple/iOS/platform.m @@ -145,6 +145,9 @@ static void handle_touch_event(NSArray* touches) return [super _keyCommandForEvent:event]; } +#define GSEVENT_TYPE_KEYDOWN 10 +#define GSEVENT_TYPE_KEYUP 11 + - (void)sendEvent:(UIEvent *)event { [super sendEvent:event];