Removed all instances of gl.id.

photonstorm · photonstorm · commit dc92c92a303d · 2016-10-05T01:45:22.000+01:00
diff --git a/src/renderer/webgl/SpriteBatch.js b/src/renderer/webgl/SpriteBatch.js
@@ -151,7 +151,7 @@ Phaser.Renderer.WebGL.SpriteBatch.prototype = {
         shader.uniforms = {};
         shader.init();
 
-        this.defaultShader.shaders[gl.id] = shader;
+        this.defaultShader.shaders = shader;
     },
 
     begin: function ()
@@ -184,7 +184,7 @@ Phaser.Renderer.WebGL.SpriteBatch.prototype = {
         {
             this.flush();
             gl.activeTexture(gl.TEXTURE0 + baseTexture.textureIndex);
-            gl.bindTexture(gl.TEXTURE_2D, baseTexture._glTextures[gl.id]);
+            gl.bindTexture(gl.TEXTURE_2D, baseTexture._glTextures);
             this.renderer.textureArray[baseTexture.textureIndex] = baseTexture;
         }
 
@@ -334,7 +334,7 @@ Phaser.Renderer.WebGL.SpriteBatch.prototype = {
         {
             this.dirty = false;
 
-            shader = this.defaultShader.shaders[gl.id];
+            shader = this.defaultShader.shaders;
 
             // bind the main texture
             gl.activeTexture(gl.TEXTURE0);
@@ -423,7 +423,7 @@ Phaser.Renderer.WebGL.SpriteBatch.prototype = {
                 {
                     currentShader = nextShader;
 
-                    shader = currentShader.shaders[gl.id];
+                    shader = currentShader.shaders;
 
                     if (!shader)
                     {
@@ -433,7 +433,7 @@ Phaser.Renderer.WebGL.SpriteBatch.prototype = {
                         shader.uniforms = currentShader.uniforms;
                         shader.init();
 
-                        currentShader.shaders[gl.id] = shader;
+                        currentShader.shaders = shader;
                     }
 
                     this.renderer.shaderManager.setShader(shader);
@@ -474,7 +474,7 @@ Phaser.Renderer.WebGL.SpriteBatch.prototype = {
         var gl = this.gl;
 
         // check if a texture is dirty..
-        if (texture._dirty[gl.id])
+        if (texture._dirty)
         {
             if (!this.renderer.updateTexture(texture))
             {
diff --git a/src/renderer/webgl/WebGLRenderer.js b/src/renderer/webgl/WebGLRenderer.js
@@ -182,8 +182,6 @@ Phaser.Renderer.WebGL.prototype = {
             }
         }
 
-        this.gl.id = 0;
-
         var gl = this.gl;
 
         this.maxTextures = gl.getParameter(gl.MAX_TEXTURE_IMAGE_UNITS);
@@ -406,14 +404,14 @@ Phaser.Renderer.WebGL.prototype = {
 
         var gl = this.gl;
 
-        if (!texture._glTextures[gl.id])
+        if (!texture._glTextures)
         {
-            texture._glTextures[gl.id] = gl.createTexture();
+            texture._glTextures = gl.createTexture();
         }
 
         gl.activeTexture(gl.TEXTURE0 + texture.textureIndex);
 
-        gl.bindTexture(gl.TEXTURE_2D, texture._glTextures[gl.id]);
+        gl.bindTexture(gl.TEXTURE_2D, texture._glTextures);
 
         gl.pixelStorei(gl.UNPACK_PREMULTIPLY_ALPHA_WEBGL, texture.premultipliedAlpha);
 
@@ -442,7 +440,7 @@ Phaser.Renderer.WebGL.prototype = {
             gl.texParameteri(gl.TEXTURE_2D, gl.TEXTURE_WRAP_T, gl.REPEAT);
         }
 
-        texture._dirty[gl.id] = false;
+        texture._dirty = false;
 
         return true;
     },
@@ -457,14 +455,14 @@ Phaser.Renderer.WebGL.prototype = {
         var gl = this.gl;
         var textureMetaData = texture.source;
 
-        if (!texture._glTextures[gl.id])
+        if (!texture._glTextures)
         {
-            texture._glTextures[gl.id] = gl.createTexture();
+            texture._glTextures = gl.createTexture();
         }
 
         gl.activeTexture(gl.TEXTURE0 + texture.textureIndex);
 
-        gl.bindTexture(gl.TEXTURE_2D, texture._glTextures[gl.id]);
+        gl.bindTexture(gl.TEXTURE_2D, texture._glTextures);
 
         gl.compressedTexImage2D(
             gl.TEXTURE_2D,
@@ -499,7 +497,7 @@ Phaser.Renderer.WebGL.prototype = {
             gl.texParameteri(gl.TEXTURE_2D, gl.TEXTURE_WRAP_T, gl.REPEAT);
         }
 
-        texture._dirty[gl.id] = false;
+        texture._dirty = false;
 
         return true;
     },
@@ -536,22 +534,22 @@ Phaser.Renderer.WebGL.prototype = {
             // PIXI.WebGLGraphics.updateGraphics(maskData, gl);
         }
 
-        if (maskData._webGL[gl.id] === undefined || maskData._webGL[gl.id].data === undefined || maskData._webGL[gl.id].data.length === 0)
+        if (maskData._webGL === undefined || maskData._webGL.data === undefined || maskData._webGL.data.length === 0)
         {
             return;
         }
 
-        this.stencilManager.pushStencil(maskData, maskData._webGL[gl.id].data[0]);
+        this.stencilManager.pushStencil(maskData, maskData._webGL.data[0]);
     },
 
     popMask: function (maskData)
     {
-        if (maskData._webGL[gl.id] === undefined || maskData._webGL[gl.id].data === undefined || maskData._webGL[gl.id].data.length === 0)
+        if (maskData._webGL === undefined || maskData._webGL.data === undefined || maskData._webGL.data.length === 0)
         {
             return;
         }
 
-        this.stencilManager.popStencil(maskData, maskData._webGL[gl.id].data[0]);
+        this.stencilManager.popStencil(maskData, maskData._webGL.data[0]);
     },
 
     //  Shader Utils
diff --git a/src/renderer/webgl/shaders/Sprite.js b/src/renderer/webgl/shaders/Sprite.js
@@ -264,7 +264,7 @@ Phaser.Renderer.WebGL.Shaders.Sprite.prototype = {
 
         // 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]);
+        gl.bindTexture(gl.TEXTURE_2D, uniform.value.baseTexture._glTextures);
 
         //  Extended texture data
         if (uniform.textureData)
@@ -368,17 +368,17 @@ Phaser.Renderer.WebGL.Shaders.Sprite.prototype = {
                 {
                     gl.activeTexture(gl['TEXTURE' + this.textureCount]);
 
-                    if(uniform.value.baseTexture._dirty[gl.id])
+                    if(uniform.value.baseTexture._dirty)
                     {
-                        PIXI.instances[gl.id].updateTexture(uniform.value.baseTexture);
+                        PIXI.instances.updateTexture(uniform.value.baseTexture);
                     }
                     else
                     {
                         // bind the current texture
-                        gl.bindTexture(gl.TEXTURE_2D, uniform.value.baseTexture._glTextures[gl.id]);
+                        gl.bindTexture(gl.TEXTURE_2D, uniform.value.baseTexture._glTextures);
                     }
 
-                    //  gl.bindTexture(gl.TEXTURE_2D, uniform.value.baseTexture._glTextures[gl.id] || PIXI.createWebGLTexture( uniform.value.baseTexture, gl));
+                    //  gl.bindTexture(gl.TEXTURE_2D, uniform.value.baseTexture._glTextures || PIXI.createWebGLTexture( uniform.value.baseTexture, gl));
                     gl.uniform1i(uniform.uniformLocation, this.textureCount);
                     this.textureCount++;
                 }

Original file line number	Diff line number	Diff line change
`@@ -151,7 +151,7 @@ Phaser.Renderer.WebGL.SpriteBatch.prototype = {`
`151`	`151`	`shader.uniforms = {};`
`152`	`152`	`shader.init();`
`153`	`153`
`154`		`- this.defaultShader.shaders[gl.id] = shader;`
	`154`	`+ this.defaultShader.shaders = shader;`
`155`	`155`	`},`
`156`	`156`
`157`	`157`	`begin: function ()`
`@@ -184,7 +184,7 @@ Phaser.Renderer.WebGL.SpriteBatch.prototype = {`
`184`	`184`	`{`
`185`	`185`	`this.flush();`
`186`	`186`	`gl.activeTexture(gl.TEXTURE0 + baseTexture.textureIndex);`
`187`		`- gl.bindTexture(gl.TEXTURE_2D, baseTexture._glTextures[gl.id]);`
	`187`	`+ gl.bindTexture(gl.TEXTURE_2D, baseTexture._glTextures);`
`188`	`188`	`this.renderer.textureArray[baseTexture.textureIndex] = baseTexture;`
`189`	`189`	`}`
`190`	`190`
`@@ -334,7 +334,7 @@ Phaser.Renderer.WebGL.SpriteBatch.prototype = {`
`334`	`334`	`{`
`335`	`335`	`this.dirty = false;`
`336`	`336`
`337`		`- shader = this.defaultShader.shaders[gl.id];`
	`337`	`+ shader = this.defaultShader.shaders;`
`338`	`338`
`339`	`339`	`// bind the main texture`
`340`	`340`	`gl.activeTexture(gl.TEXTURE0);`
`@@ -423,7 +423,7 @@ Phaser.Renderer.WebGL.SpriteBatch.prototype = {`
`423`	`423`	`{`
`424`	`424`	`currentShader = nextShader;`
`425`	`425`
`426`		`- shader = currentShader.shaders[gl.id];`
	`426`	`+ shader = currentShader.shaders;`
`427`	`427`
`428`	`428`	`if (!shader)`
`429`	`429`	`{`
`@@ -433,7 +433,7 @@ Phaser.Renderer.WebGL.SpriteBatch.prototype = {`
`433`	`433`	`shader.uniforms = currentShader.uniforms;`
`434`	`434`	`shader.init();`
`435`	`435`
`436`		`- currentShader.shaders[gl.id] = shader;`
	`436`	`+ currentShader.shaders = shader;`
`437`	`437`	`}`
`438`	`438`
`439`	`439`	`this.renderer.shaderManager.setShader(shader);`
`@@ -474,7 +474,7 @@ Phaser.Renderer.WebGL.SpriteBatch.prototype = {`
`474`	`474`	`var gl = this.gl;`
`475`	`475`
`476`	`476`	`// check if a texture is dirty..`
`477`		`- if (texture._dirty[gl.id])`
	`477`	`+ if (texture._dirty)`
`478`	`478`	`{`
`479`	`479`	`if (!this.renderer.updateTexture(texture))`
`480`	`480`	`{`
Original file line number	Diff line number	Diff line change
`@@ -182,8 +182,6 @@ Phaser.Renderer.WebGL.prototype = {`
`182`	`182`	`}`
`183`	`183`	`}`
`184`	`184`
`185`		`- this.gl.id = 0;`
`186`		`-`
`187`	`185`	`var gl = this.gl;`
`188`	`186`
`189`	`187`	`this.maxTextures = gl.getParameter(gl.MAX_TEXTURE_IMAGE_UNITS);`
`@@ -406,14 +404,14 @@ Phaser.Renderer.WebGL.prototype = {`
`406`	`404`
`407`	`405`	`var gl = this.gl;`
`408`	`406`
`409`		`- if (!texture._glTextures[gl.id])`
	`407`	`+ if (!texture._glTextures)`
`410`	`408`	`{`
`411`		`- texture._glTextures[gl.id] = gl.createTexture();`
	`409`	`+ texture._glTextures = gl.createTexture();`
`412`	`410`	`}`
`413`	`411`
`414`	`412`	`gl.activeTexture(gl.TEXTURE0 + texture.textureIndex);`
`415`	`413`
`416`		`- gl.bindTexture(gl.TEXTURE_2D, texture._glTextures[gl.id]);`
	`414`	`+ gl.bindTexture(gl.TEXTURE_2D, texture._glTextures);`
`417`	`415`
`418`	`416`	`gl.pixelStorei(gl.UNPACK_PREMULTIPLY_ALPHA_WEBGL, texture.premultipliedAlpha);`
`419`	`417`
`@@ -442,7 +440,7 @@ Phaser.Renderer.WebGL.prototype = {`
`442`	`440`	`gl.texParameteri(gl.TEXTURE_2D, gl.TEXTURE_WRAP_T, gl.REPEAT);`
`443`	`441`	`}`
`444`	`442`
`445`		`- texture._dirty[gl.id] = false;`
	`443`	`+ texture._dirty = false;`
`446`	`444`
`447`	`445`	`return true;`
`448`	`446`	`},`
`@@ -457,14 +455,14 @@ Phaser.Renderer.WebGL.prototype = {`
`457`	`455`	`var gl = this.gl;`
`458`	`456`	`var textureMetaData = texture.source;`
`459`	`457`
`460`		`- if (!texture._glTextures[gl.id])`
	`458`	`+ if (!texture._glTextures)`
`461`	`459`	`{`
`462`		`- texture._glTextures[gl.id] = gl.createTexture();`
	`460`	`+ texture._glTextures = gl.createTexture();`
`463`	`461`	`}`
`464`	`462`
`465`	`463`	`gl.activeTexture(gl.TEXTURE0 + texture.textureIndex);`
`466`	`464`
`467`		`- gl.bindTexture(gl.TEXTURE_2D, texture._glTextures[gl.id]);`
	`465`	`+ gl.bindTexture(gl.TEXTURE_2D, texture._glTextures);`
`468`	`466`
`469`	`467`	`gl.compressedTexImage2D(`
`470`	`468`	`gl.TEXTURE_2D,`
`@@ -499,7 +497,7 @@ Phaser.Renderer.WebGL.prototype = {`
`499`	`497`	`gl.texParameteri(gl.TEXTURE_2D, gl.TEXTURE_WRAP_T, gl.REPEAT);`
`500`	`498`	`}`
`501`	`499`
`502`		`- texture._dirty[gl.id] = false;`
	`500`	`+ texture._dirty = false;`
`503`	`501`
`504`	`502`	`return true;`
`505`	`503`	`},`
`@@ -536,22 +534,22 @@ Phaser.Renderer.WebGL.prototype = {`
`536`	`534`	`// PIXI.WebGLGraphics.updateGraphics(maskData, gl);`
`537`	`535`	`}`
`538`	`536`
`539`		`- if (maskData._webGL[gl.id] === undefined \|\| maskData._webGL[gl.id].data === undefined \|\| maskData._webGL[gl.id].data.length === 0)`
	`537`	`+ if (maskData._webGL === undefined \|\| maskData._webGL.data === undefined \|\| maskData._webGL.data.length === 0)`
`540`	`538`	`{`
`541`	`539`	`return;`
`542`	`540`	`}`
`543`	`541`
`544`		`- this.stencilManager.pushStencil(maskData, maskData._webGL[gl.id].data[0]);`
	`542`	`+ this.stencilManager.pushStencil(maskData, maskData._webGL.data[0]);`
`545`	`543`	`},`
`546`	`544`
`547`	`545`	`popMask: function (maskData)`
`548`	`546`	`{`
`549`		`- if (maskData._webGL[gl.id] === undefined \|\| maskData._webGL[gl.id].data === undefined \|\| maskData._webGL[gl.id].data.length === 0)`
	`547`	`+ if (maskData._webGL === undefined \|\| maskData._webGL.data === undefined \|\| maskData._webGL.data.length === 0)`
`550`	`548`	`{`
`551`	`549`	`return;`
`552`	`550`	`}`
`553`	`551`
`554`		`- this.stencilManager.popStencil(maskData, maskData._webGL[gl.id].data[0]);`
	`552`	`+ this.stencilManager.popStencil(maskData, maskData._webGL.data[0]);`
`555`	`553`	`},`
`556`	`554`
`557`	`555`	`// Shader Utils`
Original file line number	Diff line number	Diff line change
`@@ -264,7 +264,7 @@ Phaser.Renderer.WebGL.Shaders.Sprite.prototype = {`
`264`	`264`
`265`	`265`	`// No need to do string manipulation for this.`
`266`	`266`	`gl.activeTexture(gl.TEXTURE0 + this.textureCount);`
`267`		`- gl.bindTexture(gl.TEXTURE_2D, uniform.value.baseTexture._glTextures[gl.id]);`
	`267`	`+ gl.bindTexture(gl.TEXTURE_2D, uniform.value.baseTexture._glTextures);`
`268`	`268`
`269`	`269`	`// Extended texture data`
`270`	`270`	`if (uniform.textureData)`
`@@ -368,17 +368,17 @@ Phaser.Renderer.WebGL.Shaders.Sprite.prototype = {`
`368`	`368`	`{`
`369`	`369`	`gl.activeTexture(gl['TEXTURE' + this.textureCount]);`
`370`	`370`
`371`		`- if(uniform.value.baseTexture._dirty[gl.id])`
	`371`	`+ if(uniform.value.baseTexture._dirty)`
`372`	`372`	`{`
`373`		`- PIXI.instances[gl.id].updateTexture(uniform.value.baseTexture);`
	`373`	`+ PIXI.instances.updateTexture(uniform.value.baseTexture);`
`374`	`374`	`}`
`375`	`375`	`else`
`376`	`376`	`{`
`377`	`377`	`// bind the current texture`
`378`		`- gl.bindTexture(gl.TEXTURE_2D, uniform.value.baseTexture._glTextures[gl.id]);`
	`378`	`+ gl.bindTexture(gl.TEXTURE_2D, uniform.value.baseTexture._glTextures);`
`379`	`379`	`}`
`380`	`380`
`381`		`- // gl.bindTexture(gl.TEXTURE_2D, uniform.value.baseTexture._glTextures[gl.id] \|\| PIXI.createWebGLTexture( uniform.value.baseTexture, gl));`
	`381`	`+ // gl.bindTexture(gl.TEXTURE_2D, uniform.value.baseTexture._glTextures \|\| PIXI.createWebGLTexture( uniform.value.baseTexture, gl));`
`382`	`382`	`gl.uniform1i(uniform.uniformLocation, this.textureCount);`
`383`	`383`	`this.textureCount++;`
`384`	`384`	`}`