diff options
| -rw-r--r-- | toolkit/content/aboutSupport.js | 6 | ||||
| -rw-r--r-- | toolkit/locales/en-US/chrome/global/aboutSupport.properties | 18 | ||||
| -rw-r--r-- | toolkit/modules/Troubleshoot.jsm | 4 | ||||
| -rw-r--r-- | toolkit/modules/tests/browser/browser_Troubleshoot.js | 6 |
4 files changed, 23 insertions, 11 deletions
diff --git a/toolkit/content/aboutSupport.js b/toolkit/content/aboutSupport.js index 1d17be3912..b1d7ab5f64 100644 --- a/toolkit/content/aboutSupport.js +++ b/toolkit/content/aboutSupport.js @@ -309,14 +309,16 @@ var snapshotFormatters = { apzInfo.length ? apzInfo.join("; ") : localizedMsg(["apzNone"])); + addRowFromKey("features", "webgl1WSIInfo"); addRowFromKey("features", "webgl1Renderer"); addRowFromKey("features", "webgl1Version"); + addRowFromKey("features", "webgl1DriverExtensions"); addRowFromKey("features", "webgl1Extensions"); - addRowFromKey("features", "webgl1WSIInfo"); + addRowFromKey("features", "webgl2WSIInfo"); addRowFromKey("features", "webgl2Renderer"); addRowFromKey("features", "webgl2Version"); + addRowFromKey("features", "webgl2DriverExtensions"); addRowFromKey("features", "webgl2Extensions"); - addRowFromKey("features", "webgl2WSIInfo"); addRowFromKey("features", "supportsHardwareH264", "hardwareH264"); addRowFromKey("features", "currentAudioBackend", "audioBackend"); addRowFromKey("features", "direct2DEnabled", "#Direct2D"); diff --git a/toolkit/locales/en-US/chrome/global/aboutSupport.properties b/toolkit/locales/en-US/chrome/global/aboutSupport.properties index 115d91ca15..564292e3d9 100644 --- a/toolkit/locales/en-US/chrome/global/aboutSupport.properties +++ b/toolkit/locales/en-US/chrome/global/aboutSupport.properties @@ -71,14 +71,16 @@ gpuRAM = RAM gpuDriverVersion = Driver Version gpuDriverDate = Driver Date gpuActive = Active -webgl1Renderer = WebGL 1 Renderer -webgl1Version = WebGL 1 GL Version -webgl1Extensions = WebGL 1 GL Extensions -webgl1WSIInfo = WebGL 1 WSI Info -webgl2Renderer = WebGL 2 Renderer -webgl2Version = WebGL 2 GL Version -webgl2Extensions = WebGL 2 GL Extensions -webgl2WSIInfo = WebGL 2 WSI Info +webgl1WSIInfo = WebGL 1 Driver WSI Info +webgl1Renderer = WebGL 1 Driver Renderer +webgl1Version = WebGL 1 Driver Version +webgl1DriverExtensions = WebGL 1 Driver Extensions +webgl1Extensions = WebGL 1 Extensions +webgl2WSIInfo = WebGL 2 Driver WSI Info +webgl2Renderer = WebGL 2 Driver Renderer +webgl2Version = WebGL 2 Driver Version +webgl2DriverExtensions = WebGL 2 Driver Extensions +webgl2Extensions = WebGL 2 Extensions GPU1 = GPU #1 GPU2 = GPU #2 blocklistedBug = Blocklisted due to known issues diff --git a/toolkit/modules/Troubleshoot.jsm b/toolkit/modules/Troubleshoot.jsm index 65342b6239..8d84eec8c3 100644 --- a/toolkit/modules/Troubleshoot.jsm +++ b/toolkit/modules/Troubleshoot.jsm @@ -422,6 +422,7 @@ var dataProviders = { function GetWebGLInfo(data, keyPrefix, contextType) { data[keyPrefix + "Renderer"] = "-"; data[keyPrefix + "Version"] = "-"; + data[keyPrefix + "DriverExtensions"] = "-"; data[keyPrefix + "Extensions"] = "-"; data[keyPrefix + "WSIInfo"] = "-"; @@ -456,6 +457,7 @@ var dataProviders = { return; } + data[keyPrefix + "Extensions"] = gl.getSupportedExtensions().join(" "); let ext = gl.getExtension("MOZ_debug_get"); // This extension is unconditionally available to chrome. No need to check. @@ -464,7 +466,7 @@ var dataProviders = { data[keyPrefix + "Renderer"] = vendor + " -- " + renderer; data[keyPrefix + "Version"] = ext.getParameter(gl.VERSION); - data[keyPrefix + "Extensions"] = ext.getParameter(ext.EXTENSIONS); + data[keyPrefix + "DriverExtensions"] = ext.getParameter(ext.EXTENSIONS); data[keyPrefix + "WSIInfo"] = ext.getParameter(ext.WSI_INFO); diff --git a/toolkit/modules/tests/browser/browser_Troubleshoot.js b/toolkit/modules/tests/browser/browser_Troubleshoot.js index e449e99a33..4124be1fb3 100644 --- a/toolkit/modules/tests/browser/browser_Troubleshoot.js +++ b/toolkit/modules/tests/browser/browser_Troubleshoot.js @@ -304,6 +304,9 @@ const SNAPSHOT_SCHEMA = { webgl1Version: { type: "string", }, + webgl1DriverExtensions: { + type: "string", + }, webgl1Extensions: { type: "string", }, @@ -316,6 +319,9 @@ const SNAPSHOT_SCHEMA = { webgl2Version: { type: "string", }, + webgl2DriverExtensions: { + type: "string", + }, webgl2Extensions: { type: "string", }, |