Skip to content

Commit

Permalink
vulkan viewer 1;
Browse files Browse the repository at this point in the history
  • Loading branch information
RealChuan committed Dec 26, 2023
1 parent bdad19d commit f853223
Show file tree
Hide file tree
Showing 10 changed files with 1,167 additions and 7 deletions.
7 changes: 6 additions & 1 deletion .github/workflows/cmake.yml
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ jobs:
matrix:
os:
- windows-latest
- macos-latest
# - macos-latest
- ubuntu-latest
qt_ver:
- 6.6.1
Expand Down Expand Up @@ -97,6 +97,11 @@ jobs:
with:
fetch-depth: 1

- name: Install Vulkan SDK
uses: humbletim/[email protected]
with:
cache: true

- name: Enable Developer Command Prompt
if: startsWith(matrix.os, 'windows')
uses: ilammy/[email protected]
Expand Down
9 changes: 7 additions & 2 deletions .github/workflows/qmake.yml
Original file line number Diff line number Diff line change
Expand Up @@ -36,8 +36,8 @@ jobs:
matrix:
os:
- windows-2019
- macos-latest
- ubuntu-latest
# - macos-latest
# - ubuntu-latest
qt_ver:
- 6.6.1
libs:
Expand Down Expand Up @@ -93,6 +93,11 @@ jobs:
with:
fetch-depth: 1

- name: Install Vulkan SDK
uses: humbletim/[email protected]
with:
cache: true

- name: msvc-build
if: startsWith(matrix.os, 'windows')
shell: cmd
Expand Down
10 changes: 10 additions & 0 deletions .github/workflows/toolchain.yml
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,16 @@ jobs:
- breakpad giflib

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

- name: Install Vulkan SDK
uses: humbletim/[email protected]
with:
cache: true

- name: Install Qt
uses: jurplel/install-qt-action@v3
with:
Expand Down
4 changes: 4 additions & 0 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -84,6 +84,10 @@ find_package(GIF REQUIRED)
if(GIF_FOUND)
message(STATUS "found GIF")
endif()
find_package(Vulkan REQUIRED)
if(Vulkan_FOUND)
message(STATUS "found Vulkan")
endif()

add_subdirectory(utils)
add_subdirectory(3rdparty)
Expand Down
12 changes: 10 additions & 2 deletions gpugraphics/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,5 +1,13 @@
set(PROJECT_SOURCES gpugraphics_global.hpp openglshaderprogram.cc
openglshaderprogram.hpp openglview.cc openglview.hpp)
set(PROJECT_SOURCES
gpugraphics_global.hpp
openglshaderprogram.cc
openglshaderprogram.hpp
openglview.cc
openglview.hpp
texturerenderer.cc
texturerenderer.hpp
vulkanview.cc
vulkanview.hpp)

qt_add_resources(SOURCES shader.qrc)

Expand Down
8 changes: 6 additions & 2 deletions gpugraphics/gpugraphics.pro
Original file line number Diff line number Diff line change
Expand Up @@ -8,11 +8,15 @@ TARGET = $$replaceLibName(gpugraphics)
HEADERS += \
gpugraphics_global.hpp \
openglshaderprogram.hpp \
openglview.hpp
openglview.hpp \
texturerenderer.hpp \
vulkanview.hpp

SOURCES += \
openglshaderprogram.cc \
openglview.cc
openglview.cc \
texturerenderer.cc \
vulkanview.cc

RESOURCES += \
shader.qrc
Expand Down
Loading

0 comments on commit f853223

Please sign in to comment.