From 17394cc8be06bf36f2ebd33ce6946697ce087fe1 Mon Sep 17 00:00:00 2001 From: Duck Date: Wed, 15 Sep 2021 09:18:48 -0700 Subject: [PATCH] Ensure the texture is loaded into the correct index. The previous code would try to load subsequent textures into the 0th slot. --- src/ol/renderer/webgl/TileLayer.js | 5 ++++- src/ol/webgl/Helper.js | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/src/ol/renderer/webgl/TileLayer.js b/src/ol/renderer/webgl/TileLayer.js index 0540d0a69f..3565df7117 100644 --- a/src/ol/renderer/webgl/TileLayer.js +++ b/src/ol/renderer/webgl/TileLayer.js @@ -426,7 +426,10 @@ class WebGLTileLayerRenderer extends WebGLLayerRenderer { const uniformName = Uniforms.TILE_TEXTURE_PREFIX + textureIndex; gl.activeTexture(gl[textureProperty]); gl.bindTexture(gl.TEXTURE_2D, tileTexture.textures[textureIndex]); - gl.uniform1i(this.helper.getUniformLocation(uniformName), 0); + gl.uniform1i( + this.helper.getUniformLocation(uniformName), + textureIndex + ); } const alpha = diff --git a/src/ol/webgl/Helper.js b/src/ol/webgl/Helper.js index fc580eb086..9fdb5e0573 100644 --- a/src/ol/webgl/Helper.js +++ b/src/ol/webgl/Helper.js @@ -284,7 +284,7 @@ class WebGLHelper extends Disposable { gl.getExtension('OES_element_index_uint'); gl.getExtension('OES_texture_float'); - gl.getExtension("OES_texture_float_linear"); + gl.getExtension('OES_texture_float_linear'); this.canvas_.addEventListener( ContextEventType.LOST,