Added comments to shaders to help with debugging with WebGL Inspector.

Author: bitnenfer

src/pixi/renderers/webgl/shaders/ComplexPrimitiveShader.js

@@ -35,7 +35,7 @@ PIXI.ComplexPrimitiveShader = function(gl)
      * @type Array
      */
     this.fragmentSrc = [
-
+        '// ComplexPrimitiveShader Fragment Shader.',
         'precision mediump float;',
 
         'varying vec4 vColor;',
@@ -51,6 +51,7 @@ PIXI.ComplexPrimitiveShader = function(gl)
      * @type Array
      */
     this.vertexSrc  = [
+        '// ComplexPrimitiveShader Vertex Shader.',
         'attribute vec2 aVertexPosition;',
         //'attribute vec4 aColor;',
         'uniform mat3 translationMatrix;',

src/pixi/renderers/webgl/shaders/PixiFastShader.js

@@ -35,6 +35,7 @@ PIXI.PixiFastShader = function(gl)
      * @type Array
      */
     this.fragmentSrc = [
+        '// PixiFastShader Fragment Shader.',
         'precision lowp float;',
         'varying vec2 vTextureCoord;',
         'varying float vColor;',
@@ -50,6 +51,7 @@ PIXI.PixiFastShader = function(gl)
      * @type Array
      */
     this.vertexSrc = [
+        '// PixiFastShader Vertex Shader.',
         'attribute vec2 aVertexPosition;',
         'attribute vec2 aPositionCoord;',
         'attribute vec2 aScale;',

src/pixi/renderers/webgl/shaders/PixiShader.js

@@ -36,12 +36,14 @@ PIXI.PixiShader = function(gl)
      * @type Array
      */
     this.fragmentSrc = [
+        '// PixiShader Fragment Shader.',
         'precision lowp float;',
         'varying vec2 vTextureCoord;',
         'varying vec4 vColor;',
-        'uniform sampler2D uSampler;',
+        'varying float vTextureIndex;',
+        'uniform sampler2D uSamplerArray[16];',
         'void main(void) {',
-        '   gl_FragColor = texture2D(uSampler, vTextureCoord) * vColor ;',
+        '   gl_FragColor = texture2D(uSamplerArray[0], vTextureCoord) * vColor ;',
         '}'
     ];
 
@@ -219,7 +221,8 @@ PIXI.PixiShader.prototype.initSampler2D = function(uniform)
 
     var gl = this.gl;
 
-    gl.activeTexture(gl['TEXTURE' + this.textureCount]);
+    // No need to do string manipulation for this.
+    gl.activeTexture(gl.TEXTURE0 + this.textureCount);
     gl.bindTexture(gl.TEXTURE_2D, uniform.value.baseTexture._glTextures[gl.id]);
 
     //  Extended texture data
@@ -369,21 +372,26 @@ PIXI.PixiShader.prototype.destroy = function()
 * @type String
 */
 PIXI.PixiShader.defaultVertexSrc = [
+    '// Default Vertex Shader',
+    '// With multi-texture rendering',
     'attribute vec2 aVertexPosition;',
     'attribute vec2 aTextureCoord;',
     'attribute vec4 aColor;',
+    'attribute float aTextureIndex;',
 
     'uniform vec2 projectionVector;',
     'uniform vec2 offsetVector;',
 
     'varying vec2 vTextureCoord;',
     'varying vec4 vColor;',
+    'varying float vTextureIndex;',
 
     'const vec2 center = vec2(-1.0, 1.0);',
 
     'void main(void) {',
     '   gl_Position = vec4( ((aVertexPosition + offsetVector) / projectionVector) + center , 0.0, 1.0);',
     '   vTextureCoord = aTextureCoord;',
     '   vColor = vec4(aColor.rgb * aColor.a, aColor.a);',
+    '   vTextureIndex = aTextureIndex;',
     '}'
 ];

src/pixi/renderers/webgl/shaders/PrimitiveShader.js

@@ -35,6 +35,7 @@ PIXI.PrimitiveShader = function(gl)
      * @type Array
      */
     this.fragmentSrc = [
+        '// PrimitiveShader Fragment Shader.',
         'precision mediump float;',
         'varying vec4 vColor;',
 
@@ -49,6 +50,7 @@ PIXI.PrimitiveShader = function(gl)
      * @type Array
      */
     this.vertexSrc  = [
+        '// PrimitiveShader Vertex Shader.',
         'attribute vec2 aVertexPosition;',
         'attribute vec4 aColor;',
         'uniform mat3 translationMatrix;',

src/pixi/renderers/webgl/shaders/StripShader.js

@@ -35,6 +35,7 @@ PIXI.StripShader = function(gl)
      * @type Array
      */
     this.fragmentSrc = [
+        '//StripShader Fragment Shader.',
         'precision mediump float;',
         'varying vec2 vTextureCoord;',
      //   'varying float vColor;',
@@ -53,6 +54,7 @@ PIXI.StripShader = function(gl)
      * @type Array
      */
     this.vertexSrc  = [
+        '//StripShader Vertex Shader.',
         'attribute vec2 aVertexPosition;',
         'attribute vec2 aTextureCoord;',
         'uniform mat3 translationMatrix;',

src/pixi/renderers/webgl/utils/WebGLSpriteBatch.js

@@ -136,6 +136,7 @@ PIXI.WebGLSpriteBatch = function()
      * @type AbstractFilter
      */
     this.defaultShader = new PIXI.AbstractFilter([
+        '//WebGLSpriteBatch Fragment Shader.',
         'precision lowp float;',
         'varying vec2 vTextureCoord;',
         'varying vec4 vColor;',