do not use ES3 context if using multi sample (#17778)

minggo · web-flow · commit 6dcaa9fe3a3a · 2017-05-04T16:25:35.000+08:00
multi sample in ES3 needs to use GLES3 function
diff --git a/cocos/platform/ios/CCES2Renderer-ios.m b/cocos/platform/ios/CCES2Renderer-ios.m
@@ -55,13 +55,17 @@ - (id) initWithDepthFormat:(unsigned int)depthFormat withPixelFormat:(unsigned i
     {
         if (! sharegroup)
         {
-            context_ = [[EAGLContext alloc] initWithAPI:kEAGLRenderingAPIOpenGLES3];
+            // multisampling conflict with GLES3, refer to https://github.com/cocos2d/cocos2d-x/issues/17767
+            if (!multiSampling)
+                context_ = [[EAGLContext alloc] initWithAPI:kEAGLRenderingAPIOpenGLES3];
             if (! context_)
                 context_ = [[EAGLContext alloc] initWithAPI:kEAGLRenderingAPIOpenGLES2];
         }
         else
         {
-            context_ = [[EAGLContext alloc] initWithAPI:kEAGLRenderingAPIOpenGLES3 sharegroup:sharegroup];
+            // multisampling conflict with GLES3, refer to https://github.com/cocos2d/cocos2d-x/issues/17767
+            if (!multiSampling)
+                context_ = [[EAGLContext alloc] initWithAPI:kEAGLRenderingAPIOpenGLES3 sharegroup:sharegroup];
             if (!context_)
                 context_ = [[EAGLContext alloc] initWithAPI:kEAGLRenderingAPIOpenGLES2 sharegroup:sharegroup];
         }

Original file line number	Diff line number	Diff line change
`@@ -55,13 +55,17 @@ - (id) initWithDepthFormat:(unsigned int)depthFormat withPixelFormat:(unsigned i`
`55`	`55`	`{`
`56`	`56`	`if (! sharegroup)`
`57`	`57`	`{`
`58`		`- context_ = [[EAGLContext alloc] initWithAPI:kEAGLRenderingAPIOpenGLES3];`
	`58`	`+ // multisampling conflict with GLES3, refer to https://github.com/cocos2d/cocos2d-x/issues/17767`
	`59`	`+ if (!multiSampling)`
	`60`	`+ context_ = [[EAGLContext alloc] initWithAPI:kEAGLRenderingAPIOpenGLES3];`
`59`	`61`	`if (! context_)`
`60`	`62`	`context_ = [[EAGLContext alloc] initWithAPI:kEAGLRenderingAPIOpenGLES2];`
`61`	`63`	`}`
`62`	`64`	`else`
`63`	`65`	`{`
`64`		`- context_ = [[EAGLContext alloc] initWithAPI:kEAGLRenderingAPIOpenGLES3 sharegroup:sharegroup];`
	`66`	`+ // multisampling conflict with GLES3, refer to https://github.com/cocos2d/cocos2d-x/issues/17767`
	`67`	`+ if (!multiSampling)`
	`68`	`+ context_ = [[EAGLContext alloc] initWithAPI:kEAGLRenderingAPIOpenGLES3 sharegroup:sharegroup];`
`65`	`69`	`if (!context_)`
`66`	`70`	`context_ = [[EAGLContext alloc] initWithAPI:kEAGLRenderingAPIOpenGLES2 sharegroup:sharegroup];`
`67`	`71`	`}`