From 8cb28a721756309ffa3b7f2111573dcf1d6b6bd7 Mon Sep 17 00:00:00 2001 From: Tom Payne Date: Wed, 17 Oct 2012 17:25:32 +0200 Subject: [PATCH] Move WebGL support test into ol.webgl --- src/ol/renderer/webgl/webgl.js | 14 +++----------- src/ol/webgl/webgl.js | 16 ++++++++++++++++ 2 files changed, 19 insertions(+), 11 deletions(-) diff --git a/src/ol/renderer/webgl/webgl.js b/src/ol/renderer/webgl/webgl.js index d7a0629ac2..c8eae9c377 100644 --- a/src/ol/renderer/webgl/webgl.js +++ b/src/ol/renderer/webgl/webgl.js @@ -1,5 +1,7 @@ goog.provide('ol.renderer.webgl'); +goog.require('ol.webgl'); + /** * @define {boolean} Free resources immediately. @@ -10,14 +12,4 @@ ol.renderer.webgl.FREE_RESOURCES_IMMEDIATELY = false; /** * @return {boolean} Is supported. */ -ol.renderer.webgl.isSupported = function() { - if (!('WebGLRenderingContext' in goog.global)) { - return false; - } - try { - var canvas = goog.dom.createElement(goog.dom.TagName.CANVAS); - return !goog.isNull(canvas.getContext('experimental-webgl')); - } catch (e) { - return false; - } -}; +ol.renderer.webgl.isSupported = ol.webgl.isSupported; diff --git a/src/ol/webgl/webgl.js b/src/ol/webgl/webgl.js index 1711a64742..c7084a6299 100644 --- a/src/ol/webgl/webgl.js +++ b/src/ol/webgl/webgl.js @@ -19,3 +19,19 @@ ol.webgl.WebGLContextEventType = { ol.webgl.getContext = function(canvas, opt_attributes) { return canvas.getContext('experimental-webgl', opt_attributes); }; + + +/** + * @return {boolean} Is supported. + */ +ol.webgl.isSupported = function() { + if (!('WebGLRenderingContext' in goog.global)) { + return false; + } + try { + var canvas = goog.dom.createElement(goog.dom.TagName.CANVAS); + return !goog.isNull(canvas.getContext('experimental-webgl')); + } catch (e) { + return false; + } +};