From cfa29b0022bcb08eb535e89af99260c05e536953 Mon Sep 17 00:00:00 2001 From: Tom Payne Date: Sat, 27 Apr 2013 21:02:19 +0200 Subject: [PATCH 1/3] Strip debug classes when compiling --- buildcfg/base.json | 45 ++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 44 insertions(+), 1 deletion(-) diff --git a/buildcfg/base.json b/buildcfg/base.json index f6c8eee60f..10924bb5e8 100644 --- a/buildcfg/base.json +++ b/buildcfg/base.json @@ -50,11 +50,54 @@ "mode": "ADVANCED", + "name-suffixes-to-strip": [ + "logger", + "logger_" + ], + "paths": [ "../build/src/internal/src", "../src" ], - "treat-warnings-as-errors": false + "treat-warnings-as-errors": false, + + "type-prefixes-to-strip": [ + "goog.asserts", + "goog.debug.Console", + "goog.debug.DebugWindow", + "goog.debug.DevCss", + "goog.debug.DivConsole", + "goog.debug.EntryPointMonitor", + "goog.debug.ErrorHandler", + "goog.debug.ErrorReporter", + "goog.debug.FancyWindow", + "goog.debug.Formatter", + "goog.debug.FpsDisplay", + "goog.debug.GcDiagnostics", + "goog.debug.HtmlFormatter", + "goog.debug.LogBuffer", + "goog.debug.LogManager", + "goog.debug.LogRecord", + "goog.debug.Logger", + "goog.debug.RelativeTimeProvider", + "goog.debug.TextFormatter", + "goog.debug.Trace", + "goog.debug.catchErrors", + "goog.debug.deepExpose", + "goog.debug.enhanceError", + "goog.debug.entryPointRegistry", + "goog.debug.errorHandlerWeakDep", + "goog.debug.expose", + "goog.debug.exposeArray", + "goog.debug.exposeException", + "goog.debug.getFunctionName", + "goog.debug.getStacktrace", + "goog.debug.getStacktraceSimple", + "goog.debug.logRecordSerializer", + "goog.debug.makeWhitespaceVisible", + "goog.debug.normalizeErrorObject", + "goog.debug.reflect" + ] } From 37ef03c9569e33fef9a2137810e9a1f907e2f281 Mon Sep 17 00:00:00 2001 From: Tom Payne Date: Mon, 29 Apr 2013 12:50:37 +0200 Subject: [PATCH 2/3] Re-enable logging --- src/ol/map.js | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/src/ol/map.js b/src/ol/map.js index 1f8d2ac87c..616ed73c0c 100644 --- a/src/ol/map.js +++ b/src/ol/map.js @@ -12,6 +12,9 @@ goog.require('goog.array'); goog.require('goog.asserts'); goog.require('goog.async.AnimationDelay'); goog.require('goog.async.Delay'); +goog.require('goog.debug.Console'); +goog.require('goog.debug.Logger'); +goog.require('goog.debug.Logger.Level'); goog.require('goog.dispose'); goog.require('goog.dom'); goog.require('goog.dom.TagName'); @@ -1063,3 +1066,12 @@ ol.RendererHints.createFromQueryData = function(opt_queryData) { ol.projection.addCommonProjections(); + + +if (goog.DEBUG) { + (function() { + goog.debug.Console.autoInstall(); + var logger = goog.debug.Logger.getLogger('ol'); + logger.setLevel(goog.debug.Logger.Level.FINEST); + })(); +} From 1ff8df893661b8c97fc770a2c08bc810a2faf1e6 Mon Sep 17 00:00:00 2001 From: Tom Payne Date: Mon, 29 Apr 2013 12:51:16 +0200 Subject: [PATCH 3/3] Log WebGL shader and program errors --- src/ol/renderer/webgl/webglmaprenderer.js | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/src/ol/renderer/webgl/webglmaprenderer.js b/src/ol/renderer/webgl/webglmaprenderer.js index de3c1ffde4..9c471d2e09 100644 --- a/src/ol/renderer/webgl/webglmaprenderer.js +++ b/src/ol/renderer/webgl/webglmaprenderer.js @@ -4,6 +4,7 @@ goog.provide('ol.renderer.webgl.Map'); goog.require('goog.array'); goog.require('goog.asserts'); +goog.require('goog.debug.Logger'); goog.require('goog.dom'); goog.require('goog.dom.TagName'); goog.require('goog.events'); @@ -410,6 +411,12 @@ ol.renderer.webgl.Map.prototype.getProgram = function( gl.attachShader(program, this.getShader(fragmentShaderObject)); gl.attachShader(program, this.getShader(vertexShaderObject)); gl.linkProgram(program); + if (goog.DEBUG) { + if (!gl.getProgramParameter(program, goog.webgl.LINK_STATUS) && + !gl.isContextLost()) { + this.logger_.severe(gl.getProgramInfoLog(program)); + } + } goog.asserts.assert( gl.getProgramParameter(program, goog.webgl.LINK_STATUS) || gl.isContextLost()); @@ -432,6 +439,12 @@ ol.renderer.webgl.Map.prototype.getShader = function(shaderObject) { var shader = gl.createShader(shaderObject.getType()); gl.shaderSource(shader, shaderObject.getSource()); gl.compileShader(shader); + if (goog.DEBUG) { + if (!gl.getShaderParameter(shader, goog.webgl.COMPILE_STATUS) && + !gl.isContextLost()) { + this.logger_.severe(gl.getShaderInfoLog(shader)); + } + } goog.asserts.assert( gl.getShaderParameter(shader, goog.webgl.COMPILE_STATUS) || gl.isContextLost()); @@ -501,6 +514,14 @@ ol.renderer.webgl.Map.prototype.isTileTextureLoaded = function(tile) { }; +/** + * @private + * @type {goog.debug.Logger} + */ +ol.renderer.webgl.Map.prototype.logger_ = + goog.debug.Logger.getLogger('ol.renderer.webgl.Map'); + + /** * @inheritDoc */