From ad798ea2a8620cde3859c78e42430408a7b3572d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=B5=AE=E7=94=9F=E8=8B=A5=E6=A2=A6?= <1070753498@qq.com> Date: Wed, 27 Aug 2025 15:54:28 +0800 Subject: [PATCH 1/2] =?UTF-8?q?[=E6=9B=B4=E6=96=B0=E4=BE=9D=E8=B5=96?= =?UTF-8?q?=E9=A1=B9=E5=92=8C=E4=BF=AE=E5=A4=8D=E4=BB=A3=E7=A0=81=E9=97=AE?= =?UTF-8?q?=E9=A2=98]:=20=E4=B8=BB=E8=A6=81=E6=9B=B4=E6=96=B0=E4=BA=86Qt?= =?UTF-8?q?=E7=89=88=E6=9C=AC=E8=87=B36.9.2=EF=BC=8C=E5=8D=87=E7=BA=A7GitH?= =?UTF-8?q?ub=20Actions=20checkout=E7=89=88=E6=9C=AC=E8=87=B3v5=EF=BC=8C?= =?UTF-8?q?=E5=B9=B6=E4=BF=AE=E5=A4=8D=E4=BA=86OpenGL=E7=BA=B9=E7=90=86?= =?UTF-8?q?=E7=BB=91=E5=AE=9A=E5=92=8C=E5=BC=82=E6=AD=A5=E5=87=BD=E6=95=B0?= =?UTF-8?q?=E6=A8=A1=E6=9D=BF=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 更新Qt版本: 将默认Qt版本从6.9.0升级到6.9.2，涉及action.yml和cmake/qt.cmake文件 - 升级GitHub Actions: 将actions/checkout从v4升级到v5，涉及多个工作流文件 - 忽略dependabot分支: 在codeql.yml中添加branches-ignore规则，忽略dependabot分支 - 修复OpenGL纹理绑定: 在openglview.cc中添加纹理解绑操作，避免纹理状态泄漏 - 更新vcpkg基线: 将vcpkg.json中的builtin-baseline更新至最新提交 - 修复异步函数模板: 在utils.h中优化异步函数模板的空函数处理逻辑 - 更新qsb路径: 将PowerShell脚本中的qsb.exe路径更新至Qt 6.9.2版本 --- .github/actions/install-dependencies/action.yml | 2 +- .github/workflows/clean_cache.yml | 2 +- .github/workflows/cmake.yml | 2 +- .github/workflows/codeql.yml | 6 +++++- .github/workflows/qmake.yml | 2 +- .github/workflows/readme.yml | 2 +- .github/workflows/toolchain.yml | 2 +- cmake/qt.cmake | 4 ++-- src/gpugraphics/openglview.cc | 4 ++++ src/gpugraphics/shader/complie_qsb.ps1 | 2 +- src/utils/utils.h | 6 +++--- vcpkg.json | 2 +- 12 files changed, 22 insertions(+), 14 deletions(-) diff --git a/.github/actions/install-dependencies/action.yml b/.github/actions/install-dependencies/action.yml index a5eea33..b574b18 100644 --- a/.github/actions/install-dependencies/action.yml +++ b/.github/actions/install-dependencies/action.yml @@ -14,7 +14,7 @@ inputs: qt_ver: description: 'qt version' required: false - default: '6.9.0' + default: '6.9.2' type: string runs: diff --git a/.github/workflows/clean_cache.yml b/.github/workflows/clean_cache.yml index 2db7538..9d9b9e5 100644 --- a/.github/workflows/clean_cache.yml +++ b/.github/workflows/clean_cache.yml @@ -15,7 +15,7 @@ jobs: contents: read steps: - name: Check out code - uses: actions/checkout@v4 + uses: actions/checkout@v5 - name: Cleanup run: | diff --git a/.github/workflows/cmake.yml b/.github/workflows/cmake.yml index 1ab9135..6b0c7d6 100644 --- a/.github/workflows/cmake.yml +++ b/.github/workflows/cmake.yml @@ -36,7 +36,7 @@ jobs: - "Ninja" steps: - - uses: actions/checkout@v4 + - uses: actions/checkout@v5 with: fetch-depth: 1 diff --git a/.github/workflows/codeql.yml b/.github/workflows/codeql.yml index 6f7ef91..c6b48c4 100644 --- a/.github/workflows/codeql.yml +++ b/.github/workflows/codeql.yml @@ -8,6 +8,8 @@ on: - '.gitignore' - 'LICENSE' - 'README*' + branches-ignore: + - 'dependabot/**' pull_request: paths-ignore: - 'docs/**' @@ -15,6 +17,8 @@ on: - '.gitignore' - 'LICENSE' - 'README*' + branches-ignore: + - 'dependabot/**' schedule: - cron: '0 0 1 * *' @@ -28,7 +32,7 @@ jobs: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v4 + - uses: actions/checkout@v5 with: fetch-depth: 1 diff --git a/.github/workflows/qmake.yml b/.github/workflows/qmake.yml index d9adc8b..4c2c0a6 100644 --- a/.github/workflows/qmake.yml +++ b/.github/workflows/qmake.yml @@ -32,7 +32,7 @@ jobs: - ubuntu-latest steps: - - uses: actions/checkout@v4 + - uses: actions/checkout@v5 with: fetch-depth: 1 diff --git a/.github/workflows/readme.yml b/.github/workflows/readme.yml index ebe25e0..739a0d0 100644 --- a/.github/workflows/readme.yml +++ b/.github/workflows/readme.yml @@ -12,7 +12,7 @@ jobs: build: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v4 + - uses: actions/checkout@v5 - name: Setup Node.js uses: actions/setup-node@v4 # ISO Langusge Codes: https://cloud.google.com/translate/docs/languages diff --git a/.github/workflows/toolchain.yml b/.github/workflows/toolchain.yml index b872572..5dbd873 100644 --- a/.github/workflows/toolchain.yml +++ b/.github/workflows/toolchain.yml @@ -24,7 +24,7 @@ jobs: - ubuntu-latest steps: - - uses: actions/checkout@v4 + - uses: actions/checkout@v5 with: fetch-depth: 1 diff --git a/cmake/qt.cmake b/cmake/qt.cmake index 15d3210..6762fc7 100644 --- a/cmake/qt.cmake +++ b/cmake/qt.cmake @@ -1,9 +1,9 @@ if(CMAKE_HOST_WIN32) - list(APPEND CMAKE_PREFIX_PATH "C:\\Qt\\6.9.0\\msvc2022_64") + list(APPEND CMAKE_PREFIX_PATH "C:\\Qt\\6.9.2\\msvc2022_64") elseif(CMAKE_HOST_APPLE) elseif(CMAKE_HOST_LINUX) - list(APPEND CMAKE_PREFIX_PATH "/opt/Qt/6.9.0/gcc_64") + list(APPEND CMAKE_PREFIX_PATH "/opt/Qt/6.9.2/gcc_64") endif() add_definitions(-DQT_DEPRECATED_WARNINGS diff --git a/src/gpugraphics/openglview.cc b/src/gpugraphics/openglview.cc index 9212663..51a4eba 100644 --- a/src/gpugraphics/openglview.cc +++ b/src/gpugraphics/openglview.cc @@ -30,6 +30,7 @@ class OpenglView::OpenglViewPrivate q_ptr->glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR); q_ptr->glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE); q_ptr->glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE); + q_ptr->glBindTexture(GL_TEXTURE_2D, 0); } void uploadTexture() @@ -47,6 +48,7 @@ class OpenglView::OpenglViewPrivate GL_UNSIGNED_BYTE, image.bits()); q_ptr->glGenerateMipmap(GL_TEXTURE_2D); + q_ptr->glBindTexture(GL_TEXTURE_2D, 0); programPtr->release(); q_ptr->doneCurrent(); } @@ -265,6 +267,8 @@ void OpenglView::paintGL() glDrawElements(GL_TRIANGLES, 6, GL_UNSIGNED_INT, 0); + glBindTexture(GL_TEXTURE_2D, 0); + d_ptr->programPtr->release(); } diff --git a/src/gpugraphics/shader/complie_qsb.ps1 b/src/gpugraphics/shader/complie_qsb.ps1 index 0cdcf19..abe12e5 100644 --- a/src/gpugraphics/shader/complie_qsb.ps1 +++ b/src/gpugraphics/shader/complie_qsb.ps1 @@ -1,6 +1,6 @@ Set-Location $PSScriptRoot -$qsb = "C:\Qt\6.9.0\msvc2022_64\bin\qsb.exe" +$qsb = "C:\Qt\6.9.2\msvc2022_64\bin\qsb.exe" & $qsb --glsl "150,120,100 es" --hlsl 50 --msl 12 -o vulkan.vert.qsb vulkan.vert & $qsb --glsl "150,120,100 es" --hlsl 50 --msl 12 -o vulkan.frag.qsb vulkan.frag diff --git a/src/utils/utils.h b/src/utils/utils.h index b8ce20a..6e27833 100644 --- a/src/utils/utils.h +++ b/src/utils/utils.h @@ -13,10 +13,10 @@ class QMenu; namespace Utils { template -auto asynchronous(std::function &&func) -> T +auto asynchronous(std::function &&func) { - if (!func) { - return T(); + if (nullptr == func) { + return T{}; } QEventLoop loop; QFutureWatcher watcher; diff --git a/vcpkg.json b/vcpkg.json index f2d73f0..afd3af6 100644 --- a/vcpkg.json +++ b/vcpkg.json @@ -23,5 +23,5 @@ ] } ], - "builtin-baseline": "a9eee3b18df395dbb8be71a31bd78ea441056e42" + "builtin-baseline": "897ba2ab4c4c776b985ab1f599548fcf3ae598ba" } From b9fcf32b7d9e18fb488aacdea3ed79ff9a4d5810 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 8 Sep 2025 07:50:46 +0000 Subject: [PATCH 2/2] Bump actions/setup-node from 4 to 5 Bumps [actions/setup-node](https://github.com/actions/setup-node) from 4 to 5. - [Release notes](https://github.com/actions/setup-node/releases) - [Commits](https://github.com/actions/setup-node/compare/v4...v5) --- updated-dependencies: - dependency-name: actions/setup-node dependency-version: '5' dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] --- .github/workflows/readme.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/readme.yml b/.github/workflows/readme.yml index 739a0d0..23e39e9 100644 --- a/.github/workflows/readme.yml +++ b/.github/workflows/readme.yml @@ -14,7 +14,7 @@ jobs: steps: - uses: actions/checkout@v5 - name: Setup Node.js - uses: actions/setup-node@v4 + uses: actions/setup-node@v5 # ISO Langusge Codes: https://cloud.google.com/translate/docs/languages - name: Adding README - English uses: dephraiim/translate-readme@main