diff options
author | Jesus Fernandez <jesus.fernandez@qt.io> | 2017-10-31 14:19:29 +0100 |
---|---|---|
committer | Jesus Fernandez <Jesus.Fernandez@qt.io> | 2017-11-03 09:29:10 +0000 |
commit | c82c3103f3e875d7d5f79dc3c4b273e9644e4ded (patch) | |
tree | 424a71c03de9b26f2607a18f5bc9a437575c5e54 | |
parent | d087763dc2c35e19c972a1f04b888b313e8d2247 (diff) |
Improve JavaScript debug messagesv5.10.0-beta4
Tries to write the enumeration value for numbers if possible to improve
readability of the parameters.
Change-Id: I37163fb3b09be3de7280786ddbc2fd42dfef8750
Reviewed-by: Michael Winkelmann <michael.winkelmann@qt.io>
Reviewed-by: MÃ¥rten Nordheim <marten.nordheim@qt.io>
Reviewed-by: Edward Welbourne <edward.welbourne@qt.io>
-rw-r--r-- | src/plugins/platforms/webgl/webqt.jsx | 29 |
1 files changed, 25 insertions, 4 deletions
diff --git a/src/plugins/platforms/webgl/webqt.jsx b/src/plugins/platforms/webgl/webqt.jsx index 816621b..cea2da0 100644 --- a/src/plugins/platforms/webgl/webqt.jsx +++ b/src/plugins/platforms/webgl/webqt.jsx @@ -920,8 +920,19 @@ window.onload = function () { console.log("executing " + d.glCommands.length + " commands"); while (d.glCommands.length) { var obj = d.glCommands.shift(); - if (DEBUG) - console.log("Calling: gl." + obj.function, obj.parameters); + if (DEBUG) { + var parameters = []; + for (var key in obj.parameters) { + if (typeof obj.parameters[key] === 'number' && + d.glConstants[obj.parameters[key]] !== undefined) { + parameters[key] = d.glConstants[obj.parameters[key]] + ' (' + + obj.parameters[key] + ')'; + } else { + parameters[key] = obj.parameters[key]; + } + } + console.log("Calling: gl." + obj.function, parameters); + } var response = gl[obj.function].apply(gl, obj.parameters); if (response !== undefined) sendResponse(obj.id, response); @@ -1017,10 +1028,20 @@ window.onload = function () { gl = windowData[winId].gl; currentWindowId = winId; currentContext = obj.parameters[0]; - if (DEBUG) - console.log("Current context is now " + currentContext); if (currentContext) ensureContextData(currentContext); + if (DEBUG) { + console.log("Current context is now " + currentContext); + var d = contextData[currentContext]; + if (d.glConstants === undefined) { + d.glConstants = {}; + for (var key in gl) { + if (typeof gl[key] === 'number') { + d.glConstants[gl[key]] = 'gl.' + key; + } + } + } + } } } else if (obj.function === "swapBuffers") { var data = windowData[currentWindowId]; |