From 34d5f724d0103f62d89453ea835787b415de70e0 Mon Sep 17 00:00:00 2001 From: Bill Currie Date: Wed, 5 Feb 2025 10:21:45 +0900 Subject: [PATCH] [vulkan] Use qfcc for geometry shaders Unsurprisingly, they have issues, but one step at a time :) --- Makefile.am | 4 ++++ libs/video/renderer/Makemodule.am | 12 ++++++++---- 2 files changed, 12 insertions(+), 4 deletions(-) diff --git a/Makefile.am b/Makefile.am index 1b754e336..9353139f2 100644 --- a/Makefile.am +++ b/Makefile.am @@ -167,6 +167,10 @@ SUFFICES += .plist .plc @$(mkdir_p) $(builddir)/`dirname $@` $(V_QFCC)$(QFCC) -q -c -O -Cc-array,target=spir-v -o $@ $< +%.geom.spvc: %.geom + @$(mkdir_p) $(builddir)/`dirname $@` + $(V_QFCC)$(QFCC) -q -c -O -Cc-array,target=spir-v -o $@ $< + sharepath = @sharepath@ shaderdir = @shaderdir@ shader_DATA = diff --git a/libs/video/renderer/Makemodule.am b/libs/video/renderer/Makemodule.am index eb7b8864a..f65a6618d 100644 --- a/libs/video/renderer/Makemodule.am +++ b/libs/video/renderer/Makemodule.am @@ -530,16 +530,21 @@ vkshader_src_vert = \ $(fstriangle_src) \ $(fstrianglest_src) +vkshader_src_geom = \ + $(bsp_gbufg_src) \ + $(particleg_src) + vkshader_c_vert=$(call spvautoc,$(vkshader_src_vert)) -vkshader_dep = $(call spvcautodep,$(vkshader_src_vert)) +vkshader_c_geom=$(call spvautoc,$(vkshader_src_geom)) + +vkshader_dep = $(call spvcautodep,$(vkshader_src_vert) $(vkshader_src_geom)) include $(vkshader_dep) # am--include-marker spvc_depfiles_remade += $(vkshader_dep) -vkshader_c = $(vkshader_c_vert) \ +vkshader_c = $(vkshader_c_vert) $(vkshader_c_geom) \ $(linef_c) \ $(partphysicsc_c) \ $(partupdatec_c) \ - $(particleg_c) \ $(particlef_c) \ $(spritef_c) \ $(sprite_gbuff_c) \ @@ -547,7 +552,6 @@ vkshader_c = $(vkshader_c_vert) \ $(twodf_c) \ $(twod_depthf_c) \ $(quakebspf_c) \ - $(bsp_gbufg_c) \ $(bsp_gbuff_c) \ $(bsp_skyf_c) \ $(bsp_turbf_c) \