Fix issues with composite operations in a cache

Author: David Gillen

src/easeljs/display/StageGL.js

@@ -1271,6 +1271,7 @@ this.createjs = this.createjs||{};
 				if (!gl) { return null; }
 
 				gl.disable(gl.DEPTH_TEST);
+				gl.depthMask(false);
 				gl.enable(gl.BLEND);
 				gl.pixelStorei(gl.UNPACK_FLIP_Y_WEBGL, true);
 				gl.clearColor(0.0, 0.0, 0.0, 0);
@@ -1416,7 +1417,7 @@ this.createjs = this.createjs||{};
 		var backupWidth = this._viewportWidth, backupHeight = this._viewportHeight;
 		this.updateViewport(manager._drawWidth, manager._drawHeight);
 
-		var out = this._batchTextureOutput = (manager._filterCount%2) ? manager._bufferTextureConcat : manager._bufferTextureOutput;
+		this._batchTextureOutput = (manager._filterCount%2) ? manager._bufferTextureConcat : manager._bufferTextureOutput;
 		this._batchTextureConcat = (manager._filterCount%2) ? manager._bufferTextureOutput : manager._bufferTextureConcat;
 		this._batchTextureTemp = manager._bufferTextureTemp;
 
@@ -1428,7 +1429,7 @@ this.createjs = this.createjs||{};
 		this._drawContent(container, true);
 
 		// re-align buffers with fake filter passes to solve certain error cases
-		if (out !== ((manager._filterCount%2) ? this._batchTextureConcat : this._batchTextureOutput)) {
+		if (manager._cacheCanvas !== ((manager._filterCount%2) ? this._batchTextureConcat : this._batchTextureOutput)) {
 			// pre filter pass to align output, may of become misaligned due to composite operations
 			filtersLeft++;
 		}
@@ -1951,10 +1952,10 @@ this.createjs = this.createjs||{};
 			for (var i = 0; i < this._gpuTextureCount; i++) {
 				samplers[i] = i;
 			}
-
 			shaderProgram.samplerData = samplers;
+
 			shaderProgram.samplerUniform = gl.getUniformLocation(shaderProgram, "uSampler");
-			gl.uniform1iv(shaderProgram.samplerUniform, samplers);
+			gl.uniform1iv(shaderProgram.samplerUniform, shaderProgram.samplerData);
 
 			shaderProgram.pMatrixUniform = gl.getUniformLocation(shaderProgram, "pMatrix");
 		}
@@ -2270,9 +2271,10 @@ this.createjs = this.createjs||{};
 			if (image && ((image._invalid === undefined && image._isCanvas) || image._invalid)) {
 				this._updateTextureImageData(gl, image);
 			} else {
-				gl.activeTexture(gl.TEXTURE0 + found);
-				gl.bindTexture(gl.TEXTURE_2D, texture);
-				this.setTextureParams(gl);
+				// probably redundant, confirm functionality then remove from codebase
+				//gl.activeTexture(gl.TEXTURE0 + found);
+				//gl.bindTexture(gl.TEXTURE_2D, texture);
+				//this.setTextureParams(gl);
 			}
 			this._lastTextureInsert = found;
 
@@ -2537,7 +2539,7 @@ this.createjs = this.createjs||{};
 					item._updateState();
 				}
 
-				if(!ignoreCache && item.filters !== null && item.filters.length) {
+				if(!ignoreCache && item.cacheCanvas === null && item.filters !== null && item.filters.length) {
 					var bounds;
 					if (item.bitmapCache === null) {
 						bounds = item.getBounds();
@@ -2547,9 +2549,14 @@ this.createjs = this.createjs||{};
 					if (item.bitmapCache._autoGenerated) {
 						this.batchReason = "cachelessFilterInterupt";
 						this._renderBatch();					// <----------------------------------------------------
+
+						var shaderBackup = this._activeShader;
 						bounds = bounds || item.getBounds();
 						item.bitmapCache.define(item, bounds.x, bounds.y, bounds.width, bounds.height, 1, {useGL:this});
 						useCache = item.bitmapCache._cacheCanvas;
+
+						this._activeShader = shaderBackup;
+						gl.bindFramebuffer(gl.FRAMEBUFFER, this._batchTextureOutput._frameBuffer);
 					}
 				}
 			}
@@ -2702,7 +2709,7 @@ this.createjs = this.createjs||{};
 			this._batchVertexCount += StageGL.INDICIES_PER_CARD;
 
 			if (this._immediateRender) {
-				this._immediateBatchRender(gl);
+				this._immediateBatchRender();
 			}
 		}
 
@@ -2713,9 +2720,12 @@ this.createjs = this.createjs||{};
 
 	/**
 	 * The shader or effect needs to be drawn immediately, sub function of `_appendToBatch`
+	 * @method _immediateBatchRender
 	 * @protected
 	 */
-	p._immediateBatchRender = function(gl) {
+	p._immediateBatchRender = function() {
+		var gl = this._webGLContext;
+
 		if (this._batchTextureConcat === null){
 			this._batchTextureConcat = this.getRenderBufferTexture(this._viewportWidth, this._viewportHeight);
 		} else {
@@ -2737,10 +2747,10 @@ this.createjs = this.createjs||{};
 		this._batchTextureConcat = swap;
 
 		this._activeShader = this._mainShader;
-		this.batchReason = "immediateBuffer";
+		this.batchReason = "immediatePrep";
 		this._renderBatch();//<-----------------------------------------------------------------------------------------
 
-		this.batchReason = "immediateDraw";
+		this.batchReason = "immediateResults";
 		this._drawCover(this._batchTextureOutput._frameBuffer, this._batchTextureConcat, this._batchTextureTemp);
 
 		gl.bindFramebuffer(gl.FRAMEBUFFER, this._batchTextureOutput._frameBuffer);
@@ -2756,7 +2766,7 @@ this.createjs = this.createjs||{};
 		var gl = this._webGLContext;
 
 		if (this.vocalDebug) {
-			console.log("Draw["+ this._drawID +":"+ this._batchID +"] : "+ this.batchReason);
+			console.log("Batch["+ this._drawID +":"+ this._batchID +"] : "+ this.batchReason);
 		}
 		var shaderProgram = this._activeShader;
 		var vertexPositionBuffer = this._vertexPositionBuffer;
@@ -2824,7 +2834,7 @@ this.createjs = this.createjs||{};
 		gl.uniform1i(shaderProgram.samplerUniform, 0);
 
 		gl.drawArrays(gl.TRIANGLES, 0, StageGL.INDICIES_PER_CARD);
-		this._batchID++;
+		this._batchID++; // while this isn't a batch, this fixes issues with expected textures in expected places
 	};
 
 	createjs.StageGL = createjs.promote(StageGL, "Stage");

src/easeljs/filters/BitmapCache.js

@@ -548,7 +548,7 @@ this.createjs = this.createjs||{};
 	 * @param {Number} lookup The filter in the list to return
 	 */
 	p._getGLFilter = function(lookup) {
-		if (this.target.filters === null){ return undefined; }
+		if (this.target.filters === null || lookup < 0){ return undefined; }
 		var i = 0;
 		var result = this.target.filters[i];
 		while (result && --lookup >= 0) {