Skip to content

Commit 8992d8e

Browse files
committed
Improve WebGL support detection
1 parent d02fdeb commit 8992d8e

File tree

1 file changed

+24
-11
lines changed

1 file changed

+24
-11
lines changed

Diff for: CCBoot.js

+24-11
Original file line numberDiff line numberDiff line change
@@ -1843,25 +1843,38 @@ var _initSys = function () {
18431843

18441844
var _supportCanvas = !!_tmpCanvas1.getContext("2d");
18451845
var _supportWebGL = false;
1846-
var tmpCanvas = document.createElement("CANVAS");
18471846
if (win.WebGLRenderingContext) {
1847+
var tmpCanvas = document.createElement("CANVAS");
18481848
try{
18491849
var context = cc.create3DContext(tmpCanvas, {'stencil': true, 'preserveDrawingBuffer': true });
18501850
if(context) {
18511851
_supportWebGL = true;
18521852
}
18531853

1854-
// Accept only Android 5+ default browser and QQ Browser 6.2+
18551854
if (_supportWebGL && sys.os === sys.OS_ANDROID) {
1856-
_supportWebGL = false;
1857-
// QQ Brwoser 6.2+
1858-
var browserVer = parseFloat(sys.browserVersion);
1859-
if (sys.browserType === sys.BROWSER_TYPE_MOBILE_QQ && browserVer >= 6.2) {
1860-
_supportWebGL = true;
1861-
}
1862-
// Android 5+ default browser
1863-
else if (sys.osMainVersion && sys.osMainVersion >= 5 && sys.browserType === sys.BROWSER_TYPE_ANDROID) {
1864-
_supportWebGL = true;
1855+
switch (sys.browserType) {
1856+
case sys.BROWSER_TYPE_MOBILE_QQ:
1857+
case sys.BROWSER_TYPE_BAIDU:
1858+
case sys.BROWSER_TYPE_BAIDU_APP:
1859+
// QQ & Baidu Brwoser 6.2+ (using blink kernel)
1860+
var browserVer = parseFloat(sys.browserVersion);
1861+
if (browserVer >= 6.2) {
1862+
_supportWebGL = true;
1863+
}
1864+
else {
1865+
_supportWebGL = false;
1866+
}
1867+
break;
1868+
case sys.BROWSER_TYPE_ANDROID:
1869+
// Android 5+ default browser
1870+
if (sys.osMainVersion && sys.osMainVersion >= 5) {
1871+
_supportWebGL = true;
1872+
}
1873+
break;
1874+
case sys.BROWSER_TYPE_UNKNOWN:
1875+
case sys.BROWSER_TYPE_360:
1876+
case sys.BROWSER_TYPE_MIUI:
1877+
_supportWebGL = false;
18651878
}
18661879
}
18671880
}

0 commit comments

Comments
 (0)