diff --git a/config.d/build_control.m4 b/config.d/build_control.m4 index fdd4ce698..e5800c31b 100644 --- a/config.d/build_control.m4 +++ b/config.d/build_control.m4 @@ -313,6 +313,7 @@ if test x"${top_need_libs}" = xyes; then qfac_include_qf_glsl="\$(include_qf_glsl)" qfac_include_qf_math="\$(include_qf_math)" qfac_include_qf_plugin="\$(include_qf_plugin)" + qfac_include_qf_simd="\$(include_qf_simd)" qfac_include_qf_vulkan="\$(include_qf_vulkan)" fi QF_SUBST(qfac_include_qf) @@ -320,6 +321,7 @@ QF_SUBST(qfac_include_qf_gl) QF_SUBST(qfac_include_qf_glsl) QF_SUBST(qfac_include_qf_math) QF_SUBST(qfac_include_qf_plugin) +QF_SUBST(qfac_include_qf_simd) QF_SUBST(qfac_include_qf_vulkan) progs_gz= diff --git a/include/Makemodule.am b/include/Makemodule.am index 0755ed1b5..48acc8173 100644 --- a/include/Makemodule.am +++ b/include/Makemodule.am @@ -13,6 +13,7 @@ EXTRA_DIST += \ include/buildnum.h \ include/compat.h \ include/context_sdl.h \ + include/context_win.h \ include/context_x11.h \ include/d_iface.h \ include/d_ifacea.h \ @@ -54,10 +55,12 @@ EXTRA_DIST += \ include/qfalloca.h \ include/qstring.h \ include/quakeasm.h \ + include/quicksort.h \ include/r_cvar.h \ include/r_dynamic.h \ include/r_internal.h \ include/r_local.h \ + include/r_scrap.h \ include/r_screen.h \ include/r_shared.h \ include/regex.h \ @@ -79,6 +82,7 @@ EXTRA_DIST += \ include/client/entities.h \ include/client/temp_entities.h \ include/client/locs.h \ + include/client/state.h \ include/client/view.h \ include/qw/bothdefs.h \ include/qw/msg_backbuf.h \ @@ -87,7 +91,6 @@ EXTRA_DIST += \ include/qw/protocol.h \ include/win32/dirent.h \ include/win32/fnmatch.h \ - include/win32/stdint.h \ include/win32/resources/icon1Vista.ico \ include/win32/resources/icon1XP.ico \ include/win32/resources/quakeforge.rc \ diff --git a/include/QF/Makemodule.am b/include/QF/Makemodule.am index 4c190feae..6ebb73af6 100644 --- a/include/QF/Makemodule.am +++ b/include/QF/Makemodule.am @@ -3,9 +3,11 @@ include_qf = \ include/QF/bspfile.h \ include/QF/cbuf.h \ include/QF/cdaudio.h \ + include/QF/cexpr.h \ include/QF/checksum.h \ include/QF/clip_hull.h \ include/QF/cmd.h \ + include/QF/cmem.h \ include/QF/console.h \ include/QF/crc.h \ include/QF/csqc.h \ @@ -13,6 +15,7 @@ include_qf = \ include/QF/darray.h \ include/QF/dstring.h \ include/QF/draw.h \ + include/QF/entity.h \ include/QF/gib.h \ include/QF/hash.h \ include/QF/idparse.h \ @@ -124,20 +127,42 @@ include_qf_plugin = \ include/QF/plugin/snd_render.h \ include/QF/plugin/vid_render.h +include_qf_simd = \ + include/QF/simd/mat4f.h \ + include/QF/simd/types.h \ + include/QF/simd/vec4d.h \ + include/QF/simd/vec4f.h + include_qf_vulkan = \ + include/QF/Vulkan/barrier.h \ include/QF/Vulkan/buffer.h \ + include/QF/Vulkan/capture.h \ include/QF/Vulkan/command.h \ include/QF/Vulkan/cvars.h \ + include/QF/Vulkan/debug.h \ include/QF/Vulkan/descriptor.h \ include/QF/Vulkan/device.h \ + include/QF/Vulkan/draw.h \ include/QF/Vulkan/funclist.h \ include/QF/Vulkan/image.h \ include/QF/Vulkan/instance.h \ include/QF/Vulkan/memory.h \ include/QF/Vulkan/pipeline.h \ + include/QF/Vulkan/qf_alias.h \ + include/QF/Vulkan/qf_bsp.h \ + include/QF/Vulkan/qf_compose.h \ include/QF/Vulkan/qf_draw.h \ + include/QF/Vulkan/qf_lighting.h \ + include/QF/Vulkan/qf_lightmap.h \ + include/QF/Vulkan/qf_main.h \ + include/QF/Vulkan/qf_model.h \ + include/QF/Vulkan/qf_particles.h \ + include/QF/Vulkan/qf_texture.h \ include/QF/Vulkan/qf_vid.h \ include/QF/Vulkan/renderpass.h \ + include/QF/Vulkan/scrap.h \ + include/QF/Vulkan/shader.h \ + include/QF/Vulkan/staging.h \ include/QF/Vulkan/swapchain.h # headers shared with ruamoko @@ -148,12 +173,14 @@ qf_gl_includedir = $(includedir)/QF/GL qf_glsl_includedir = $(includedir)/QF/GLSL qf_math_includedir = $(includedir)/QF/math qf_plugin_includedir = $(includedir)/QF/plugin -qf_vulkan_includedir = $(includedir)/QF/vulkan +qf_simd_includedir = $(includedir)/QF/simd +qf_vulkan_includedir = $(includedir)/QF/Vulkan qf_include_HEADERS = @qfac_include_qf@ qf_gl_include_HEADERS = @qfac_include_qf_gl@ qf_glsl_include_HEADERS = @qfac_include_qf_glsl@ qf_math_include_HEADERS = @qfac_include_qf_math@ qf_plugin_include_HEADERS = @qfac_include_qf_plugin@ +qf_simd_include_HEADERS = @qfac_include_qf_simd@ qf_vulkan_include_HEADERS = @qfac_include_qf_vulkan@ ruamoko_qf_includedir = $(ruamoko_includedir)/QF @@ -165,5 +192,6 @@ EXTRA_HEADERS += \ $(include_qf_glsl) \ $(include_qf_math) \ $(include_qf_plugin) \ + $(include_qf_simd) \ $(include_qf_vulkan) \ $(qfcc_include_qf) diff --git a/libs/client/Makemodule.am b/libs/client/Makemodule.am index 074daea58..0e5105806 100644 --- a/libs/client/Makemodule.am +++ b/libs/client/Makemodule.am @@ -6,5 +6,4 @@ libs_client_libQFclient_la_SOURCES= \ libs/client/cl_effects.c \ libs/client/cl_entities.c \ libs/client/cl_temp_entities.c \ - libs/client/locs.c \ - $e + libs/client/locs.c diff --git a/libs/entity/Makemodule.am b/libs/entity/Makemodule.am index d8ac9a7e1..58dc1f08c 100644 --- a/libs/entity/Makemodule.am +++ b/libs/entity/Makemodule.am @@ -9,5 +9,4 @@ libs_entity_libQFentity_la_LIBADD= $(entity_deps) libs_entity_libQFentity_la_DEPENDENCIES= $(entity_deps) libs_entity_libQFentity_la_SOURCES= \ libs/entity/hierarchy.c \ - libs/entity/transform.c \ - $e + libs/entity/transform.c diff --git a/libs/entity/test/Makemodule.am b/libs/entity/test/Makemodule.am index b0f98ae2b..be280abe9 100644 --- a/libs/entity/test/Makemodule.am +++ b/libs/entity/test/Makemodule.am @@ -1,6 +1,5 @@ libs_entity_tests = \ - libs/entity/test/test-hierarchy \ - $e + libs/entity/test/test-hierarchy TESTS += $(libs_entity_tests) @@ -11,8 +10,7 @@ libs_entity_test_libs= \ libs/util/libQFutil.la libs_entity_test_test_hierarchy_SOURCES= \ - libs/entity/test/test-hierarchy.c \ - $e + libs/entity/test/test-hierarchy.c libs_entity_test_test_hierarchy_LDADD= \ $(libs_entity_test_libs) libs_entity_test_test_hierarchy_DEPENDENCIES= \ diff --git a/libs/image/Makemodule.am b/libs/image/Makemodule.am index 00d1191d1..0e402b796 100644 --- a/libs/image/Makemodule.am +++ b/libs/image/Makemodule.am @@ -10,5 +10,4 @@ libs_image_libQFimage_la_SOURCES= \ libs/image/image.c \ libs/image/pcx.c \ libs/image/png.c \ - libs/image/tga.c \ - $e + libs/image/tga.c diff --git a/libs/video/renderer/Makemodule.am b/libs/video/renderer/Makemodule.am index 562a9bebc..184342781 100644 --- a/libs/video/renderer/Makemodule.am +++ b/libs/video/renderer/Makemodule.am @@ -256,7 +256,6 @@ libs_video_renderer_librender_vulkan_la_SOURCES = \ libs/video/renderer/vulkan/image.c \ libs/video/renderer/vulkan/instance.c \ libs/video/renderer/vulkan/memory.c \ - libs/video/renderer/vulkan/namehack.h \ libs/video/renderer/vulkan/pipeline.c \ libs/video/renderer/vulkan/renderpass.c \ libs/video/renderer/vulkan/scrap.c \ @@ -284,9 +283,9 @@ libs/video/renderer/vulkan/shader.lo: libs/video/renderer/vulkan/shader.c $(vksh libs/video/renderer/vulkan/vulkan_vid_common.lo: libs/video/renderer/vulkan/vulkan_vid_common.c $(vkparse_src) $(pipeline_gen) ${renderpass_gen} -qwaq_curses = ruamoko/qwaq/qwaq-curses$(EXEEXT) -vkparse_cinc = libs/video/renderer/vulkan/vkparse.cinc -vkparse_hinc = libs/video/renderer/vulkan/vkparse.hinc +qwaq_curses = $(top_builddir)/ruamoko/qwaq/qwaq-curses$(EXEEXT) +vkparse_cinc = $(top_builddir)/libs/video/renderer/vulkan/vkparse.cinc +vkparse_hinc = $(top_builddir)/libs/video/renderer/vulkan/vkparse.hinc vkparse_src = \ $(vkparse_cinc) \ $(vkparse_hinc) @@ -403,12 +402,13 @@ $(vkparse_hinc): $(vkparse_cinc) # do nothing: hinc generated at the same time as cinc CLEANFILES += \ + $(top_builddir)/qwaq-curses.log \ libs/video/renderer/glsl/*.vc \ libs/video/renderer/glsl/*.fc \ libs/video/renderer/glsl/*.slc \ libs/video/renderer/vulkan/*.plc \ - libs/video/renderer/vulkan/*.spv \ - libs/video/renderer/vulkan/*.spvc \ + libs/video/renderer/vulkan/shader/*.spv \ + libs/video/renderer/vulkan/shader/*.spvc \ libs/video/renderer/vulkan/vkgen.sym \ $(vkparse_src) @@ -418,4 +418,26 @@ BUILT_SOURCES += $(shader_gen) # libs/video/renderer/vulkan/passthrough.vert.spv \ # libs/video/renderer/vulkan/pushcolor.frag.spv -EXTRA_DIST += $(shader_DATA:.spv=) +EXTRA_DIST += \ + libs/video/renderer/vulkan/deferred.plist \ + libs/video/renderer/vulkan/qfpipeline.plist \ + libs/video/renderer/vulkan/vkparse.plist \ + libs/video/renderer/vulkan/vkparse.h \ + libs/video/renderer/vulkan/shader/alias.frag \ + libs/video/renderer/vulkan/shader/alias.vert \ + libs/video/renderer/vulkan/shader/alias_depth.vert \ + libs/video/renderer/vulkan/shader/alias_gbuf.frag \ + libs/video/renderer/vulkan/shader/bsp_depth.vert \ + libs/video/renderer/vulkan/shader/bsp_gbuf.frag \ + libs/video/renderer/vulkan/shader/bsp_gbuf.geom \ + libs/video/renderer/vulkan/shader/bsp_gbuf.vert \ + libs/video/renderer/vulkan/shader/bsp_sky.frag \ + libs/video/renderer/vulkan/shader/bsp_turb.frag \ + libs/video/renderer/vulkan/shader/compose.frag \ + libs/video/renderer/vulkan/shader/lighting.frag \ + libs/video/renderer/vulkan/shader/passthrough.vert \ + libs/video/renderer/vulkan/shader/pushcolor.frag \ + libs/video/renderer/vulkan/shader/quakebsp.frag \ + libs/video/renderer/vulkan/shader/quakebsp.vert \ + libs/video/renderer/vulkan/shader/twod.frag \ + libs/video/renderer/vulkan/shader/twod.vert diff --git a/libs/video/renderer/vulkan/test/Makemodule.am b/libs/video/renderer/vulkan/test/Makemodule.am index 84c5ff136..f46249d31 100644 --- a/libs/video/renderer/vulkan/test/Makemodule.am +++ b/libs/video/renderer/vulkan/test/Makemodule.am @@ -1,6 +1,5 @@ libs_video_renderer_vulkan_tests = \ - libs/video/renderer/vulkan/test/test-staging \ - $e + libs/video/renderer/vulkan/test/test-staging TESTS += $(libs_video_renderer_vulkan_tests) @@ -11,8 +10,7 @@ libs_video_renderer_vulkan_test_libs= \ libs/util/libQFutil.la libs_video_renderer_vulkan_test_test_staging_SOURCES= \ - libs/video/renderer/vulkan/test/test-staging.c \ - $e + libs/video/renderer/vulkan/test/test-staging.c libs_video_renderer_vulkan_test_test_staging_LDADD= \ $(libs_video_renderer_vulkan_test_libs) libs_video_renderer_vulkan_test_test_staging_DEPENDENCIES= \ diff --git a/libs/video/renderer/vulkan/vkgen/Makemodule.am b/libs/video/renderer/vulkan/vkgen/Makemodule.am index ecb5853ee..f28252f7f 100644 --- a/libs/video/renderer/vulkan/vkgen/Makemodule.am +++ b/libs/video/renderer/vulkan/vkgen/Makemodule.am @@ -44,10 +44,17 @@ EXTRA_DIST += \ libs/video/renderer/vulkan/vkgen/stdint.h \ libs/video/renderer/vulkan/vkgen/vkalias.h \ libs/video/renderer/vulkan/vkgen/vkenum.h \ + libs/video/renderer/vulkan/vkgen/vkfieldarray.h \ + libs/video/renderer/vulkan/vkgen/vkfieldauto.h \ + libs/video/renderer/vulkan/vkgen/vkfieldcustom.h \ + libs/video/renderer/vulkan/vkgen/vkfielddata.h \ + libs/video/renderer/vulkan/vkgen/vkfielddef.h \ + libs/video/renderer/vulkan/vkgen/vkfieldsingle.h \ + libs/video/renderer/vulkan/vkgen/vkfieldstring.h \ + libs/video/renderer/vulkan/vkgen/vkfieldtype.h \ libs/video/renderer/vulkan/vkgen/vkgen.h \ libs/video/renderer/vulkan/vkgen/vkstruct.h \ - libs/video/renderer/vulkan/vkgen/vktype.h \ - $e + libs/video/renderer/vulkan/vkgen/vktype.h CLEANFILES += \ libs/video/renderer/vkgen/*.sym diff --git a/ruamoko/qwaq/Makemodule.am b/ruamoko/qwaq/Makemodule.am index 1626d661b..8b2d29419 100644 --- a/ruamoko/qwaq/Makemodule.am +++ b/ruamoko/qwaq/Makemodule.am @@ -39,8 +39,7 @@ qwaq_app_dat_src= \ ruamoko/qwaq/ui/textcontext.r \ ruamoko/qwaq/ui/titlebar.r \ ruamoko/qwaq/ui/view.r \ - ruamoko/qwaq/ui/window.r \ - $e + ruamoko/qwaq/ui/window.r #FIXME this coupling is horrible qwaq_curses_libs= \ @@ -53,8 +52,7 @@ ruamoko_qwaq_qwaq_curses_SOURCES= \ ruamoko/qwaq/builtins/curses.c \ ruamoko/qwaq/builtins/debug.c \ ruamoko/qwaq/builtins/editbuffer.c \ - ruamoko/qwaq/builtins/input.c \ - $e + ruamoko/qwaq/builtins/input.c ruamoko_qwaq_qwaq_curses_LDADD= $(qwaq_curses_libs) $(QWAQ_LIBS) \ $(PANEL_LIBS) $(NCURSES_LIBS) $(PTHREAD_LDFLAGS) $(DL_LIBS)