From 531d35f9459b52010aa054ace55a09813bb4c696 Mon Sep 17 00:00:00 2001 From: Andrey Lushnikov Date: Tue, 1 Jun 2021 13:55:58 -0700 Subject: [PATCH] browser(chromium): revert swiftshader fixes (#6824) References #6818, references #6390 --- browser_patches/chromium/BUILD_NUMBER | 2 +- browser_patches/chromium/archive.sh | 2 -- browser_patches/chromium/fix_windows_swiftshader.js | 13 ------------- 3 files changed, 1 insertion(+), 16 deletions(-) delete mode 100644 browser_patches/chromium/fix_windows_swiftshader.js diff --git a/browser_patches/chromium/BUILD_NUMBER b/browser_patches/chromium/BUILD_NUMBER index e467d4731f..734d013d6a 100644 --- a/browser_patches/chromium/BUILD_NUMBER +++ b/browser_patches/chromium/BUILD_NUMBER @@ -1 +1 @@ -885250 +888113 diff --git a/browser_patches/chromium/archive.sh b/browser_patches/chromium/archive.sh index 1f3fccdaf4..bc858ba05e 100755 --- a/browser_patches/chromium/archive.sh +++ b/browser_patches/chromium/archive.sh @@ -92,8 +92,6 @@ function archive_compiled_chromium() { if [[ $1 == "--compile-win"* ]]; then $COPY_COMMAND "${CR_CHECKOUT_PATH}/src/out/Default/"*.manifest "output/${CHROMIUM_FOLDER_NAME}/" - # See https://github.com/microsoft/playwright/issues/6390 - node "${SCRIPT_PATH}/fix_windows_swiftshader.js" "output/${CHROMIUM_FOLDER_NAME}/vk_swiftshader_icd.json" fi cd output diff --git a/browser_patches/chromium/fix_windows_swiftshader.js b/browser_patches/chromium/fix_windows_swiftshader.js deleted file mode 100644 index b2e8d85d89..0000000000 --- a/browser_patches/chromium/fix_windows_swiftshader.js +++ /dev/null @@ -1,13 +0,0 @@ -// See https://github.com/microsoft/playwright/issues/6390 -const fs = require('fs'); - -const FILE_PATH = process.argv[2]; -if (!fs.existsSync(FILE_PATH) || !FILE_PATH.endsWith('.json')) - return; - -const json = JSON.parse(fs.readFileSync(FILE_PATH, 'utf8')); - -if (json.ICD && json.ICD.library_path && json.ICD.library_path.startsWith('.\\')) { - json.ICD.library_path = json.ICD.library_path.substring(2); - fs.writeFileSync(FILE_PATH, JSON.stringify(json), 'utf8'); -}