From f7f799be27142c74df6cd0265d8097d1fcd08141 Mon Sep 17 00:00:00 2001 From: Tom Payne Date: Mon, 8 Apr 2013 15:51:25 +0200 Subject: [PATCH] Use automatically generated locations in WebGL tile layer renderer --- src/ol/renderer/webgl/webgltilelayerrenderer.js | 17 +++-------------- 1 file changed, 3 insertions(+), 14 deletions(-) diff --git a/src/ol/renderer/webgl/webgltilelayerrenderer.js b/src/ol/renderer/webgl/webgltilelayerrenderer.js index 2b3b082b3f..231898c477 100644 --- a/src/ol/renderer/webgl/webgltilelayerrenderer.js +++ b/src/ol/renderer/webgl/webgltilelayerrenderer.js @@ -46,10 +46,7 @@ ol.renderer.webgl.TileLayer = function(mapRenderer, tileLayer) { /** * @private - * @type {{a_position: number, - * a_texCoord: number, - * u_tileOffset: WebGLUniformLocation, - * u_texture: WebGLUniformLocation}|null} + * @type {ol.renderer.webgl.tilelayer.shader.Locations} */ this.locations_ = null; @@ -175,16 +172,8 @@ ol.renderer.webgl.TileLayer.prototype.renderFrame = this.fragmentShader_, this.vertexShader_); gl.useProgram(program); if (goog.isNull(this.locations_)) { - this.locations_ = { - a_position: gl.getAttribLocation( - program, ol.renderer.webgl.tilelayer.shader.attribute.a_position), - a_texCoord: gl.getAttribLocation( - program, ol.renderer.webgl.tilelayer.shader.attribute.a_texCoord), - u_tileOffset: gl.getUniformLocation( - program, ol.renderer.webgl.tilelayer.shader.uniform.u_tileOffset), - u_texture: gl.getUniformLocation( - program, ol.renderer.webgl.tilelayer.shader.uniform.u_texture) - }; + this.locations_ = + new ol.renderer.webgl.tilelayer.shader.Locations(gl, program); } mapRenderer.bindBuffer(goog.webgl.ARRAY_BUFFER, this.arrayBuffer_);