Skip to content

Commit 976f195

Browse files
committed
Merge pull request cocos2d#2826 from VisualSJ/develop-3.5
Arrangement the render mode
2 parents 8c742b1 + a2047b9 commit 976f195

File tree

1 file changed

+7
-10
lines changed

1 file changed

+7
-10
lines changed

CCBoot.js

Lines changed: 7 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1653,28 +1653,25 @@ cc._initSys = function (config, CONFIG_KEY) {
16531653
var shieldBrowser = [];
16541654
var tmpCanvas = cc.newElement("canvas");
16551655
cc._renderType = cc._RENDER_TYPE_CANVAS;
1656-
cc._supportRender = true;
1656+
cc._supportRender = false;
16571657

16581658
var supportWebGL = win.WebGLRenderingContext;
16591659

16601660
if(userRenderMode === 2 || (userRenderMode === 0 && supportWebGL && shieldOs.indexOf(sys.os) === -1 && shieldBrowser.indexOf(sys.browserType) === -1))
16611661
try{
16621662
var context = cc.create3DContext(tmpCanvas, {'stencil': true, 'preserveDrawingBuffer': true });
1663-
if(context)
1663+
if(context){
16641664
cc._renderType = cc._RENDER_TYPE_WEBGL;
1665-
else
1666-
cc._supportRender = false;
1667-
}catch(e){
1668-
cc._supportRender = false;
1669-
}
1665+
cc._supportRender = true;
1666+
}
1667+
}catch(e){}
16701668

16711669
if(userRenderMode === 1 || (userRenderMode === 0 && cc._supportRender === false))
16721670
try {
16731671
tmpCanvas.getContext("2d");
16741672
cc._renderType = cc._RENDER_TYPE_CANVAS;
1675-
} catch (e) {
1676-
cc._supportRender = false;
1677-
}
1673+
cc._supportRender = true;
1674+
} catch (e) {}
16781675
})(sys, config);
16791676

16801677
sys._canUseCanvasNewBlendModes = function(){

0 commit comments

Comments
 (0)