Add '#define SHADER_NAME ...' to all shaders for debugging in Shader …

…Editor Extension Reference: - https://gist.github.com/spite/7ae92212b4f28076ba29 - spite/ShaderEditorExtension#10
brianchirls · Jun 25, 2015 · 2d51781 · 2d51781
1 parent e71cfc6
commit 2d51781
Show file tree

Hide file tree

Showing 4 changed files with 31 additions and 3 deletions.
diff --git a/effects/seriously.accumulator.js b/effects/seriously.accumulator.js
@@ -107,6 +107,7 @@
 				mode = mode.toLowerCase();
 
 				shaderSource.fragment = [
+					'#define SHADER_NAME seriously.accumulator.' + mode,
 					'precision mediump float;',
 
 					'const vec3 ZERO = vec3(0.0);',

diff --git a/effects/seriously.blend.js b/effects/seriously.blend.js
@@ -231,6 +231,7 @@
 					}
 
 					shaderSource.vertex = [
+						'#define SHADER_NAME seriously.blend.' + mode,
 						'precision mediump float;',
 
 						'attribute vec4 position;',
@@ -257,6 +258,7 @@
 					].join('\n');
 
 					shaderSource.fragment = [
+						'#define SHADER_NAME seriously.blend.' + mode,
 						'precision mediump float;',
 						'varying vec2 vTexCoord;',
 						'uniform sampler2D source;',
@@ -275,6 +277,7 @@
 
 				//todo: need separate texture coords for different size top/bottom images
 				shaderSource.vertex = [
+					'#define SHADER_NAME seriously.blend.' + mode,
 					'precision mediump float;',
 
 					'attribute vec4 position;',
@@ -301,6 +304,7 @@
 				].join('\n');
 
 				shaderSource.fragment = [
+					'#define SHADER_NAME seriously.blend.' + mode,
 					'precision mediump float;',
 
 					'const vec3 ZERO = vec3(0.0);',

diff --git a/effects/seriously.tvglitch.js b/effects/seriously.tvglitch.js
@@ -63,6 +63,7 @@
 				particleBuffer.numItems = particleCount;
 
 				particleVertex = [
+					'#define SHADER_NAME seriously.tvglitch.particle',
 					'precision mediump float;',
 
 					'attribute vec4 particle;',
@@ -83,6 +84,7 @@
 				].join('\n');
 
 				particleFragment = [
+					'#define SHADER_NAME seriously.tvglitch.particle',
 					'precision mediump float;',
 
 					'varying float intensity;',

diff --git a/seriously.js b/seriously.js
@@ -88,6 +88,8 @@
 		dstAlpha: 0x0303 //ONE_MINUS_SRC_ALPHA
 	},
 
+	shaderNameRegex = /^[\t ]*#define[\t ]+SHADER_NAME/i,
+
 	baseVertexShader,
 	baseFragmentShader,
 
@@ -1161,7 +1163,10 @@
 
 			rectangleModel = buildRectangleModel(gl);
 
-			baseShader = new ShaderProgram(gl, baseVertexShader, baseFragmentShader);
+			baseShader = new ShaderProgram(
+				gl,
+				'#define SHADER_NAME seriously.base\n' + baseVertexShader, '#define SHADER_NAME seriously.base\n' + baseFragmentShader
+			);
 
 			for (i = 0; i < effects.length; i++) {
 				node = effects[i];
@@ -2323,7 +2328,19 @@
 		};
 
 		EffectNode.prototype.buildShader = function () {
-			var shader, effect = this.effect;
+			var shader,
+				effect = this.effect,
+				me = this;
+
+			function addShaderName(shaderSrc) {
+				if (shaderNameRegex.test(shaderSrc)) {
+					return shaderSrc;
+				}
+
+				return '#define SHADER_NAME seriously.' + me.hook + '\n' +
+					shaderSrc;
+			}
+
 			if (this.shaderDirty) {
 				if (effect.commonShader && commonShaders[this.hook]) {
 					if (!this.shader) {
@@ -2342,7 +2359,11 @@
 					if (shader instanceof ShaderProgram) {
 						this.shader = shader;
 					} else if (shader && shader.vertex && shader.fragment) {
-						this.shader = new ShaderProgram(gl, shader.vertex, shader.fragment);
+						this.shader = new ShaderProgram(
+							gl,
+							addShaderName(shader.vertex),
+							addShaderName(shader.fragment)
+						);
 					} else {
 						this.shader = baseShader;
 					}