Merge pull request #5192 from yoshisuga/ios10_opengl_fix

The BGRA8888 gl extension is not working in iOS 10 and 11; report cap…
This commit is contained in:
Twinaphex 2017-07-21 07:27:15 +02:00 committed by GitHub
commit 6ea0eae4bb
2 changed files with 51 additions and 47 deletions

View File

@ -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;

View File

@ -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 = {
@ -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 = "";
@ -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 = "";