Incomplete cacheless filter support, minor other cache bugs as result

Author: David Gillen

src/easeljs/display/StageGL.js

@@ -1428,7 +1428,7 @@ this.createjs = this.createjs||{};
 		this._drawContent(container, true);
 
 		// re-align buffers with fake filter passes to solve certain error cases
-		if (out !== this._batchTextureOutput) {
+		if (out !== ((manager._filterCount%2) ? this._batchTextureConcat : this._batchTextureOutput)) {
 			// pre filter pass to align output, may of become misaligned due to composite operations
 			filtersLeft++;
 		}
@@ -2528,31 +2528,33 @@ this.createjs = this.createjs||{};
 		var l = container.children.length;
 		for (var i = 0; i < l; i++) {
 			var item = container.children[i];
-			var useCache = item.cacheCanvas && !ignoreCache;
+			var useCache = (!ignoreCache && item.cacheCanvas) || false;
 
 			if (!(item.visible && concatAlpha > 0.0035)) { continue; }
 
-			if (!useCache && item._updateState){
-				item._updateState();
-			}
-
-			if(!ignoreCache && item.filters !== null && item.filters.length) {
-				var bounds;
-				if (!item.bitmapCache) {
-					bounds = item.getBounds();
-					item.bitmapCache = new createjs.BitmapCache();
-					item.bitmapCache._autoGenerated = true;
+			if (useCache === false) {
+				if (item._updateState){
+					item._updateState();
 				}
-				if (item.bitmapCache._autoGenerated) {
-					this.batchReason = "cachelessFilterInterupt";
-					this._renderBatch();					// <----------------------------------------------------
-					bounds = bounds || item.getBounds();
-					item.bitmapCache.define(item, bounds.x, bounds.y, bounds.width, bounds.height, 1, {useGL:this});
-					useCache = true;
+
+				if(!ignoreCache && item.filters !== null && item.filters.length) {
+					var bounds;
+					if (item.bitmapCache === null) {
+						bounds = item.getBounds();
+						item.bitmapCache = new createjs.BitmapCache();
+						item.bitmapCache._autoGenerated = true;
+					}
+					if (item.bitmapCache._autoGenerated) {
+						this.batchReason = "cachelessFilterInterupt";
+						this._renderBatch();					// <----------------------------------------------------
+						bounds = bounds || item.getBounds();
+						item.bitmapCache.define(item, bounds.x, bounds.y, bounds.width, bounds.height, 1, {useGL:this});
+						useCache = item.bitmapCache._cacheCanvas;
+					}
 				}
 			}
 
-			if (!useCache && item.children) {
+			if (useCache === false && item.children) {
 				this._appendToBatch(item, cMtx, item.alpha * concatAlpha);
 				continue;
 			}
@@ -2562,8 +2564,7 @@ this.createjs = this.createjs||{};
 			}
 
 			// check for overflowing batch, if yes then force a render
-			// TODO: DHG: consider making this polygon count dependant for things like vector draws
-			if (this._batchVertexCount+StageGL.INDICIES_PER_CARD > this._maxBatchVertexCount) {
+			if (this._batchVertexCount + StageGL.INDICIES_PER_CARD > this._maxBatchVertexCount) {
 				this.batchReason = "vertexOverflow";
 				this._renderBatch();					// <------------------------------------------------------------
 			}
@@ -2586,8 +2587,8 @@ this.createjs = this.createjs||{};
 
 			// get the image data, or abort if not present
 			// BITMAP / Cached Canvas
-			if (item._webGLRenderStyle === 2 || useCache) {
-				image = (ignoreCache?false:item.cacheCanvas) || item.image;
+			if (item._webGLRenderStyle === 2 || useCache !== false) {
+				image = useCache === false ? item.image : useCache;
 
 			// SPRITE
 			} else if (item._webGLRenderStyle === 1) {
@@ -2627,8 +2628,9 @@ this.createjs = this.createjs||{};
 			texIndex = texture._activeIndex;
 			image._drawID = this._drawID;
 
-			if (item._webGLRenderStyle === 2 || useCache) {			// BITMAP / Cached Canvas
-				if (!useCache && item.sourceRect) {
+			// BITMAP / Cached Canvas
+			if (item._webGLRenderStyle === 2 || useCache !== false) {
+				if (useCache === false && item.sourceRect) {
 					// calculate uvs
 					if (!item._uvRect) { item._uvRect = {}; }
 					src = item.sourceRect;
@@ -2645,16 +2647,18 @@ this.createjs = this.createjs||{};
 					// calculate uvs
 					uvRect = StageGL.UV_RECT;
 					// calculate vertices
-					if (useCache) {
+					if (useCache === false) {
+						subL = 0;						subT = 0;
+						subR = image.width+subL;		subB = image.height+subT;
+					} else {
 						src = item.bitmapCache;
 						subL = src.x+(src._filterOffX/src.scale);	subT = src.y+(src._filterOffY/src.scale);
 						subR = (src._drawWidth/src.scale)+subL;		subB = (src._drawHeight/src.scale)+subT;
-					} else {
-						subL = 0;						subT = 0;
-						subR = image.width+subL;		subB = image.height+subT;
 					}
 				}
-			} else if (item._webGLRenderStyle === 1) {											// SPRITE
+
+			// SPRITE
+			} else if (item._webGLRenderStyle === 1) {
 				var rect = frame.rect;
 
 				// calculate uvs