Skip to content

Commit 58ee855

Browse files
author
David Gillen
committed
warning fixes and enabling use of micro buffer
1 parent 777fd21 commit 58ee855

File tree

1 file changed

+8
-4
lines changed

1 file changed

+8
-4
lines changed

src/easeljs/display/StageGL.js

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2307,7 +2307,7 @@ this.createjs = this.createjs||{};
23072307

23082308
if (this.vocalDebug) {
23092309
if (isNPOT && this._antialias) {
2310-
console.warn("NPOT(Non Power of Two) Texture w/ antialias on: "+ image.src);
2310+
console.warn("NPOT(Non Power of Two) Texture with context.antialias true: "+ image.src);
23112311
}
23122312
if (image.width > gl.MAX_TEXTURE_SIZE || image.height > gl.MAX_TEXTURE_SIZE){
23132313
console && console.error("Oversized Texture: "+ image.width+"x"+image.height +" vs "+ gl.MAX_TEXTURE_SIZE +"max");
@@ -2475,9 +2475,12 @@ this.createjs = this.createjs||{};
24752475
}
24762476
}
24772477

2478-
if (shaderData.immediate && this._directDraw) {
2479-
if (this.vocalDebug) { console.log("Illegal compositeOperation ["+ newMode +"] due to StageGL.directDraw = true, reverting to default"); }
2480-
return;
2478+
if (shaderData.immediate) {
2479+
if (this._directDraw) {
2480+
if (this.vocalDebug) { console.log("Illegal compositeOperation ["+ newMode +"] due to StageGL.directDraw = true, reverting to default"); }
2481+
return;
2482+
}
2483+
this._activeConfig = this._attributeConfig["micro"];
24812484
}
24822485

24832486
gl.bindFramebuffer(gl.FRAMEBUFFER, this._batchTextureOutput._frameBuffer);
@@ -2829,6 +2832,7 @@ this.createjs = this.createjs||{};
28292832
this._batchVertexCount += StageGL.INDICIES_PER_CARD;
28302833

28312834
if (this._immediateRender) {
2835+
this._activeConfig = this._attributeConfig["default"];
28322836
this._immediateBatchRender();
28332837
}
28342838

0 commit comments

Comments
 (0)