From 1c9fb614a4dbc9125b888da1f3bc210a73ee0812 Mon Sep 17 00:00:00 2001 From: Richard Davey Date: Wed, 15 Jul 2015 23:20:39 +0100 Subject: [PATCH] PIXI._CompileShader can now take an array or a string for the fragment src. --- src/pixi/renderers/webgl/utils/WebGLShaderUtils.js | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/src/pixi/renderers/webgl/utils/WebGLShaderUtils.js b/src/pixi/renderers/webgl/utils/WebGLShaderUtils.js index a7d782660..75cef4b6f 100644 --- a/src/pixi/renderers/webgl/utils/WebGLShaderUtils.js +++ b/src/pixi/renderers/webgl/utils/WebGLShaderUtils.js @@ -46,7 +46,13 @@ PIXI.CompileFragmentShader = function(gl, shaderSrc) */ PIXI._CompileShader = function(gl, shaderSrc, shaderType) { - var src = shaderSrc.join("\n"); + var src = shaderSrc; + + if (Array.isArray(shaderSrc)) + { + src = shaderSrc.join("\n"); + } + var shader = gl.createShader(shaderType); gl.shaderSource(shader, src); gl.compileShader(shader);