Daemon-vulkan infrastructure 2 #1845

VReaperV · 2025-10-05T00:03:56Z

Adds some more cmake changes required for daemon-vulkan, slightly modified version of the Khronos Vulkan header generator, as well as a shader generator with support for #insert/#include and SPIR-V generation. Also added some of the embed stuff from #1842 with more functionality.

VReaperV · 2025-10-05T00:05:28Z

Most of the changes are just the XML spec and existing generator code.

slipher

VulkanHeaders seems to be a third-party library, so it should go in libs. Is there some good reason to check in the files directly instead of using a submodule?

src.cmake

libs/VulkanHeaders/Vulkan.cpp

VReaperV · 2025-10-05T00:24:38Z

VulkanHeaders seems to be a third-party library, so it should go in libs. Is there some good reason to check in the files directly instead of using a submodule?

Most of it is not used by daemon-vulkan.

slipher · 2025-10-05T00:29:25Z

So what is the future maintenance plan for VulkanHeaders: do we expect to maintain it ourselves or periodically sync updates from upstream?

VReaperV · 2025-10-05T00:35:43Z

So what is the future maintenance plan for VulkanHeaders: do we expect to maintain it ourselves or periodically sync updates from upstream?

Periodic sync. Header generator rarely ever gets updates and likely would continue working as is without issue.

slipher · 2025-10-05T01:15:12Z

OK cool. In any case it should go in libs/

VReaperV · 2025-10-05T01:27:55Z

Moved it.

slipher

slightly modified version of the Khronos Vulkan header generator,

If there are modifications of the files in libs/ relative to upstream, would you mind checking in the original upstream version as the first commit, and then the local changes as a second commit? That way we can see what was changed in the history.

Also I request that the commit hash of the Vulkan Headers repo be recorded in the commit message.

slipher · 2025-10-05T09:34:39Z

cmake/DaemonVulkan.cmake

+	message( FATAL_ERROR "Could NOT find libVulkan" )
+endif()
+
+set( generatorPath ${CMAKE_SOURCE_DIR}/cmake/DaemonVulkan/VulkanHeaders/ )


This path needs to be updated

Removed as well.

cmake/DaemonVulkan.cmake

slipher · 2025-10-05T09:43:42Z

cmake/DaemonVulkan.cmake

+	endif()
+endfunction()
+
+function( GenerateVulkanHeaders2 )


Why do we need GenerateVulkanHeaders and GenerateVulkanHeaders2?

Just unsuccessful attempts at making cmake generate it automatically. I've removed that, easier to just run the generator script manually and commit the headers than deal with cmake's bullshit.

slipher · 2025-10-05T09:45:31Z

cmake/DaemonVulkan.cmake

+find_package( Vulkan REQUIRED COMPONENTS glslangValidator glslang )
+
+if( NOT Vulkan_FOUND )
+	message( FATAL_ERROR "Could NOT find libVulkan" )


This shouldn't be needed since REQUIRED was used

I've removed that find_package since it's not used anymore.

slipher · 2025-10-05T09:47:01Z

cmake/DaemonVulkan.cmake

+	endforeach()
+
+	if( REGENERATE OR ${generatorPath}/vk.xml IS_NEWER_THAN ${generatorPath}/vk.xml.tmp OR NOT EXISTS ${generatorPath}/vk.xml.tmp )
+		configure_file( ${generatorPath}/vk.xml ${generatorPath}/vk.xml.tmp COPYONLY )


Why do we need to make an exact copy of the XML file?

Just more attempts at making it generate, removed now.

slipher · 2025-10-05T09:52:16Z

cmake/DaemonVulkan.cmake

+
+macro( GenerateVulkanShaders target )
+	# Pre-processing for #insert/#include
+	foreach( src IN LISTS graphicsEngineList )


Where is graphicsEngineList defined?

In renderer-vulkan/src.cmake, but there's nothing to check in there currently. I have a couple files there that I've been testing with locally, but they're just random code from the GL renderer with a few changes.

slipher · 2025-10-05T09:59:01Z

cmake/DaemonVulkan.cmake

+option( VULKAN_SPIRV_LTO "Enable link-time SPIR-V optimisations." ON )
+
+if( USE_VULKAN )
+	add_executable( VulkanShaderParser "${DAEMON_DIR}/cmake/DaemonVulkan/VulkanShaderParser.cpp" )


Host-mode tools mess up cross compiling, so it would be nice to rewrite that in Python at some point (non-blocking comment)

Yeah probably. This is mostly just the #insert code from gl_shader.cpp, with support for recursion and glslangValidator calls.

VReaperV · 2025-10-05T12:12:14Z

slightly modified version of the Khronos Vulkan header generator,

If there are modifications of the files in libs/ relative to upstream, would you mind checking in the original upstream version as the first commit, and then the local changes as a second commit? That way we can see what was changed in the history.

Also I request that the commit hash of the Vulkan Headers repo be recorded in the commit message.

Sure, done.

… embedding files

…ebugger opens it

…he target

…tside)

…t to regenerate when modifying

…en modifying

