diff --git a/src/core/renderers/webgl/systems/geometry/GeometrySystem.js b/src/core/renderers/webgl/systems/geometry/GeometrySystem.js index 5628e7d..c0c6b14 100644 --- a/src/core/renderers/webgl/systems/geometry/GeometrySystem.js +++ b/src/core/renderers/webgl/systems/geometry/GeometrySystem.js @@ -50,7 +50,7 @@ // webgl 1! let nativeVaoExtension = this.renderer.context.extensions.vertexArrayObject; - if(this.renderer.legacy) + if (this.renderer.legacy) { nativeVaoExtension = null; } @@ -97,7 +97,6 @@ gl.drawArraysInstanced = instanceExt.drawArraysInstancedANGLE; } } - } /** diff --git a/src/core/renderers/webgl/systems/geometry/GeometrySystem.js b/src/core/renderers/webgl/systems/geometry/GeometrySystem.js index 5628e7d..c0c6b14 100644 --- a/src/core/renderers/webgl/systems/geometry/GeometrySystem.js +++ b/src/core/renderers/webgl/systems/geometry/GeometrySystem.js @@ -50,7 +50,7 @@ // webgl 1! let nativeVaoExtension = this.renderer.context.extensions.vertexArrayObject; - if(this.renderer.legacy) + if (this.renderer.legacy) { nativeVaoExtension = null; } @@ -97,7 +97,6 @@ gl.drawArraysInstanced = instanceExt.drawArraysInstancedANGLE; } } - } /** diff --git a/src/core/sprites/webgl/SpriteRenderer.js b/src/core/sprites/webgl/SpriteRenderer.js index 88ca953..1e682c4 100644 --- a/src/core/sprites/webgl/SpriteRenderer.js +++ b/src/core/sprites/webgl/SpriteRenderer.js @@ -436,8 +436,6 @@ this.renderer.off('prerender', this.onPrerender, this); - - if (this.shader) { this.shader.destroy(); diff --git a/src/core/renderers/webgl/systems/geometry/GeometrySystem.js b/src/core/renderers/webgl/systems/geometry/GeometrySystem.js index 5628e7d..c0c6b14 100644 --- a/src/core/renderers/webgl/systems/geometry/GeometrySystem.js +++ b/src/core/renderers/webgl/systems/geometry/GeometrySystem.js @@ -50,7 +50,7 @@ // webgl 1! let nativeVaoExtension = this.renderer.context.extensions.vertexArrayObject; - if(this.renderer.legacy) + if (this.renderer.legacy) { nativeVaoExtension = null; } @@ -97,7 +97,6 @@ gl.drawArraysInstanced = instanceExt.drawArraysInstancedANGLE; } } - } /** diff --git a/src/core/sprites/webgl/SpriteRenderer.js b/src/core/sprites/webgl/SpriteRenderer.js index 88ca953..1e682c4 100644 --- a/src/core/sprites/webgl/SpriteRenderer.js +++ b/src/core/sprites/webgl/SpriteRenderer.js @@ -436,8 +436,6 @@ this.renderer.off('prerender', this.onPrerender, this); - - if (this.shader) { this.shader.destroy(); diff --git a/test/core/Graphics.js b/test/core/Graphics.js index fc6970e..a3d2a4c 100644 --- a/test/core/Graphics.js +++ b/test/core/Graphics.js @@ -1,6 +1,6 @@ 'use strict'; -const MockPointer = require('../interaction/MockPointer'); +// const MockPointer = require('../interaction/MockPointer'); const withGL = require('../withGL'); describe('PIXI.Graphics', function () diff --git a/src/core/renderers/webgl/systems/geometry/GeometrySystem.js b/src/core/renderers/webgl/systems/geometry/GeometrySystem.js index 5628e7d..c0c6b14 100644 --- a/src/core/renderers/webgl/systems/geometry/GeometrySystem.js +++ b/src/core/renderers/webgl/systems/geometry/GeometrySystem.js @@ -50,7 +50,7 @@ // webgl 1! let nativeVaoExtension = this.renderer.context.extensions.vertexArrayObject; - if(this.renderer.legacy) + if (this.renderer.legacy) { nativeVaoExtension = null; } @@ -97,7 +97,6 @@ gl.drawArraysInstanced = instanceExt.drawArraysInstancedANGLE; } } - } /** diff --git a/src/core/sprites/webgl/SpriteRenderer.js b/src/core/sprites/webgl/SpriteRenderer.js index 88ca953..1e682c4 100644 --- a/src/core/sprites/webgl/SpriteRenderer.js +++ b/src/core/sprites/webgl/SpriteRenderer.js @@ -436,8 +436,6 @@ this.renderer.off('prerender', this.onPrerender, this); - - if (this.shader) { this.shader.destroy(); diff --git a/test/core/Graphics.js b/test/core/Graphics.js index fc6970e..a3d2a4c 100644 --- a/test/core/Graphics.js +++ b/test/core/Graphics.js @@ -1,6 +1,6 @@ 'use strict'; -const MockPointer = require('../interaction/MockPointer'); +// const MockPointer = require('../interaction/MockPointer'); const withGL = require('../withGL'); describe('PIXI.Graphics', function () diff --git a/test/core/SpriteRenderer.js b/test/core/SpriteRenderer.js index 41dbcbd..e6e93f8 100644 --- a/test/core/SpriteRenderer.js +++ b/test/core/SpriteRenderer.js @@ -1,5 +1,12 @@ 'use strict'; +const mockrunner = { + contextChange: { + remove: () => 1, + add: () => 1, + }, +}; + describe('SpriteRenderer', function () { it('can be destroyed', function () @@ -7,7 +14,7 @@ const destroyable = { destroy: sinon.stub() }; const webgl = { on: sinon.stub(), - runners:{contextChange:{remove:()=>{}, add:()=>{}}}, + runners: mockrunner, off: sinon.stub(), }; const renderer = new PIXI.SpriteRenderer(webgl); @@ -25,7 +32,7 @@ { const webgl = { on: sinon.stub(), - runners:{contextChange:{remove:()=>{}, add:()=>{}}}, + runners: mockrunner, off: sinon.stub(), }; diff --git a/src/core/renderers/webgl/systems/geometry/GeometrySystem.js b/src/core/renderers/webgl/systems/geometry/GeometrySystem.js index 5628e7d..c0c6b14 100644 --- a/src/core/renderers/webgl/systems/geometry/GeometrySystem.js +++ b/src/core/renderers/webgl/systems/geometry/GeometrySystem.js @@ -50,7 +50,7 @@ // webgl 1! let nativeVaoExtension = this.renderer.context.extensions.vertexArrayObject; - if(this.renderer.legacy) + if (this.renderer.legacy) { nativeVaoExtension = null; } @@ -97,7 +97,6 @@ gl.drawArraysInstanced = instanceExt.drawArraysInstancedANGLE; } } - } /** diff --git a/src/core/sprites/webgl/SpriteRenderer.js b/src/core/sprites/webgl/SpriteRenderer.js index 88ca953..1e682c4 100644 --- a/src/core/sprites/webgl/SpriteRenderer.js +++ b/src/core/sprites/webgl/SpriteRenderer.js @@ -436,8 +436,6 @@ this.renderer.off('prerender', this.onPrerender, this); - - if (this.shader) { this.shader.destroy(); diff --git a/test/core/Graphics.js b/test/core/Graphics.js index fc6970e..a3d2a4c 100644 --- a/test/core/Graphics.js +++ b/test/core/Graphics.js @@ -1,6 +1,6 @@ 'use strict'; -const MockPointer = require('../interaction/MockPointer'); +// const MockPointer = require('../interaction/MockPointer'); const withGL = require('../withGL'); describe('PIXI.Graphics', function () diff --git a/test/core/SpriteRenderer.js b/test/core/SpriteRenderer.js index 41dbcbd..e6e93f8 100644 --- a/test/core/SpriteRenderer.js +++ b/test/core/SpriteRenderer.js @@ -1,5 +1,12 @@ 'use strict'; +const mockrunner = { + contextChange: { + remove: () => 1, + add: () => 1, + }, +}; + describe('SpriteRenderer', function () { it('can be destroyed', function () @@ -7,7 +14,7 @@ const destroyable = { destroy: sinon.stub() }; const webgl = { on: sinon.stub(), - runners:{contextChange:{remove:()=>{}, add:()=>{}}}, + runners: mockrunner, off: sinon.stub(), }; const renderer = new PIXI.SpriteRenderer(webgl); @@ -25,7 +32,7 @@ { const webgl = { on: sinon.stub(), - runners:{contextChange:{remove:()=>{}, add:()=>{}}}, + runners: mockrunner, off: sinon.stub(), }; diff --git a/test/core/WebGLRenderer.js b/test/core/WebGLRenderer.js index 9e7a92c..a5bf69d 100644 --- a/test/core/WebGLRenderer.js +++ b/test/core/WebGLRenderer.js @@ -6,7 +6,7 @@ { it('setting option legacy should disable VAOs and SPRITE_MAX_TEXTURES', withGL(function () { - const renderer = new PIXI.WebGLRenderer({ legacy: true, width:1, height:1 }); + const renderer = new PIXI.WebGLRenderer({ legacy: true, width: 1, height: 1 }); try {