diff options
author | Eric Guzman | 2012-02-13 15:48:37 -0800 |
---|---|---|
committer | Eric Guzman | 2012-02-13 15:48:37 -0800 |
commit | b2672478decd3ee3bfacf86b525551c997f9604d (patch) | |
tree | 79a88684406d3adf00350246a4da884b97fb0eac /js/helper-classes/RDGE/src/core/script/jshader.js | |
parent | a738121a921e4c721b280434952b415b9ab3b1a8 (diff) | |
parent | 0620e2f788861e824d6e49fa319da4d20b18a556 (diff) | |
download | ninja-b2672478decd3ee3bfacf86b525551c997f9604d.tar.gz |
Merge branch 'refs/heads/master' into StylesControllerUpdates
Conflicts:
js/controllers/styles-controller.js
Diffstat (limited to 'js/helper-classes/RDGE/src/core/script/jshader.js')
-rw-r--r-- | js/helper-classes/RDGE/src/core/script/jshader.js | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/js/helper-classes/RDGE/src/core/script/jshader.js b/js/helper-classes/RDGE/src/core/script/jshader.js index f28219cf..36c5939e 100644 --- a/js/helper-classes/RDGE/src/core/script/jshader.js +++ b/js/helper-classes/RDGE/src/core/script/jshader.js | |||
@@ -173,7 +173,7 @@ jshader = function(addr) { | |||
173 | 173 | ||
174 | // if the parameter does not exist in the shader cull it from the pass | 174 | // if the parameter does not exist in the shader cull it from the pass |
175 | if (this.loc == null) { | 175 | if (this.loc == null) { |
176 | window.console.log("ctx:" + ctx.canvas.id + ", technique: " + technique + ", uniform: " + name + " was not found, jshader param will have no affect"); | 176 | window.console.log("ctx:" + ctx.canvas.rdgeid + ", technique: " + technique + ", uniform: " + name + " was not found, jshader param will have no affect"); |
177 | //return; | 177 | //return; |
178 | } | 178 | } |
179 | 179 | ||
@@ -308,7 +308,7 @@ jshader = function(addr) { | |||
308 | } | 308 | } |
309 | } | 309 | } |
310 | 310 | ||
311 | program.ctxId = this.ctx.canvas.id; | 311 | program.ctxId = this.ctx.canvas.rdgeid; |
312 | if (!program) { | 312 | if (!program) { |
313 | this.renderer.console.log("Build errors found in technique: " + t); | 313 | this.renderer.console.log("Build errors found in technique: " + t); |
314 | this.def[t] = null; // remove bad technique | 314 | this.def[t] = null; // remove bad technique |
@@ -322,7 +322,7 @@ jshader = function(addr) { | |||
322 | var gp = new globalParam(this.ctx, p, rdgeGlobalParameters[p], program); | 322 | var gp = new globalParam(this.ctx, p, rdgeGlobalParameters[p], program); |
323 | 323 | ||
324 | if (gp.loc != null) { | 324 | if (gp.loc != null) { |
325 | gp.loc.ctxID = this.ctx.canvas.id; | 325 | gp.loc.ctxID = this.ctx.canvas.rdgeid; |
326 | this[t].passes[i].defParams[p] = gp; | 326 | this[t].passes[i].defParams[p] = gp; |
327 | this.global[p] = gp; | 327 | this.global[p] = gp; |
328 | } | 328 | } |