libs/VulkanHeaders/GenerateAll.py

libs/VulkanHeaders/genvk.py

Vulkan header generator and xml spec from https://github.com/KhronosGroup/Vulkan-Docs commit: 7fe2b623f13dabb885e35b953dd690f01093d4bb

Also add a script to generate all the headers we need along with function loading.

VReaperV added A-Renderer T-Feature-Request Proposed new feature labels Oct 5, 2025

VReaperV force-pushed the vulkan-infrastructure2 branch from afbdcb0 to f8462a8 Compare October 5, 2025 00:14

VReaperV mentioned this pull request Oct 5, 2025

WIP: embed media files #1842

Draft

VReaperV force-pushed the vulkan-infrastructure2 branch from f8462a8 to 72c00bf Compare October 5, 2025 00:22

slipher reviewed Oct 5, 2025

View reviewed changes

src.cmake Outdated Show resolved Hide resolved

libs/VulkanHeaders/Vulkan.cpp Show resolved Hide resolved

VReaperV force-pushed the vulkan-infrastructure2 branch from 72c00bf to 4d9ae49 Compare October 5, 2025 00:23

VReaperV force-pushed the vulkan-infrastructure2 branch from 2cdc4da to 2ce79c6 Compare October 5, 2025 00:38

VReaperV force-pushed the vulkan-infrastructure2 branch from 2ce79c6 to 64f9b54 Compare October 5, 2025 01:27

slipher reviewed Oct 5, 2025

View reviewed changes

VReaperV force-pushed the vulkan-infrastructure2 branch 3 times, most recently from 6a64000 to 21f9e08 Compare October 5, 2025 12:12

illwieckz added 10 commits October 6, 2025 02:09

cmake: rename DaemonBuildInfo as DaemonSourceGenerator

9cbd087

DaemonSourceGenerator: rework it a bit

5bd7f03

DaemonSourceGenerator: make the embedded file generator reusable

02dfe9a

EmbedText make possible to chose between TEXT and BINARY formats when…

3ea31c6

… embedding files

DaemonSourceGenerator: provide embedded files as part as the namespace

d8dc9f4

EmbedText: split embedded source lines just in case if an editor or d…

c997f71

…ebugger opens it

DaemonSourceGenerator: also add the generated source entry-point to t…

3c0a902

…he target

DaemonSourceGenerator: lowercase local variables (even if the leak ou…

4b03142

…tside)

DaemonSourceGenerator: also make generated sources depend on EmbedTex…

9e4e780

…t to regenerate when modifying

DaemonSourceGenerator: also make source depend on it to regenerate wh…

ff5cf6c

…en modifying

illwieckz added 2 commits October 7, 2025 02:18

DaemonSourceGenerator: explicit mkdir

95e1b3e

DaemonSourceGenerator: do not copy the embedded files in the map

c9e7f9c

VReaperV force-pushed the vulkan-infrastructure2 branch from 21f9e08 to 1fd0e0b Compare October 7, 2025 02:49

VReaperV mentioned this pull request Oct 7, 2025

Genericize the CMake source generator for embedding files #1849

Open

slipher reviewed Oct 8, 2025

View reviewed changes

libs/VulkanHeaders/GenerateAll.py Show resolved Hide resolved

libs/VulkanHeaders/GenerateAll.py Outdated Show resolved Hide resolved

libs/VulkanHeaders/genvk.py Outdated Show resolved Hide resolved

VReaperV force-pushed the vulkan-infrastructure2 branch 3 times, most recently from cbb126c to be51166 Compare October 8, 2025 12:28

VReaperV added 2 commits October 8, 2025 15:30

Daemon-vulkan infrastructure 2

10ed57e

Add VulkanHeaders

8b51c4b

Vulkan header generator and xml spec from https://github.com/KhronosGroup/Vulkan-Docs commit: 7fe2b623f13dabb885e35b953dd690f01093d4bb

VReaperV force-pushed the vulkan-infrastructure2 branch from be51166 to f81e205 Compare October 8, 2025 12:30

VulkanHeaders: generate sType as const with default value

984d775

Also add a script to generate all the headers we need along with function loading.

VReaperV force-pushed the vulkan-infrastructure2 branch from f81e205 to 984d775 Compare October 8, 2025 12:32

Daemon-vulkan infrastructure 2 #1845

Are you sure you want to change the base?

Daemon-vulkan infrastructure 2 #1845

Uh oh!

Conversation

VReaperV commented Oct 5, 2025

Uh oh!

VReaperV commented Oct 5, 2025

Uh oh!

slipher left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

VReaperV commented Oct 5, 2025

Uh oh!

slipher commented Oct 5, 2025

Uh oh!

VReaperV commented Oct 5, 2025

Uh oh!

slipher commented Oct 5, 2025

Uh oh!

VReaperV commented Oct 5, 2025

Uh oh!

slipher left a comment

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Choose a reason for hiding this comment

Uh oh!

VReaperV Oct 5, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

VReaperV commented Oct 5, 2025

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants

VReaperV Oct 5, 2025 •

edited

Loading