From 9ee42d3a1054eef09ecb88d8a790e141ddf6d980 Mon Sep 17 00:00:00 2001 From: imoc Date: Sat, 23 Dec 2023 18:15:18 +0800 Subject: [PATCH 1/7] Fix lib path and LLVM --- flatpak/amd_run.sh | 3 +++ flatpak/intel_run.sh | 3 +++ flatpak/io.github.unknownskl.greenlight.yml | 8 ++++++-- 3 files changed, 12 insertions(+), 2 deletions(-) create mode 100644 flatpak/amd_run.sh create mode 100644 flatpak/intel_run.sh diff --git a/flatpak/amd_run.sh b/flatpak/amd_run.sh new file mode 100644 index 00000000..35063fba --- /dev/null +++ b/flatpak/amd_run.sh @@ -0,0 +1,3 @@ +#!/bin/bash +cd /usr/bin +/usr/bin/flatpak run dev.unknownskl.greenlight --use-vulkan --use-angle=vulkan --enable-features=Vulkan,VulkanFromANGLE,DefaultANGLEVulkan,VaapiIgnoreDriverChecks,VaapiVideoDecoder,PlatformHEVCDecoderSupport,CanvasOopRasterization --enable-oop-rasterization --disable-features=UseChromeOSDirectVideoDecoder --enable-accelerated-video-decode --ozone-platform-hint=x11 --gtk-version=4 --no-sandbox diff --git a/flatpak/intel_run.sh b/flatpak/intel_run.sh new file mode 100644 index 00000000..9c3c1492 --- /dev/null +++ b/flatpak/intel_run.sh @@ -0,0 +1,3 @@ +#!/bin/bash +cd /usr/bin +/usr/bin/flatpak run dev.unknownskl.greenlight --enable-features=CanvasOopRasterization,VaapiVideoDecoder,VaapiVideoDecodeLinuxGL,VaapiIgnoreDriverChecks,PlatformHEVCDecoderSupport --use-cmd-decoder=passthrough --ignore-gpu-blocklist --enable-zero-copy --enable-gpu-rasterization --enable-native-gpu-memory-buffers --enable-gpu-memory-buffer-video-frames --disable-features=UseChromeOSDirectVideoDecoder --no-sandbox --use-vulkan diff --git a/flatpak/io.github.unknownskl.greenlight.yml b/flatpak/io.github.unknownskl.greenlight.yml index a2a30420..fccb4ece 100644 --- a/flatpak/io.github.unknownskl.greenlight.yml +++ b/flatpak/io.github.unknownskl.greenlight.yml @@ -30,7 +30,11 @@ modules: npm_config_offline: 'true' yarn_config_cache: /run/build/greenlight/flatpak-node/yarn-mirror build-commands: - - cp -a ../extralib -t /app/ + - cp -a ../extralib/extralib -t /app/ + - cp -a ../extralib/reduceSoFiles.sh -t /app/extralib + - gunzip /app/extralib/libLLVM-16.0.6.so.gz + - ln -s /app/extralib/libLLVM-16.0.6.so /app/extralib/libLLVM-16.so + - pushd /app/extralib && chmod +x reduceSoFiles.sh && ./reduceSoFiles.sh && popd - yarn --offline - yarn run flatpak-build --offline -- --linux # Add icon, metadata and desktop file @@ -55,7 +59,7 @@ modules: - type: git url: https://github.com/Originalimoc/amd-patched-mesa dest: extralib - commit: "dd468982c84d77b1679a45f082af102b665dfd26" + commit: "a70058baf35f1823613f2577c30a477e93cd106a" - yarn-sources.json - type: inline dest-filename: .yarnrc From 9fdd2b743f04f3d771f9e07c50edc793259fa170 Mon Sep 17 00:00:00 2001 From: imoc Date: Sat, 23 Dec 2023 18:18:30 +0800 Subject: [PATCH 2/7] new package id in build script --- flatpak/build_bundle_manually.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/flatpak/build_bundle_manually.sh b/flatpak/build_bundle_manually.sh index 3b0e308c..14c20104 100644 --- a/flatpak/build_bundle_manually.sh +++ b/flatpak/build_bundle_manually.sh @@ -13,8 +13,8 @@ export PATH=${PATH}:${HOME}/.local/bin cd .. flatpak-node-generator yarn ../yarn.lock -o ./yarn-sources.json -flatpak-builder --force-clean build-dir ./dev.unknownskl.greenlight.yml +flatpak-builder --force-clean build-dir ./io.github.unknownskl.greenlight.yml flatpak build-export export-dir build-dir -flatpak build-bundle export-dir Greenlight.flatpak dev.unknownskl.greenlight --runtime-repo=https://flathub.org/repo/flathub.flatpakrepo +flatpak build-bundle export-dir Greenlight.flatpak io.github.unknownskl.greenlight --runtime-repo=https://flathub.org/repo/flathub.flatpakrepo echo done From c59f5cbff4c1042465c0de702dcac0cb8537217b Mon Sep 17 00:00:00 2001 From: imoc Date: Sat, 23 Dec 2023 18:54:04 +0800 Subject: [PATCH 3/7] remove hardcode /app/extralib/libLLVM-16.0.6.so --- flatpak/io.github.unknownskl.greenlight.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/flatpak/io.github.unknownskl.greenlight.yml b/flatpak/io.github.unknownskl.greenlight.yml index fccb4ece..b565e434 100644 --- a/flatpak/io.github.unknownskl.greenlight.yml +++ b/flatpak/io.github.unknownskl.greenlight.yml @@ -33,8 +33,7 @@ modules: - cp -a ../extralib/extralib -t /app/ - cp -a ../extralib/reduceSoFiles.sh -t /app/extralib - gunzip /app/extralib/libLLVM-16.0.6.so.gz - - ln -s /app/extralib/libLLVM-16.0.6.so /app/extralib/libLLVM-16.so - - pushd /app/extralib && chmod +x reduceSoFiles.sh && ./reduceSoFiles.sh && popd + - pushd /app/extralib && ln -s libLLVM-16.0.6.so libLLVM-16.so && chmod +x reduceSoFiles.sh && ./reduceSoFiles.sh && popd - yarn --offline - yarn run flatpak-build --offline -- --linux # Add icon, metadata and desktop file From 4a56291de96c4aa0ba073ba53673580216dceb2a Mon Sep 17 00:00:00 2001 From: imoc Date: Sat, 23 Dec 2023 18:55:31 +0800 Subject: [PATCH 4/7] new package id run.sh --- flatpak/amd_run.sh | 2 +- flatpak/intel_run.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/flatpak/amd_run.sh b/flatpak/amd_run.sh index 35063fba..d04d72b3 100644 --- a/flatpak/amd_run.sh +++ b/flatpak/amd_run.sh @@ -1,3 +1,3 @@ #!/bin/bash cd /usr/bin -/usr/bin/flatpak run dev.unknownskl.greenlight --use-vulkan --use-angle=vulkan --enable-features=Vulkan,VulkanFromANGLE,DefaultANGLEVulkan,VaapiIgnoreDriverChecks,VaapiVideoDecoder,PlatformHEVCDecoderSupport,CanvasOopRasterization --enable-oop-rasterization --disable-features=UseChromeOSDirectVideoDecoder --enable-accelerated-video-decode --ozone-platform-hint=x11 --gtk-version=4 --no-sandbox +/usr/bin/flatpak run io.github.unknownskl.greenlight --use-vulkan --use-angle=vulkan --enable-features=Vulkan,VulkanFromANGLE,DefaultANGLEVulkan,VaapiIgnoreDriverChecks,VaapiVideoDecoder,PlatformHEVCDecoderSupport,CanvasOopRasterization --enable-oop-rasterization --disable-features=UseChromeOSDirectVideoDecoder --enable-accelerated-video-decode --ozone-platform-hint=x11 --gtk-version=4 --no-sandbox diff --git a/flatpak/intel_run.sh b/flatpak/intel_run.sh index 9c3c1492..19a18c9c 100644 --- a/flatpak/intel_run.sh +++ b/flatpak/intel_run.sh @@ -1,3 +1,3 @@ #!/bin/bash cd /usr/bin -/usr/bin/flatpak run dev.unknownskl.greenlight --enable-features=CanvasOopRasterization,VaapiVideoDecoder,VaapiVideoDecodeLinuxGL,VaapiIgnoreDriverChecks,PlatformHEVCDecoderSupport --use-cmd-decoder=passthrough --ignore-gpu-blocklist --enable-zero-copy --enable-gpu-rasterization --enable-native-gpu-memory-buffers --enable-gpu-memory-buffer-video-frames --disable-features=UseChromeOSDirectVideoDecoder --no-sandbox --use-vulkan +/usr/bin/flatpak run io.github.unknownskl.greenlight --enable-features=CanvasOopRasterization,VaapiVideoDecoder,VaapiVideoDecodeLinuxGL,VaapiIgnoreDriverChecks,PlatformHEVCDecoderSupport --use-cmd-decoder=passthrough --ignore-gpu-blocklist --enable-zero-copy --enable-gpu-rasterization --enable-native-gpu-memory-buffers --enable-gpu-memory-buffer-video-frames --disable-features=UseChromeOSDirectVideoDecoder --no-sandbox --use-vulkan From 24ae6ea9993ef9030b03ceb80b591f859d48e9bd Mon Sep 17 00:00:00 2001 From: Originalimoc Date: Sat, 23 Dec 2023 07:46:00 -0800 Subject: [PATCH 5/7] amd_run.sh use default GL Vulkan broken with update --- flatpak/amd_run.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/flatpak/amd_run.sh b/flatpak/amd_run.sh index d04d72b3..3bb8443b 100644 --- a/flatpak/amd_run.sh +++ b/flatpak/amd_run.sh @@ -1,3 +1,3 @@ #!/bin/bash cd /usr/bin -/usr/bin/flatpak run io.github.unknownskl.greenlight --use-vulkan --use-angle=vulkan --enable-features=Vulkan,VulkanFromANGLE,DefaultANGLEVulkan,VaapiIgnoreDriverChecks,VaapiVideoDecoder,PlatformHEVCDecoderSupport,CanvasOopRasterization --enable-oop-rasterization --disable-features=UseChromeOSDirectVideoDecoder --enable-accelerated-video-decode --ozone-platform-hint=x11 --gtk-version=4 --no-sandbox +/usr/bin/flatpak run io.github.unknownskl.greenlight --enable-features=VaapiIgnoreDriverChecks,VaapiVideoDecoder,PlatformHEVCDecoderSupport,CanvasOopRasterization --enable-oop-rasterization --disable-features=UseChromeOSDirectVideoDecoder --enable-accelerated-video-decode --ozone-platform-hint=x11 From 45087acb87424adb85cd116dd4b72b3604d18727 Mon Sep 17 00:00:00 2001 From: Originalimoc Date: Sat, 23 Dec 2023 07:48:54 -0800 Subject: [PATCH 6/7] GPU info window --- main/application.ts | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/main/application.ts b/main/application.ts index 0db38a45..c2c8ea47 100644 --- a/main/application.ts +++ b/main/application.ts @@ -29,6 +29,7 @@ export default class Application { private _isQuitting:boolean = false private _mainWindow + private _gpuWindow public _events:Events public _ipc:Ipc public _authentication:Authentication @@ -107,6 +108,19 @@ export default class Application { this.log('electron', __filename+'[loadApplicationDefaults()] Electron has been fully loaded. Ready to open windows') + /* for future debugging + this._gpuWindow = new BrowserWindow({ + width: 800, + height: 600, + }); + + // Load chrome://gpu + this._gpuWindow.loadURL('chrome://gpu'); + + // Open DevTools + this._gpuWindow.webContents.openDevTools(); + */ + this.openMainWindow() this._authentication.startWebviewHooks() From ee8dd53debce54a45d6e4616cfb827a832a2c18d Mon Sep 17 00:00:00 2001 From: imoc Date: Sun, 24 Dec 2023 00:11:47 +0800 Subject: [PATCH 7/7] electron regressin VDA decoder removed --- package.json | 2 +- yarn.lock | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package.json b/package.json index 2f0a7061..47edd110 100644 --- a/package.json +++ b/package.json @@ -44,7 +44,7 @@ "@typescript-eslint/eslint-plugin": "^6.10.0", "@typescript-eslint/parser": "^6.13.2", "babel-loader": "^9.1.3", - "electron": "27", + "electron": "25", "electron-builder": "^24.9.1", "eslint": "^8.54.0", "next": "^13.5.6", diff --git a/yarn.lock b/yarn.lock index ffc0bb3e..3ef4f275 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2757,10 +2757,10 @@ electron-to-chromium@^1.4.535: resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.4.554.tgz#04e09c2ee31dc0f1546174033809b54cc372740b" integrity sha512-Q0umzPJjfBrrj8unkONTgbKQXzXRrH7sVV7D9ea2yBV3Oaogz991yhbpfvo2LMNkJItmruXTEzVpP9cp7vaIiQ== -electron@27: - version "27.1.3" - resolved "https://registry.yarnpkg.com/electron/-/electron-27.1.3.tgz#3fd6decda95c1dd0a7e51a9ac77ee0ba37b7c5c6" - integrity sha512-7eD8VMhhlL5J531OOawn00eMthUkX1e3qN5Nqd7eMK8bg5HxQBrn8bdPlvUEnCano9KhrVwaDnGeuzWoDOGpjQ== +electron@25: + version "25.8.2" + resolved "https://registry.yarnpkg.com/electron/-/electron-25.8.2.tgz#5e8ea742b68a7d1427bf78902ec40a5b7231a58b" + integrity sha512-AM1ra6b16EQuO1bJtiA8ZiWqqFLLgVfxD56ykiy+EA5C63Hkx8OmIbe+5JAsLiTwRVvBZ4oCAj6wa2qT+iq8ww== dependencies: "@electron/get" "^2.0.0" "@types/node" "^18.11.18"