diff --git a/src/core/renderers/webgl/systems/ContextSystem.js b/src/core/renderers/webgl/systems/ContextSystem.js index fa26c42..7588dbc 100644 --- a/src/core/renderers/webgl/systems/ContextSystem.js +++ b/src/core/renderers/webgl/systems/ContextSystem.js @@ -1,7 +1,6 @@ import WebGLSystem from './WebGLSystem'; import { Rectangle, Matrix } from '../../../math'; import glCore from 'pixi-gl-core'; -import validateContext from '../utils/validateContext'; let CONTEXT_UID = 0; @@ -59,7 +58,7 @@ initFromContext(gl) { this.gl = gl; - validateContext(gl); + this.validateContext(gl); this.renderer.gl = gl; this.renderer.CONTEXT_UID = CONTEXT_UID++; this.renderer.runners.contextChange.run(gl); @@ -116,4 +115,17 @@ { this.gl.flush(); } + + validateContext(gl) + { + const attributes = gl.getContextAttributes(); + + // this is going to be fairly simple for now.. but at least we have room to grow! + if (!attributes.stencil) + { + /* eslint-disable no-console */ + console.warn('Provided WebGL context does not have a stencil buffer, masks may not render correctly'); + /* eslint-enable no-console */ + } + } } diff --git a/src/core/renderers/webgl/systems/ContextSystem.js b/src/core/renderers/webgl/systems/ContextSystem.js index fa26c42..7588dbc 100644 --- a/src/core/renderers/webgl/systems/ContextSystem.js +++ b/src/core/renderers/webgl/systems/ContextSystem.js @@ -1,7 +1,6 @@ import WebGLSystem from './WebGLSystem'; import { Rectangle, Matrix } from '../../../math'; import glCore from 'pixi-gl-core'; -import validateContext from '../utils/validateContext'; let CONTEXT_UID = 0; @@ -59,7 +58,7 @@ initFromContext(gl) { this.gl = gl; - validateContext(gl); + this.validateContext(gl); this.renderer.gl = gl; this.renderer.CONTEXT_UID = CONTEXT_UID++; this.renderer.runners.contextChange.run(gl); @@ -116,4 +115,17 @@ { this.gl.flush(); } + + validateContext(gl) + { + const attributes = gl.getContextAttributes(); + + // this is going to be fairly simple for now.. but at least we have room to grow! + if (!attributes.stencil) + { + /* eslint-disable no-console */ + console.warn('Provided WebGL context does not have a stencil buffer, masks may not render correctly'); + /* eslint-enable no-console */ + } + } } diff --git a/src/core/renderers/webgl/utils/mapWebGLDrawModesToPixi.js b/src/core/renderers/webgl/utils/mapWebGLDrawModesToPixi.js deleted file mode 100644 index 6d878a1..0000000 --- a/src/core/renderers/webgl/utils/mapWebGLDrawModesToPixi.js +++ /dev/null @@ -1,24 +0,0 @@ -import { DRAW_MODES } from '../../../const'; - -/** - * Generic Mask Stack data structure. - * - * @memberof PIXI - * @function mapWebGLDrawModesToPixi - * @private - * @param {WebGLRenderingContext} gl - The current WebGL drawing context - * @param {object} [object={}] - The object to map into - * @return {object} The mapped draw modes. - */ -export default function mapWebGLDrawModesToPixi(gl, object = {}) -{ - object[DRAW_MODES.POINTS] = gl.POINTS; - object[DRAW_MODES.LINES] = gl.LINES; - object[DRAW_MODES.LINE_LOOP] = gl.LINE_LOOP; - object[DRAW_MODES.LINE_STRIP] = gl.LINE_STRIP; - object[DRAW_MODES.TRIANGLES] = gl.TRIANGLES; - object[DRAW_MODES.TRIANGLE_STRIP] = gl.TRIANGLE_STRIP; - object[DRAW_MODES.TRIANGLE_FAN] = gl.TRIANGLE_FAN; - - return object; -} diff --git a/src/core/renderers/webgl/systems/ContextSystem.js b/src/core/renderers/webgl/systems/ContextSystem.js index fa26c42..7588dbc 100644 --- a/src/core/renderers/webgl/systems/ContextSystem.js +++ b/src/core/renderers/webgl/systems/ContextSystem.js @@ -1,7 +1,6 @@ import WebGLSystem from './WebGLSystem'; import { Rectangle, Matrix } from '../../../math'; import glCore from 'pixi-gl-core'; -import validateContext from '../utils/validateContext'; let CONTEXT_UID = 0; @@ -59,7 +58,7 @@ initFromContext(gl) { this.gl = gl; - validateContext(gl); + this.validateContext(gl); this.renderer.gl = gl; this.renderer.CONTEXT_UID = CONTEXT_UID++; this.renderer.runners.contextChange.run(gl); @@ -116,4 +115,17 @@ { this.gl.flush(); } + + validateContext(gl) + { + const attributes = gl.getContextAttributes(); + + // this is going to be fairly simple for now.. but at least we have room to grow! + if (!attributes.stencil) + { + /* eslint-disable no-console */ + console.warn('Provided WebGL context does not have a stencil buffer, masks may not render correctly'); + /* eslint-enable no-console */ + } + } } diff --git a/src/core/renderers/webgl/utils/mapWebGLDrawModesToPixi.js b/src/core/renderers/webgl/utils/mapWebGLDrawModesToPixi.js deleted file mode 100644 index 6d878a1..0000000 --- a/src/core/renderers/webgl/utils/mapWebGLDrawModesToPixi.js +++ /dev/null @@ -1,24 +0,0 @@ -import { DRAW_MODES } from '../../../const'; - -/** - * Generic Mask Stack data structure. - * - * @memberof PIXI - * @function mapWebGLDrawModesToPixi - * @private - * @param {WebGLRenderingContext} gl - The current WebGL drawing context - * @param {object} [object={}] - The object to map into - * @return {object} The mapped draw modes. - */ -export default function mapWebGLDrawModesToPixi(gl, object = {}) -{ - object[DRAW_MODES.POINTS] = gl.POINTS; - object[DRAW_MODES.LINES] = gl.LINES; - object[DRAW_MODES.LINE_LOOP] = gl.LINE_LOOP; - object[DRAW_MODES.LINE_STRIP] = gl.LINE_STRIP; - object[DRAW_MODES.TRIANGLES] = gl.TRIANGLES; - object[DRAW_MODES.TRIANGLE_STRIP] = gl.TRIANGLE_STRIP; - object[DRAW_MODES.TRIANGLE_FAN] = gl.TRIANGLE_FAN; - - return object; -} diff --git a/src/core/renderers/webgl/utils/validateContext.js b/src/core/renderers/webgl/utils/validateContext.js deleted file mode 100644 index 1566a06..0000000 --- a/src/core/renderers/webgl/utils/validateContext.js +++ /dev/null @@ -1,12 +0,0 @@ -export default function validateContext(gl) -{ - const attributes = gl.getContextAttributes(); - - // this is going to be fairly simple for now.. but at least we have room to grow! - if (!attributes.stencil) - { - /* eslint-disable no-console */ - console.warn('Provided WebGL context does not have a stencil buffer, masks may not render correctly'); - /* eslint-enable no-console */ - } -}