Pipelines now populate their own uniforms

Author: photonstorm

src/renderer/webgl/pipelines/BitmapMaskPipeline.js

@@ -60,12 +60,6 @@ var BitmapMaskPipeline = new Class({
                 type: WEBGL_CONST.FLOAT
             }
         ]);
-        config.uniforms = GetFastValue(config, 'uniforms', [
-            'uResolution',
-            'uMainSampler',
-            'uMaskSampler',
-            'uInvertMaskAlpha'
-        ]);
 
         WebGLPipeline.call(this, config);
     },

src/renderer/webgl/pipelines/GraphicsPipeline.js

@@ -55,8 +55,7 @@ var GraphicsPipeline = new Class({
         config.attributes = GetFastValue(config, 'attributes', [
             {
                 name: 'inPosition',
-                size: 2,
-                type: WEBGL_CONST.FLOAT
+                size: 2
             },
             {
                 name: 'inColor',
@@ -65,9 +64,6 @@ var GraphicsPipeline = new Class({
                 normalized: true
             }
         ]);
-        config.uniforms = GetFastValue(config, 'uniforms', [
-            'uProjectionMatrix'
-        ]);
 
         WebGLPipeline.call(this, config);
 

src/renderer/webgl/pipelines/MultiPipeline.js

@@ -81,23 +81,17 @@ var MultiPipeline = new Class({
         config.attributes = GetFastValue(config, 'attributes', [
             {
                 name: 'inPosition',
-                size: 2,
-                type: WEBGL_CONST.FLOAT
+                size: 2
             },
             {
                 name: 'inTexCoord',
-                size: 2,
-                type: WEBGL_CONST.FLOAT
+                size: 2
             },
             {
-                name: 'inTexId',
-                size: 1,
-                type: WEBGL_CONST.FLOAT
+                name: 'inTexId'
             },
             {
-                name: 'inTintEffect',
-                size: 1,
-                type: WEBGL_CONST.FLOAT
+                name: 'inTintEffect'
             },
             {
                 name: 'inTint',
@@ -106,10 +100,6 @@ var MultiPipeline = new Class({
                 normalized: true
             }
         ]);
-        config.uniforms = GetFastValue(config, 'uniforms', [
-            'uProjectionMatrix',
-            'uMainSampler'
-        ]);
 
         WebGLPipeline.call(this, config);
 

src/renderer/webgl/pipelines/PointLightPipeline.js

@@ -20,10 +20,6 @@ var PointLightPipeline = new Class({
     {
         config.vertShader = GetFastValue(config, 'vertShader', PointLightShaderSourceVS);
         config.fragShader = GetFastValue(config, 'fragShader', PointLightShaderSourceFS);
-        config.uniforms = GetFastValue(config, 'uniforms', [
-            'uProjectionMatrix',
-            'uResolution'
-        ]);
         config.attributes = GetFastValue(config, 'attributes', [
             {
                 name: 'inPosition',

src/renderer/webgl/pipelines/PostFXPipeline.js

@@ -9,7 +9,6 @@ var ColorMatrix = require('../../../display/ColorMatrix');
 var GetFastValue = require('../../../utils/object/GetFastValue');
 var ShaderSourceFS = require('../shaders/PostFX-frag.js');
 var ShaderSourceVS = require('../shaders/Quad-vert.js');
-var WEBGL_CONST = require('../const');
 var WebGLPipeline = require('../WebGLPipeline');
 
 /**
@@ -47,19 +46,14 @@ var PostFXPipeline = new Class({
         config.renderTarget = GetFastValue(config, 'renderTarget', 1);
         config.fragShader = GetFastValue(config, 'fragShader', ShaderSourceFS);
         config.vertShader = GetFastValue(config, 'vertShader', ShaderSourceVS);
-        config.uniforms = GetFastValue(config, 'uniforms', [
-            'uMainSampler'
-        ]);
         config.attributes = GetFastValue(config, 'attributes', [
             {
                 name: 'inPosition',
-                size: 2,
-                type: WEBGL_CONST.FLOAT
+                size: 2
             },
             {
                 name: 'inTexCoord',
-                size: 2,
-                type: WEBGL_CONST.FLOAT
+                size: 2
             }
         ]);
         config.batchSize = 1;

src/renderer/webgl/pipelines/UtilityPipeline.js

@@ -12,7 +12,6 @@ var CopyFS = require('../shaders/Copy-frag.js');
 var GetFastValue = require('../../../utils/object/GetFastValue');
 var LinearBlendFS = require('../shaders/LinearBlend-frag.js');
 var QuadVS = require('../shaders/Quad-vert.js');
-var WEBGL_CONST = require('../const');
 var WebGLPipeline = require('../WebGLPipeline');
 
 /**
@@ -77,51 +76,30 @@ var UtilityPipeline = new Class({
         config.shaders = GetFastValue(config, 'shaders', [
             {
                 name: 'Copy',
-                fragShader: CopyFS,
-                uniforms: [
-                    'uMainSampler',
-                    'uBrightness'
-                ]
+                fragShader: CopyFS
             },
             {
                 name: 'AddBlend',
-                fragShader: AddBlendFS,
-                uniforms: [
-                    'uMainSampler1',
-                    'uMainSampler2',
-                    'uStrength'
-                ]
+                fragShader: AddBlendFS
             },
             {
                 name: 'LinearBlend',
-                fragShader: LinearBlendFS,
-                uniforms: [
-                    'uMainSampler1',
-                    'uMainSampler2',
-                    'uStrength'
-                ]
+                fragShader: LinearBlendFS
             },
             {
                 name: 'ColorMatrix',
-                fragShader: ColorMatrixFS,
-                uniforms: [
-                    'uMainSampler',
-                    'uColorMatrix',
-                    'uAlpha'
-                ]
+                fragShader: ColorMatrixFS
             }
         ]);
 
         config.attributes = GetFastValue(config, 'attributes', [
             {
                 name: 'inPosition',
-                size: 2,
-                type: WEBGL_CONST.FLOAT
+                size: 2
             },
             {
                 name: 'inTexCoord',
-                size: 2,
-                type: WEBGL_CONST.FLOAT
+                size: 2
             }
         ]);