Skip to content

vulkan support #10

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
Green-Sky wants to merge 9 commits into
base: master
Choose a base branch
from
Draft

vulkan support #10

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
e55808b
next try, this time with vk headers and hpp
Green-Sky Jun 1, 2022
808822e
start refactoring
Green-Sky Jun 1, 2022
695e2e5
views
Green-Sky Jun 1, 2022
cab146a
hack in framebuffers
Green-Sky Jun 2, 2022
525db7f
refactor, move vulkan to proper location
Green-Sky Jun 2, 2022
a0024b3
main loop and sync
Green-Sky Jun 3, 2022
76161df
mult frames in flight
Green-Sky Jun 3, 2022
82faf44
working on some hacky randering
Green-Sky Jun 8, 2022
e4d99ad
lil continue
Green-Sky Jun 15, 2022
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
4 changes: 4 additions & 0 deletions .gitmodules
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,3 +37,7 @@
path = external/physfs/physfs
url = https://github.com/icculus/physfs.git
branch = main
[submodule "external/Vulkan-Headers"]
path = external/Vulkan-Headers
url = https://github.com/KhronosGroup/Vulkan-Headers.git
shallow = true
3 changes: 3 additions & 0 deletions external/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,9 @@ if(NOT MM_HEADLESS)
add_subdirectory("glad-debug")
endif()

add_subdirectory("Vulkan-Headers")
target_compile_definitions(Vulkan-Headers INTERFACE VULKAN_HPP_DISPATCH_LOADER_DYNAMIC=1)

# stb utilies
add_subdirectory("stb")

Expand Down
1 change: 1 addition & 0 deletions external/Vulkan-Headers
Open in desktop
Submodule Vulkan-Headers added at 245d25
1 change: 1 addition & 0 deletions framework/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ if(NOT MM_HEADLESS)
add_subdirectory(simple_sdl_renderer)
add_subdirectory(opengl_primitives)
add_subdirectory(opengl_renderer)
add_subdirectory(vulkan_renderer)
add_subdirectory(imgui)
add_subdirectory(input)
add_subdirectory(sound)
Expand Down
3 changes: 3 additions & 0 deletions framework/sdl_service/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,9 @@ else()
target_link_libraries(sdl_service glad)
endif()

# nope
#target_link_libraries(sdl_service Vulkan::Headers)

if(VCPKG_TARGET_TRIPLET)
target_link_libraries(sdl_service SDL2::SDL2 SDL2::SDL2main SDL2::SDL2-static)
endif()
Expand Down
4 changes: 3 additions & 1 deletion framework/sdl_service/test/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
add_executable(sdl_service_test start_test.cpp)
add_executable(sdl_service_test
./start_test.cpp
)

target_include_directories(sdl_service_test PRIVATE ".")

Expand Down
26 changes: 26 additions & 0 deletions framework/vulkan_renderer/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
cmake_minimum_required(VERSION 3.9 FATAL_ERROR)

project(vulkan_renderer CXX)

add_library(vulkan_renderer
src/mm/services/vulkan_renderer.hpp
src/mm/services/vulkan_renderer.cpp
)

target_include_directories(vulkan_renderer PUBLIC "${CMAKE_CURRENT_SOURCE_DIR}/src")

target_link_libraries(vulkan_renderer
Vulkan::Headers

engine
logger

sdl_service
)

########################

if (BUILD_TESTING)
add_subdirectory(test)
endif()

Loading