refine buffer view check (cocos#3578)

zhuzujie · Nov 30, 2018 · 218af3b · 218af3b
1 parent eee77f8
commit 218af3b
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 6 deletions.
diff --git a/cocos2d/core/renderer/render-engine.js b/cocos2d/core/renderer/render-engine.js
@@ -8086,8 +8086,6 @@ function _createShader(gl, type, src) {
   return shader;
 }
 
-const ArrayBufferView = Object.getPrototypeOf(Object.getPrototypeOf(new Uint8Array)).constructor;
-
 var Texture = function Texture(device) {
   this._device = device;
 
@@ -8286,7 +8284,7 @@ var Texture2D = (function (Texture$$1) {
     var premultiplyAlpha = options.premultiplyAlpha;
     var img = options.image;
 
-    if (!(img instanceof ArrayBufferView)) {
+    if (!ArrayBuffer.isView(img) && !(img instanceof ArrayBuffer)) {
       if (flipY === undefined) {
         gl.pixelStorei(gl.UNPACK_FLIP_Y_WEBGL, true);
       } else {
@@ -8345,7 +8343,7 @@ var Texture2D = (function (Texture$$1) {
     var premultiplyAlpha = options.premultiplyAlpha;
     var img = options.image;
 
-    if (!(img instanceof ArrayBufferView)) {
+    if (!ArrayBuffer.isView(img) && !(img instanceof ArrayBuffer)) {
       if (flipY === undefined) {
         gl.pixelStorei(gl.UNPACK_FLIP_Y_WEBGL, true);
       } else {
@@ -8634,7 +8632,7 @@ var TextureCube = (function (Texture$$1) {
       gl.pixelStorei(gl.UNPACK_PREMULTIPLY_ALPHA_WEBGL, premultiplyAlpha);
     }
 
-    if (!(img instanceof ArrayBufferView)) {
+    if (!ArrayBuffer.isView(img) && !(img instanceof ArrayBuffer)) {
       gl.texSubImage2D(gl.TEXTURE_CUBE_MAP_POSITIVE_X + faceIndex, options.level, options.x, options.y, glFmt.format, glFmt.pixelType, img);
     } else {
       if (this._compressed) {
@@ -8681,7 +8679,7 @@ var TextureCube = (function (Texture$$1) {
     } else {
       gl.pixelStorei(gl.UNPACK_PREMULTIPLY_ALPHA_WEBGL, premultiplyAlpha);
     }
-    if (!(img instanceof ArrayBufferView)) {
+    if (!ArrayBuffer.isView(img) && !(img instanceof ArrayBuffer)) {
       gl.texImage2D(
         gl.TEXTURE_CUBE_MAP_POSITIVE_X + faceIndex,
         options.level,

diff --git a/index.js b/index.js
@@ -49,6 +49,7 @@ require('./polyfill/string');
 require('./polyfill/misc');
 require('./polyfill/array');
 require('./polyfill/object');
+require('./polyfill/array-buffer');
 if (!(CC_EDITOR && Editor.isMainProcess)) {
     require('./polyfill/typescript');
 }

diff --git a/polyfill/array-buffer.js b/polyfill/array-buffer.js
@@ -0,0 +1,6 @@
+if (!ArrayBuffer.isView) {
+    const ArrayBufferView = Object.getPrototypeOf(Object.getPrototypeOf(new Uint8Array)).constructor;
+    ArrayBuffer.isView = function (view) {
+        return view instanceof ArrayBufferView;
+    };
+}