diff --git a/libretro-common/gfx/gl_capabilities.c b/libretro-common/gfx/gl_capabilities.c
index 41c574e485..27a2ffed3f 100644
--- a/libretro-common/gfx/gl_capabilities.c
+++ b/libretro-common/gfx/gl_capabilities.c
@@ -298,7 +298,12 @@ bool gl_check_capability(enum gl_capability_enum enum_idx)
 #endif
          break;
       case GL_CAPS_BGRA8888:
-#ifdef HAVE_OPENGLES
+#ifdef TARGET_OS_IPHONE
+         /* In iOS, this capability is reported but is not working. */
+         /* Results in an error when glTexSubImage2D is called with this pixel format. */
+         /* Resort to doing the pixel format conversion on the cpu */
+           return false;
+#elif HAVE_OPENGLES
          /* There are both APPLE and EXT variants. */
          if (gl_query_extension("BGRA8888") && !strstr(renderer, "VideoCore"))
             return true;
diff --git a/pkg/apple/RetroArch_iOS10.xcodeproj/project.pbxproj b/pkg/apple/RetroArch_iOS10.xcodeproj/project.pbxproj
index 50474b1aa7..117e54fd91 100644
--- a/pkg/apple/RetroArch_iOS10.xcodeproj/project.pbxproj
+++ b/pkg/apple/RetroArch_iOS10.xcodeproj/project.pbxproj
@@ -295,7 +295,6 @@
 			isa = PBXGroup;
 			children = (
 				D48581DC16F823E2004BEB17 /* griffin */,
-				96AFAEE516C1DC73009DE44C /* audio */,
 				96AFAF3116C1E00A009DE44C /* gfx */,
 			);
 			name = core;
