jeena/pixi.js
1
0
Fork 0
Code Issues Pull requests Projects Packages Wiki Activity Actions

Fixed bug in gl.bindTexture which tried to use an undefined private var.

Browse source
This commit is contained in:
photonstorm 2014-02-27 23:21:47 +00:00
parent e4bd364a9f
commit 1599b15c21
1 changed files with 2 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

12
src/pixi/renderers/webgl/shaders/PixiShader.js
View file

@ -33,7 +33,6 @@ PIXI.PixiShader = function(gl)
'}' '}'
]; ];
/** /**
* @property {number} textureCount - A local texture counter for multi-texture shaders. * @property {number} textureCount - A local texture counter for multi-texture shaders.
*/ */
@ -51,7 +50,6 @@ PIXI.PixiShader = function(gl)
*/ */
PIXI.PixiShader.prototype.init = function() PIXI.PixiShader.prototype.init = function()
{ {
var gl = this.gl; var gl = this.gl;
var program = PIXI.compileProgram(gl, this.vertexSrc || PIXI.PixiShader.defaultVertexSrc, this.fragmentSrc); var program = PIXI.compileProgram(gl, this.vertexSrc || PIXI.PixiShader.defaultVertexSrc, this.fragmentSrc);
@ -185,7 +183,7 @@ PIXI.PixiShader.prototype.initSampler2D = function(uniform)
var gl = this.gl; var gl = this.gl;
gl.activeTexture(gl['TEXTURE' + this.textureCount]); gl.activeTexture(gl['TEXTURE' + this.textureCount]);
gl.bindTexture(gl.TEXTURE_2D, uniform.value.baseTexture._glTexture); gl.bindTexture(gl.TEXTURE_2D, uniform.value.baseTexture._glTextures[gl.id]);
// Extended texture data // Extended texture data
if (uniform.textureData) if (uniform.textureData)
@ -259,7 +257,6 @@ PIXI.PixiShader.prototype.syncUniforms = function()
// This would probably be faster in an array and it would guarantee key order // This would probably be faster in an array and it would guarantee key order
for (var key in this.uniforms) for (var key in this.uniforms)
{ {
uniform = this.uniforms[key]; uniform = this.uniforms[key];
if (uniform.glValueLength === 1) if (uniform.glValueLength === 1)
@ -306,7 +303,6 @@ PIXI.PixiShader.prototype.syncUniforms = function()
/** /**
* Destroys the shader * Destroys the shader
* @method destroy * @method destroy
*
*/ */
PIXI.PixiShader.prototype.destroy = function() PIXI.PixiShader.prototype.destroy = function()
{ {
@ -318,7 +314,7 @@ PIXI.PixiShader.prototype.destroy = function()
}; };
/** /**
* * The Default Vertex shader source
* @property defaultVertexSrc * @property defaultVertexSrc
* @type String * @type String
*/ */
@ -342,7 +338,3 @@ PIXI.PixiShader.defaultVertexSrc = [
' vColor = vec4(color * aColor.x, aColor.x);', ' vColor = vec4(color * aColor.x, aColor.x);',
'}' '}'
]; ];