Testing making the pipeline responsible for setting the buffer to cut down on potential points of failure

Author: photonstorm

CHANGELOG-v3.50.md

@@ -215,6 +215,8 @@ All of the internal functions, such as `batchQuad` and `batchSprite` have been u
 * `WebGLRenderer.isBooted` is a new boolean property that lets you know if the rendere has fully finished booting.
 * The `WebGLRenderer` now extends the Event Emitter, allowing you to listen to renderer specific events.
 * `WebGLRenderer.defaultCamera` has been removed as it's not used anywhere internally any longer.
+* The `WebGLRenderer.setVertexBuffer` method has been removed along with the `WebGLRenderer.currentVertexBuffer` property. This is now set directly by the WebGL Pipeline, as needed.
+* The `WebGLRenderer.setIndexBuffer` method has been removed along with the `WebGLRenderer.currentIndexBuffer` property. This is now set directly by the WebGL Pipeline, as needed.
 
 ### WebGL and Canvas Renderer Events
 

src/renderer/webgl/PipelineManager.js

@@ -721,7 +721,7 @@ var PipelineManager = new Class({
 
     /**
      * Checks to see if the given pipeline is already the active pipeline, both within this
-     * Pipeline Manager, and also has the same vertex buffer and shader set within the Renderer.
+     * Pipeline Manager and also has the same shader set in the Renderer.
      *
      * @method Phaser.Renderer.WebGL.PipelineManager#isCurrent
      * @since 3.50.0
@@ -741,11 +741,7 @@ var PipelineManager = new Class({
             currentShader = current.currentShader;
         }
 
-        return !(
-            current !== pipeline ||
-            current.vertexBuffer !== renderer.currentVertexBuffer ||
-            currentShader.program !== renderer.currentProgram
-        );
+        return !(current !== pipeline || currentShader.program !== renderer.currentProgram);
     },
 
     /**
@@ -996,14 +992,14 @@ var PipelineManager = new Class({
         gl.viewport(0, 0, renderer.width, renderer.height);
 
         renderer.currentProgram = null;
-        renderer.currentVertexBuffer = null;
-        renderer.currentIndexBuffer = null;
 
         renderer.setBlendMode(0, true);
 
         this.current = pipeline;
 
         pipeline.rebind();
+
+        renderer.resetTextures();
     },
 
     /**
@@ -1024,12 +1020,18 @@ var PipelineManager = new Class({
 
         this.flush();
 
-        this.previous = this.current;
-        this.current = null;
+        if (this.current)
+        {
+            this.current.unbind();
+            this.previous = this.current;
+            this.current = null;
+        }
+        else
+        {
+            this.previous = null;
+        }
 
         renderer.currentProgram = null;
-        renderer.currentVertexBuffer = null;
-        renderer.currentIndexBuffer = null;
 
         renderer.setBlendMode(0, true);
     },

src/renderer/webgl/WebGLPipeline.js

@@ -443,15 +443,13 @@ var WebGLPipeline = new Class({
 
         //  Set-up shaders
 
-        this.renderer.setVertexBuffer(this.vertexBuffer);
+        this.setVertexBuffer();
 
-        for (i = 0; i < shaders.length; i++)
+        for (i = shaders.length - 1; i >= 0; i--)
         {
             shaders[i].rebind();
         }
 
-        this.currentShader.bind();
-
         this.hasBooted = true;
 
         renderer.on(Events.RESIZE, this.resize, this);
@@ -511,7 +509,12 @@ var WebGLPipeline = new Class({
 
             renderer.resetTextures();
 
-            renderer.setVertexBuffer(this.vertexBuffer);
+            var wasBound = this.setVertexBuffer();
+
+            if (wasBound && !setAttributes)
+            {
+                setAttributes = true;
+            }
 
             shader.bind(setAttributes, false);
 
@@ -743,7 +746,7 @@ var WebGLPipeline = new Class({
     {
         if (currentShader === undefined) { currentShader = this.currentShader; }
 
-        var wasBound = this.renderer.setVertexBuffer(this.vertexBuffer);
+        var wasBound = this.setVertexBuffer();
 
         currentShader.bind(wasBound);
 
@@ -766,22 +769,49 @@ var WebGLPipeline = new Class({
      */
     rebind: function ()
     {
-        this.renderer.setVertexBuffer(this.vertexBuffer);
+        var wasBound = this.setVertexBuffer();
 
         var shaders = this.shaders;
 
-        for (var i = 0; i < shaders.length; i++)
+        //  Loop in reverse, so the first shader in the array is left as being bound
+        for (var i = shaders.length - 1; i >= 0; i--)
         {
-            shaders[i].rebind();
+            this.currentShader = shaders[i].bind(wasBound);
         }
 
-        this.currentShader = shaders[0];
+        this.onActive(this.currentShader);
 
         this.onRebind();
 
         return this;
     },
 
+    /**
+     * Binds the vertex buffer to be the active ARRAY_BUFFER on the WebGL context.
+     *
+     * It first checks to see if it's already set as the active buffer and only
+     * binds itself if not.
+     *
+     * @method Phaser.Renderer.WebGL.WebGLPipeline#setVertexBuffer
+     * @since 3.50.0
+     *
+     * @return {boolean} `true` if the vertex buffer was bound, or `false` if it was already bound.
+     */
+    setVertexBuffer: function ()
+    {
+        var gl = this.gl;
+        var buffer = this.vertexBuffer;
+
+        if (gl.getParameter(gl.ARRAY_BUFFER_BINDING) !== buffer)
+        {
+            gl.bindBuffer(gl.ARRAY_BUFFER, buffer);
+
+            return true;
+        }
+
+        return false;
+    },
+
     /**
      * This method is called as a result of the `WebGLPipeline.batchQuad` method, right before a quad
      * belonging to a Game Object is about to be added to the batch. When this is called, the
@@ -890,6 +920,8 @@ var WebGLPipeline = new Class({
 
             if (this.active)
             {
+                this.setVertexBuffer();
+
                 if (vertexCount === this.vertexCapacity)
                 {
                     gl.bufferData(gl.ARRAY_BUFFER, this.vertexData, gl.DYNAMIC_DRAW);

src/renderer/webgl/WebGLRenderer.js

@@ -294,26 +294,6 @@ var WebGLRenderer = new Class({
          */
         this.currentProgram = null;
 
-        /**
-         * Current WebGLBuffer (Vertex buffer) in use
-         *
-         * @name Phaser.Renderer.WebGL.WebGLRenderer#currentVertexBuffer
-         * @type {WebGLBuffer}
-         * @default null
-         * @since 3.0.0
-         */
-        this.currentVertexBuffer = null;
-
-        /**
-         * Current WebGLBuffer (Index buffer) in use
-         *
-         * @name Phaser.Renderer.WebGL.WebGLRenderer#currentIndexBuffer
-         * @type {WebGLBuffer}
-         * @default null
-         * @since 3.0.0
-         */
-        this.currentIndexBuffer = null;
-
         /**
          * Current blend mode in use
          *
@@ -1687,65 +1667,6 @@ var WebGLRenderer = new Class({
         return this;
     },
 
-    /**
-     * Binds a vertex buffer.
-     *
-     * If there was a different vertex buffer already bound it will force a pipeline flush first.
-     *
-     * If the same buffer given to this method is already set as the current buffer, no change
-     * will take place and this method will return `false`.
-     *
-     * @method Phaser.Renderer.WebGL.WebGLRenderer#setVertexBuffer
-     * @since 3.0.0
-     *
-     * @param {WebGLBuffer} vertexBuffer - The buffer that needs to be bound.
-     *
-     * @return {boolean} `true` if the given buffer was bound, otherwise `false`.
-     */
-    setVertexBuffer: function (vertexBuffer)
-    {
-        if (vertexBuffer && vertexBuffer !== this.currentVertexBuffer)
-        {
-            var gl = this.gl;
-
-            this.flush();
-
-            gl.bindBuffer(gl.ARRAY_BUFFER, vertexBuffer);
-
-            this.currentVertexBuffer = vertexBuffer;
-
-            return true;
-        }
-
-        return false;
-    },
-
-    /**
-     * Binds an index buffer. If there is an index buffer already bound it'll force a pipeline flush.
-     *
-     * @method Phaser.Renderer.WebGL.WebGLRenderer#setIndexBuffer
-     * @since 3.0.0
-     *
-     * @param {WebGLBuffer} indexBuffer - The buffer the needs to be bound.
-     *
-     * @return {this} This WebGLRenderer instance.
-     */
-    setIndexBuffer: function (indexBuffer)
-    {
-        var gl = this.gl;
-
-        if (indexBuffer && indexBuffer !== this.currentIndexBuffer)
-        {
-            this.flush();
-
-            gl.bindBuffer(gl.ELEMENT_ARRAY_BUFFER, indexBuffer);
-
-            this.currentIndexBuffer = indexBuffer;
-        }
-
-        return this;
-    },
-
     /**
      * Creates a texture from an image source. If the source is not valid it creates an empty texture.
      *