@@ -413,7 +412,7 @@
 						DevelopmentTeam = UK699V5ZS8;
 					};
 					9204BE091D319EF300BD49DB = {
-						DevelopmentTeam = UK699V5ZS8;
+						DevelopmentTeam = R72X3BF4KE;
 						DevelopmentTeamName = "Yoshinobu Sugawara";
 					};
 					96AFAE2416C1D4EA009DE44C = {
@@ -584,15 +583,15 @@
 				LIBRARY_SEARCH_PATHS = "";
 				ONLY_ACTIVE_ARCH = NO;
 				OTHER_CFLAGS = (
-               "-DDONT_WANT_ARM_OPTIMIZATIONS",
-               "-DHAVE_APPLE_STORE",
+					"-DDONT_WANT_ARM_OPTIMIZATIONS",
+					"-DHAVE_APPLE_STORE",
 					"-DHAVE_NETWORKGAMEPAD",
 					"-DHAVE_CORETEXT",
 					"-DHAVE_HID",
 					"-DHAVE_NETWORKING",
 					"-DHAVE_AVFOUNDATION",
 					"-DHAVE_GRIFFIN",
-               "-DHAVE_STB_VORBIS",
+					"-DHAVE_STB_VORBIS",
 					"-DHAVE_MINIUPNPC",
 					"-DHAVE_BUILTINMINIUPNPC",
 					"-DHAVE_UPDATE_ASSETS",
@@ -669,15 +668,15 @@
 				OTHER_CFLAGS = (
 					"-DNS_BLOCK_ASSERTIONS=1",
 					"-DNDEBUG",
-               "-DDONT_WANT_ARM_OPTIMIZATIONS",
-               "-DHAVE_APPLE_STORE",
+					"-DDONT_WANT_ARM_OPTIMIZATIONS",
+					"-DHAVE_APPLE_STORE",
 					"-DHAVE_NETWORKGAMEPAD",
 					"-DHAVE_CORETEXT",
 					"-DHAVE_HID",
 					"-DHAVE_NETWORKING",
 					"-DHAVE_AVFOUNDATION",
 					"-DHAVE_GRIFFIN",
-               "-DHAVE_STB_VORBIS",
+					"-DHAVE_STB_VORBIS",
 					"-DHAVE_MINIUPNPC",
 					"-DHAVE_BUILTINMINIUPNPC",
 					"-DHAVE_UPDATE_ASSETS",
@@ -724,15 +723,15 @@
 				"OTHER_CFLAGS[arch=*]" = (
 					"-DNS_BLOCK_ASSERTIONS=1",
 					"-DNDEBUG",
-               "-DDONT_WANT_ARM_OPTIMIZATIONS",
-               "-DHAVE_APPLE_STORE",
+					"-DDONT_WANT_ARM_OPTIMIZATIONS",
+					"-DHAVE_APPLE_STORE",
 					"-DHAVE_NETWORKGAMEPAD",
 					"-DHAVE_CORETEXT",
 					"-DHAVE_HID",
 					"-DHAVE_NETWORKING",
 					"-DHAVE_AVFOUNDATION",
 					"-DHAVE_GRIFFIN",
-               "-DHAVE_STB_VORBIS",
+					"-DHAVE_STB_VORBIS",
 					"-DHAVE_MINIUPNPC",
 					"-DHAVE_BUILTINMINIUPNPC",
 					"-DHAVE_UPDATE_ASSETS",
@@ -810,15 +809,15 @@
 				LIBRARY_SEARCH_PATHS = "";
 				ONLY_ACTIVE_ARCH = NO;
 				OTHER_CFLAGS = (
-               "-DDONT_WANT_ARM_OPTIMIZATIONS",
-               "-DHAVE_APPLE_STORE",
+					"-DDONT_WANT_ARM_OPTIMIZATIONS",
+					"-DHAVE_APPLE_STORE",
 					"-DHAVE_NETWORKGAMEPAD",
 					"-DHAVE_CORETEXT",
 					"-DHAVE_HID",
 					"-DHAVE_NETWORKING",
 					"-DHAVE_AVFOUNDATION",
 					"-DHAVE_GRIFFIN",
-               "-DHAVE_STB_VORBIS",
+					"-DHAVE_STB_VORBIS",
 					"-DHAVE_MINIUPNPC",
 					"-DHAVE_BUILTINMINIUPNPC",
 					"-DHAVE_UPDATE_ASSETS",
@@ -893,15 +892,15 @@
 				OTHER_CFLAGS = (
 					"-DNS_BLOCK_ASSERTIONS=1",
 					"-DNDEBUG",
-               "-DDONT_WANT_ARM_OPTIMIZATIONS",
-               "-DHAVE_APPLE_STORE",
+					"-DDONT_WANT_ARM_OPTIMIZATIONS",
+					"-DHAVE_APPLE_STORE",
 					"-DHAVE_NETWORKGAMEPAD",
 					"-DHAVE_CORETEXT",
 					"-DHAVE_HID",
 					"-DHAVE_NETWORKING",
 					"-DHAVE_AVFOUNDATION",
 					"-DHAVE_GRIFFIN",
-               "-DHAVE_STB_VORBIS",
+					"-DHAVE_STB_VORBIS",
 					"-DHAVE_MINIUPNPC",
 					"-DHAVE_BUILTINMINIUPNPC",
 					"-DHAVE_UPDATE_ASSETS",
@@ -945,15 +944,15 @@
 				"OTHER_CFLAGS[arch=*]" = (
 					"-DNS_BLOCK_ASSERTIONS=1",
 					"-DNDEBUG",
-               "-DDONT_WANT_ARM_OPTIMIZATIONS",
-               "-DHAVE_APPLE_STORE",
+					"-DDONT_WANT_ARM_OPTIMIZATIONS",
+					"-DHAVE_APPLE_STORE",
 					"-DHAVE_NETWORKGAMEPAD",
 					"-DHAVE_CORETEXT",
 					"-DHAVE_HID",
 					"-DHAVE_NETWORKING",
 					"-DHAVE_AVFOUNDATION",
 					"-DHAVE_GRIFFIN",
-               "-DHAVE_STB_VORBIS",
+					"-DHAVE_STB_VORBIS",
 					"-DHAVE_MINIUPNPC",
 					"-DHAVE_BUILTINMINIUPNPC",
 					"-DHAVE_UPDATE_ASSETS",
@@ -1012,7 +1011,7 @@
 				CODE_SIGN_IDENTITY = "iPhone Developer";
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
 				CODE_SIGN_RESOURCE_RULES_PATH = "$(SDKROOT)/ResourceRules.plist";
-				DEVELOPMENT_TEAM = UK699V5ZS8;
+				DEVELOPMENT_TEAM = R72X3BF4KE;
 				ENABLE_BITCODE = NO;
 				GCC_PRECOMPILE_PREFIX_HEADER = NO;
 				GCC_PREFIX_HEADER = "";
@@ -1027,15 +1026,15 @@
 				LIBRARY_SEARCH_PATHS = "";
 				ONLY_ACTIVE_ARCH = NO;
 				OTHER_CFLAGS = (
-               "-DDONT_WANT_ARM_OPTIMIZATIONS",
-               "-DHAVE_APPLE_STORE",
+					"-DDONT_WANT_ARM_OPTIMIZATIONS",
+					"-DHAVE_APPLE_STORE",
 					"-DHAVE_NETWORKGAMEPAD",
 					"-DHAVE_CORETEXT",
 					"-DHAVE_HID",
 					"-DHAVE_NETWORKING",
 					"-DHAVE_AVFOUNDATION",
 					"-DHAVE_GRIFFIN",
-               "-DHAVE_STB_VORBIS",
+					"-DHAVE_STB_VORBIS",
 					"-DHAVE_MINIUPNPC",
 					"-DHAVE_BUILTINMINIUPNPC",
 					"-DHAVE_UPDATE_ASSETS",
@@ -1097,7 +1096,7 @@
 				CODE_SIGN_IDENTITY = "iPhone Developer";
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
 				CODE_SIGN_RESOURCE_RULES_PATH = "$(SDKROOT)/ResourceRules.plist";
-				DEVELOPMENT_TEAM = UK699V5ZS8;
+				DEVELOPMENT_TEAM = R72X3BF4KE;
 				ENABLE_BITCODE = NO;
 				GCC_PRECOMPILE_PREFIX_HEADER = NO;
 				GCC_PREFIX_HEADER = "";
@@ -1113,15 +1112,15 @@
 				OTHER_CFLAGS = (
 					"-DNS_BLOCK_ASSERTIONS=1",
 					"-DNDEBUG",
-               "-DDONT_WANT_ARM_OPTIMIZATIONS",
-               "-DHAVE_APPLE_STORE",
+					"-DDONT_WANT_ARM_OPTIMIZATIONS",
+					"-DHAVE_APPLE_STORE",
 					"-DHAVE_NETWORKGAMEPAD",
 					"-DHAVE_CORETEXT",
 					"-DHAVE_HID",
 					"-DHAVE_NETWORKING",
 					"-DHAVE_AVFOUNDATION",
 					"-DHAVE_GRIFFIN",
-               "-DHAVE_STB_VORBIS",
+					"-DHAVE_STB_VORBIS",
 					"-DHAVE_MINIUPNPC",
 					"-DHAVE_BUILTINMINIUPNPC",
 					"-DHAVE_UPDATE_ASSETS",
@@ -1168,15 +1167,15 @@
 				"OTHER_CFLAGS[arch=*]" = (
 					"-DNS_BLOCK_ASSERTIONS=1",
 					"-DNDEBUG",
-               "-DDONT_WANT_ARM_OPTIMIZATIONS",
-               "-DHAVE_APPLE_STORE",
+					"-DDONT_WANT_ARM_OPTIMIZATIONS",
+					"-DHAVE_APPLE_STORE",
 					"-DHAVE_NETWORKGAMEPAD",
 					"-DHAVE_CORETEXT",
 					"-DHAVE_HID",
 					"-DHAVE_NETWORKING",
 					"-DHAVE_AVFOUNDATION",
 					"-DHAVE_GRIFFIN",
-               "-DHAVE_STB_VORBIS",
+					"-DHAVE_STB_VORBIS",
 					"-DHAVE_MINIUPNPC",
 					"-DHAVE_BUILTINMINIUPNPC",
 					"-DHAVE_UPDATE_ASSETS",
@@ -1257,15 +1256,15 @@
 				IPHONEOS_DEPLOYMENT_TARGET = 6.0;
 				ONLY_ACTIVE_ARCH = NO;
 				OTHER_CFLAGS = (
-               "-DDONT_WANT_ARM_OPTIMIZATIONS",
-               "-DHAVE_APPLE_STORE",
+					"-DDONT_WANT_ARM_OPTIMIZATIONS",
+					"-DHAVE_APPLE_STORE",
 					"-DHAVE_NETWORKGAMEPAD",
 					"-DHAVE_CORETEXT",
 					"-DHAVE_HID",
 					"-DHAVE_NETWORKING",
 					"-DHAVE_AVFOUNDATION",
 					"-DHAVE_GRIFFIN",
-               "-DHAVE_STB_VORBIS",
+					"-DHAVE_STB_VORBIS",
 					"-DHAVE_MINIUPNPC",
 					"-DHAVE_BUILTINMINIUPNPC",
 					"-DHAVE_UPDATE_ASSETS",
@@ -1331,15 +1330,15 @@
 				OTHER_CFLAGS = (
 					"-DNS_BLOCK_ASSERTIONS=1",
 					"-DNDEBUG",
-               "-DDONT_WANT_ARM_OPTIMIZATIONS",
-               "-DHAVE_APPLE_STORE",
+					"-DDONT_WANT_ARM_OPTIMIZATIONS",
+					"-DHAVE_APPLE_STORE",
 					"-DHAVE_NETWORKGAMEPAD",
 					"-DHAVE_CORETEXT",
 					"-DHAVE_HID",
 					"-DHAVE_NETWORKING",
 					"-DHAVE_AVFOUNDATION",
 					"-DHAVE_GRIFFIN",
-               "-DHAVE_STB_VORBIS",
+					"-DHAVE_STB_VORBIS",
 					"-DHAVE_MINIUPNPC",
 					"-DHAVE_BUILTINMINIUPNPC",
 					"-DHAVE_UPDATE_ASSETS",
@@ -1408,15 +1407,15 @@
 				LIBRARY_SEARCH_PATHS = "";
 				ONLY_ACTIVE_ARCH = NO;
 				OTHER_CFLAGS = (
-               "-DDONT_WANT_ARM_OPTIMIZATIONS",
-               "-DHAVE_APPLE_STORE",
+					"-DDONT_WANT_ARM_OPTIMIZATIONS",
+					"-DHAVE_APPLE_STORE",
 					"-DHAVE_NETWORKGAMEPAD",
 					"-DHAVE_CORETEXT",
 					"-DHAVE_HID",
 					"-DHAVE_NETWORKING",
 					"-DHAVE_AVFOUNDATION",
 					"-DHAVE_GRIFFIN",
-               "-DHAVE_STB_VORBIS",
+					"-DHAVE_STB_VORBIS",
 					"-DHAVE_MINIUPNPC",
 					"-DHAVE_BUILTINMINIUPNPC",
 					"-DHAVE_UPDATE_ASSETS",
@@ -1494,15 +1493,15 @@
 				OTHER_CFLAGS = (
 					"-DNS_BLOCK_ASSERTIONS=1",
 					"-DNDEBUG",
-               "-DDONT_WANT_ARM_OPTIMIZATIONS",
-               "-DHAVE_APPLE_STORE",
+					"-DDONT_WANT_ARM_OPTIMIZATIONS",
+					"-DHAVE_APPLE_STORE",
 					"-DHAVE_NETWORKGAMEPAD",
 					"-DHAVE_CORETEXT",
 					"-DHAVE_HID",
 					"-DHAVE_NETWORKING",
 					"-DHAVE_AVFOUNDATION",
 					"-DHAVE_GRIFFIN",
-               "-DHAVE_STB_VORBIS",
+					"-DHAVE_STB_VORBIS",
 					"-DHAVE_MINIUPNPC",
 					"-DHAVE_BUILTINMINIUPNPC",
 					"-DHAVE_UPDATE_ASSETS",
@@ -1549,15 +1548,15 @@
 				"OTHER_CFLAGS[arch=*]" = (
 					"-DNS_BLOCK_ASSERTIONS=1",
 					"-DNDEBUG",
-               "-DDONT_WANT_ARM_OPTIMIZATIONS",
-               "-DHAVE_APPLE_STORE",
+					"-DDONT_WANT_ARM_OPTIMIZATIONS",
+					"-DHAVE_APPLE_STORE",
 					"-DHAVE_NETWORKGAMEPAD",
 					"-DHAVE_CORETEXT",
 					"-DHAVE_HID",
 					"-DHAVE_NETWORKING",
 					"-DHAVE_AVFOUNDATION",
 					"-DHAVE_GRIFFIN",
-               "-DHAVE_STB_VORBIS",
+					"-DHAVE_STB_VORBIS",
 					"-DHAVE_MINIUPNPC",
 					"-DHAVE_BUILTINMINIUPNPC",
 					"-DHAVE_UPDATE_ASSETS",