From 2b6a3aacef78290d452028e2c60293decdb42d85 Mon Sep 17 00:00:00 2001 From: Frederic Junod Date: Fri, 9 Feb 2018 09:17:40 +0100 Subject: [PATCH] Don't create useless temporary variables --- src/ol/render/webgl/CircleReplay.js | 4 +--- src/ol/render/webgl/LineStringReplay.js | 4 +--- src/ol/render/webgl/PolygonReplay.js | 4 +--- src/ol/render/webgl/TextureReplay.js | 4 +--- src/ol/renderer/webgl/Layer.js | 5 +---- 5 files changed, 5 insertions(+), 16 deletions(-) diff --git a/src/ol/render/webgl/CircleReplay.js b/src/ol/render/webgl/CircleReplay.js index f904b24d99..3da343af9a 100644 --- a/src/ol/render/webgl/CircleReplay.js +++ b/src/ol/render/webgl/CircleReplay.js @@ -196,9 +196,7 @@ WebGLCircleReplay.prototype.getDeleteResourcesFunction = function(context) { */ WebGLCircleReplay.prototype.setUpProgram = function(gl, context, size, pixelRatio) { // get the program - const fragmentShader = fragment; - const vertexShader = vertex; - const program = context.getProgram(fragmentShader, vertexShader); + const program = context.getProgram(fragment, vertex); // get the locations let locations; diff --git a/src/ol/render/webgl/LineStringReplay.js b/src/ol/render/webgl/LineStringReplay.js index 9adcefc91a..1e0eb18d7f 100644 --- a/src/ol/render/webgl/LineStringReplay.js +++ b/src/ol/render/webgl/LineStringReplay.js @@ -439,9 +439,7 @@ WebGLLineStringReplay.prototype.getDeleteResourcesFunction = function(context) { */ WebGLLineStringReplay.prototype.setUpProgram = function(gl, context, size, pixelRatio) { // get the program - const fragmentShader = fragment; - const vertexShader = vertex; - const program = context.getProgram(fragmentShader, vertexShader); + const program = context.getProgram(fragment, vertex); // get the locations let locations; diff --git a/src/ol/render/webgl/PolygonReplay.js b/src/ol/render/webgl/PolygonReplay.js index 89fd1b4859..75b9fc747a 100644 --- a/src/ol/render/webgl/PolygonReplay.js +++ b/src/ol/render/webgl/PolygonReplay.js @@ -873,9 +873,7 @@ WebGLPolygonReplay.prototype.getDeleteResourcesFunction = function(context) { */ WebGLPolygonReplay.prototype.setUpProgram = function(gl, context, size, pixelRatio) { // get the program - const fragmentShader = fragment; - const vertexShader = vertex; - const program = context.getProgram(fragmentShader, vertexShader); + const program = context.getProgram(fragment, vertex); // get the locations let locations; diff --git a/src/ol/render/webgl/TextureReplay.js b/src/ol/render/webgl/TextureReplay.js index 6ffc4a60a2..daa40fbe0c 100644 --- a/src/ol/render/webgl/TextureReplay.js +++ b/src/ol/render/webgl/TextureReplay.js @@ -271,9 +271,7 @@ WebGLTextureReplay.prototype.createTextures = function(textures, images, texture */ WebGLTextureReplay.prototype.setUpProgram = function(gl, context, size, pixelRatio) { // get the program - const fragmentShader = fragment; - const vertexShader = vertex; - const program = context.getProgram(fragmentShader, vertexShader); + const program = context.getProgram(fragment, vertex); // get the locations let locations; diff --git a/src/ol/renderer/webgl/Layer.js b/src/ol/renderer/webgl/Layer.js index 6dd9fca800..5a47472fc5 100644 --- a/src/ol/renderer/webgl/Layer.js +++ b/src/ol/renderer/webgl/Layer.js @@ -148,10 +148,7 @@ WebGLLayerRenderer.prototype.composeFrame = function(frameState, layerState, con const gl = context.getGL(); - const fragmentShader = fragment; - const vertexShader = vertex; - - const program = context.getProgram(fragmentShader, vertexShader); + const program = context.getProgram(fragment, vertex); let locations; if (!this.defaultLocations_) {