Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/actions/install-dependencies/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ inputs:
qt_ver:
description: 'qt version'
required: false
default: '6.9.0'
default: '6.9.2'
type: string

runs:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/clean_cache.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ jobs:
contents: read
steps:
- name: Check out code
uses: actions/checkout@v4
uses: actions/checkout@v5

- name: Cleanup
run: |
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/cmake.yml
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ jobs:
- "Ninja"

steps:
- uses: actions/checkout@v4
- uses: actions/checkout@v5
with:
fetch-depth: 1

Expand Down
6 changes: 5 additions & 1 deletion .github/workflows/codeql.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,13 +8,17 @@ on:
- '.gitignore'
- 'LICENSE'
- 'README*'
branches-ignore:
- 'dependabot/**'
pull_request:
paths-ignore:
- 'docs/**'
- '.clang-format'
- '.gitignore'
- 'LICENSE'
- 'README*'
branches-ignore:
- 'dependabot/**'

schedule:
- cron: '0 0 1 * *'
Expand All @@ -28,7 +32,7 @@ jobs:
runs-on: ubuntu-latest

steps:
- uses: actions/checkout@v4
- uses: actions/checkout@v5
with:
fetch-depth: 1

Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/qmake.yml
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ jobs:
- ubuntu-latest

steps:
- uses: actions/checkout@v4
- uses: actions/checkout@v5
with:
fetch-depth: 1

Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/readme.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,9 @@ jobs:
build:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
- 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
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/toolchain.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ jobs:
- ubuntu-latest

steps:
- uses: actions/checkout@v4
- uses: actions/checkout@v5
with:
fetch-depth: 1

Expand Down
4 changes: 2 additions & 2 deletions cmake/qt.cmake
Original file line number Diff line number Diff line change
@@ -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
Expand Down
4 changes: 4 additions & 0 deletions src/gpugraphics/openglview.cc
Original file line number Diff line number Diff line change
Expand Up @@ -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()
Expand All @@ -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();
}
Expand Down Expand Up @@ -265,6 +267,8 @@ void OpenglView::paintGL()

glDrawElements(GL_TRIANGLES, 6, GL_UNSIGNED_INT, 0);

glBindTexture(GL_TEXTURE_2D, 0);

d_ptr->programPtr->release();
}

Expand Down
2 changes: 1 addition & 1 deletion src/gpugraphics/shader/complie_qsb.ps1
Original file line number Diff line number Diff line change
@@ -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
6 changes: 3 additions & 3 deletions src/utils/utils.h
Original file line number Diff line number Diff line change
Expand Up @@ -13,10 +13,10 @@ class QMenu;
namespace Utils {

template<typename T>
auto asynchronous(std::function<T()> &&func) -> T
auto asynchronous(std::function<T()> &&func)
{
if (!func) {
return T();
if (nullptr == func) {
return T{};
}
QEventLoop loop;
QFutureWatcher<T> watcher;
Expand Down
2 changes: 1 addition & 1 deletion vcpkg.json
Original file line number Diff line number Diff line change
Expand Up @@ -23,5 +23,5 @@
]
}
],
"builtin-baseline": "a9eee3b18df395dbb8be71a31bd78ea441056e42"
"builtin-baseline": "897ba2ab4c4c776b985ab1f599548fcf3ae598ba"
}
Loading