Fix getParameter call inside texture update (#5198)

cocos · Aug 26, 2019 · b41dd6b · b41dd6b
1 parent 4362bda
commit b41dd6b
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 2 deletions.
diff --git a/cocos2d/renderer/gfx/device.js b/cocos2d/renderer/gfx/device.js
@@ -564,6 +564,13 @@ function _attach(gl, location, attachment, face = 0) {
 }
 
 export default class Device {
+  /**
+   * @property caps
+   */
+  get caps() {
+    return this._caps;
+  }
+
   /**
    * @param {HTMLElement} canvasEL
    * @param {object} opts
@@ -689,6 +696,7 @@ export default class Device {
     this._caps.maxFragUniforms = gl.getParameter(gl.MAX_FRAGMENT_UNIFORM_VECTORS);
     this._caps.maxTextureUnits = gl.getParameter(gl.MAX_TEXTURE_IMAGE_UNITS);
     this._caps.maxVertexAttribs = gl.getParameter(gl.MAX_VERTEX_ATTRIBS);
+    this._caps.maxTextureSize = gl.getParameter(gl.MAX_TEXTURE_SIZE);
 
     this._caps.maxDrawBuffers = extDrawBuffers ? gl.getParameter(extDrawBuffers.MAX_DRAW_BUFFERS_WEBGL) : 1;
     this._caps.maxColorAttachments = extDrawBuffers ? gl.getParameter(extDrawBuffers.MAX_COLOR_ATTACHMENTS_WEBGL) : 1;

diff --git a/cocos2d/renderer/gfx/texture-2d.js b/cocos2d/renderer/gfx/texture-2d.js
@@ -77,8 +77,8 @@ export default class Texture2D extends Texture {
         genMipmap = options.mipmap;
       }
 
-      let maxSize = gl.getParameter(gl.MAX_TEXTURE_SIZE);
-      let textureMaxSize = (options.width && options.height) ? Math.max(options.width, options.height) : 0;
+      let maxSize = this._device.caps.maxTextureSize || Number.MAX_VALUE;
+      let textureMaxSize = Math.max(options.width || 0, options.height || 0);
       if (maxSize < textureMaxSize)
         console.warn(`The current texture size ${textureMaxSize} exceeds the maximum size [${maxSize}] supported on the device.`);