qf/quakeforge
0
0
Fork 0
mirror of https://git.code.sf.net/p/quake/quakeforge synced 2024-11-23 12:52:46 +00:00
Code Issues Projects Releases Packages Wiki Activity
quakeforge/libs/video/renderer/Makemodule.am

558 lines
18 KiB
Text
Raw Normal View History

[vulkan] Convert stagebuf to a ring buffer I should have known this would be necessary, but it fixes the corruption when updating the scrap.
2021-01-15 13:50:04 +00:00
include libs/video/renderer/vulkan/test/Makemodule.am
[vulkan] Add a tool for making vulkan enum tables The tables are generated from the enums pulled out of the vulkan headers using a ruamoko program (thanks to its reflection capabilities). They will be used for parsing property lists used to create render passes and pipelines.
2020-06-28 10:08:18 +00:00
include libs/video/renderer/vulkan/vkgen/Makemodule.am
[build] Move to non-recursive make There's still some cleanup to do, but everything seems to be working nicely: `make -j` works, `make distcheck` passes. There is probably plenty of bitrot in the package directories (RPM, debian), though. The vc project files have been removed since those versions are way out of date and quakeforge is pretty much dependent on gcc now anyway. Most of the old Makefile.am files are now Makemodule.am. This should allow for new Makefile.am files that allow local building (to be added on an as-needed bases). The current remaining Makefile.am files are for standalone sub-projects.a The installable bins are currently built in the top-level build directory. This may change if the clutter gets to be too much. While this does make a noticeable difference in build times, the main reason for the switch was to take care of the growing dependency issues: now it's possible to build tools for code generation (eg, using qfcc and ruamoko programs for code-gen).
2020-06-21 14:15:17 +00:00
#lib_LTLIBRARIES += @VID_REND_TARGETS@
plugin_LTLIBRARIES += @vid_render_plugins@
[build] Create static libs for render targets The static libs are used to build the plugins, but make it easy to use only those modules needed for tests. Fixes the link error when running "make check" with non-static plugins.
2021-03-03 04:04:26 +00:00
noinst_LTLIBRARIES += \
libs/video/renderer/libQFrenderer.la \
@render_libs@ \
@vid_render_static_plugins@
[build] Move to non-recursive make There's still some cleanup to do, but everything seems to be working nicely: `make -j` works, `make distcheck` passes. There is probably plenty of bitrot in the package directories (RPM, debian), though. The vc project files have been removed since those versions are way out of date and quakeforge is pretty much dependent on gcc now anyway. Most of the old Makefile.am files are now Makemodule.am. This should allow for new Makefile.am files that allow local building (to be added on an as-needed bases). The current remaining Makefile.am files are for standalone sub-projects.a The installable bins are currently built in the top-level build directory. This may change if the clutter gets to be too much. While this does make a noticeable difference in build times, the main reason for the switch was to take care of the growing dependency issues: now it's possible to build tools for code generation (eg, using qfcc and ruamoko programs for code-gen).
2020-06-21 14:15:17 +00:00
[build] Create static libs for render targets The static libs are used to build the plugins, but make it easy to use only those modules needed for tests. Fixes the link error when running "make check" with non-static plugins.
2021-03-03 04:04:26 +00:00
#plugins
Merge branch 'master' into vulkan
2020-06-25 05:03:52 +00:00
EXTRA_LTLIBRARIES += \
libs/video/renderer/vid_render_sw.la \
libs/video/renderer/vid_render_gl.la \
libs/video/renderer/vid_render_glsl.la \
libs/video/renderer/vid_render_vulkan.la
[build] Move to non-recursive make There's still some cleanup to do, but everything seems to be working nicely: `make -j` works, `make distcheck` passes. There is probably plenty of bitrot in the package directories (RPM, debian), though. The vc project files have been removed since those versions are way out of date and quakeforge is pretty much dependent on gcc now anyway. Most of the old Makefile.am files are now Makemodule.am. This should allow for new Makefile.am files that allow local building (to be added on an as-needed bases). The current remaining Makefile.am files are for standalone sub-projects.a The installable bins are currently built in the top-level build directory. This may change if the clutter gets to be too much. While this does make a noticeable difference in build times, the main reason for the switch was to take care of the growing dependency issues: now it's possible to build tools for code generation (eg, using qfcc and ruamoko programs for code-gen).
2020-06-21 14:15:17 +00:00
[build] Create static libs for render targets The static libs are used to build the plugins, but make it easy to use only those modules needed for tests. Fixes the link error when running "make check" with non-static plugins.
2021-03-03 04:04:26 +00:00
#helper libraries
EXTRA_LTLIBRARIES += \
libs/video/renderer/librender_sw.la \
libs/video/renderer/librender_gl.la \
libs/video/renderer/librender_glsl.la \
libs/video/renderer/librender_vulkan.la
Merge branch 'master' into vulkan
2020-06-25 05:03:52 +00:00
video_renderer_common_sources = \
libs/video/renderer/crosshair.c \
[renderer] Add a default 8x8 font It is not compatible with the quake charset (it's the IBM charset). The data is a simple bitmap but a converter to quake pic format is provided.
2021-01-08 05:37:52 +00:00
libs/video/renderer/font8x8.c \
Merge branch 'master' into vulkan
2020-06-25 05:03:52 +00:00
libs/video/renderer/noisetextures.c \
libs/video/renderer/r_alias.c \
[renderer] Merge sprite billboarding code As the sw renderer's implementation was the closest to id's, it was used as the model (thus a fair bit of cleanup is still needed). This fixes some incorrect implementations in glsl and gl.
2021-12-10 05:34:04 +00:00
libs/video/renderer/r_billboard.c \
Merge branch 'master' into vulkan
2020-06-25 05:03:52 +00:00
libs/video/renderer/r_dyn_textures.c \
libs/video/renderer/r_ent.c \
libs/video/renderer/r_iqm.c \
[renderer] Start merging sprite frame calculation This covers gl and sw. sw32 should be trivial (just haven't done it), but glsl will take a little. Vulkan will use it.
2021-12-14 16:18:02 +00:00
libs/video/renderer/r_sprite.c \
Merge branch 'master' into vulkan
2020-06-25 05:03:52 +00:00
libs/video/renderer/vid_common.c
[build] Move to non-recursive make There's still some cleanup to do, but everything seems to be working nicely: `make -j` works, `make distcheck` passes. There is probably plenty of bitrot in the package directories (RPM, debian), though. The vc project files have been removed since those versions are way out of date and quakeforge is pretty much dependent on gcc now anyway. Most of the old Makefile.am files are now Makemodule.am. This should allow for new Makefile.am files that allow local building (to be added on an as-needed bases). The current remaining Makefile.am files are for standalone sub-projects.a The installable bins are currently built in the top-level build directory. This may change if the clutter gets to be too much. While this does make a noticeable difference in build times, the main reason for the switch was to take care of the growing dependency issues: now it's possible to build tools for code generation (eg, using qfcc and ruamoko programs for code-gen).
2020-06-21 14:15:17 +00:00
renderer_libs= \
@vid_render_static_plugin_libs@ \
[renderer] Correct freetype and harfbuzz lib linking renderer_libs was in both LIBADD and DEPENDENCIES, so make was trying to build the freetype and harfbuzz libs when building for windows.
2022-09-13 08:38:58 +00:00
libs/util/libQFutil.la
renderer_libadd= \
[renderer] Switch to using HarfBuzz for glyph positioning This means that QF should support more exotic fonts without any issue (once the rest of the text handling system is up to snuff) as HarfBuzz does all the hard work of handling OpenType, Graphite, etc text shaping, including kerning (when enabled). Also, font loading now loads all the glyphs into the atlas (preload is gone).
2022-09-04 11:56:38 +00:00
$(FREETYPE_LIBS) \
$(HARFBUZZ_LIBS)
[build] Move to non-recursive make There's still some cleanup to do, but everything seems to be working nicely: `make -j` works, `make distcheck` passes. There is probably plenty of bitrot in the package directories (RPM, debian), though. The vc project files have been removed since those versions are way out of date and quakeforge is pretty much dependent on gcc now anyway. Most of the old Makefile.am files are now Makemodule.am. This should allow for new Makefile.am files that allow local building (to be added on an as-needed bases). The current remaining Makefile.am files are for standalone sub-projects.a The installable bins are currently built in the top-level build directory. This may change if the clutter gets to be too much. While this does make a noticeable difference in build times, the main reason for the switch was to take care of the growing dependency issues: now it's possible to build tools for code generation (eg, using qfcc and ruamoko programs for code-gen).
2020-06-21 14:15:17 +00:00
libs_video_renderer_libQFrenderer_la_LDFLAGS= @STATIC@
[renderer] Link plugins against external libraries With the addition of dependencies on freetype and harfbuzz, it became clear that the renderer plugins need to be explicitly linked against external dependencies (and that I need to do more installed testing, rather than just my static local builds). This fixes the unresolved symbols when attempting to load any of the plugins.
2022-09-22 06:05:49 +00:00
libs_video_renderer_libQFrenderer_la_LIBADD=\
$(renderer_libs) \
$(renderer_libadd)
[build] Move to non-recursive make There's still some cleanup to do, but everything seems to be working nicely: `make -j` works, `make distcheck` passes. There is probably plenty of bitrot in the package directories (RPM, debian), though. The vc project files have been removed since those versions are way out of date and quakeforge is pretty much dependent on gcc now anyway. Most of the old Makefile.am files are now Makemodule.am. This should allow for new Makefile.am files that allow local building (to be added on an as-needed bases). The current remaining Makefile.am files are for standalone sub-projects.a The installable bins are currently built in the top-level build directory. This may change if the clutter gets to be too much. While this does make a noticeable difference in build times, the main reason for the switch was to take care of the growing dependency issues: now it's possible to build tools for code generation (eg, using qfcc and ruamoko programs for code-gen).
2020-06-21 14:15:17 +00:00
libs_video_renderer_libQFrenderer_la_DEPENDENCIES= $(renderer_libs)
libs_video_renderer_libQFrenderer_la_SOURCES=\
[renderer] Move most of the scene rendering into r_screen r_screen isn't really the right place, but it gets the scene rendering out of the low-level renderers and will make it easier to sort out later, and hopefully easier to figure out a good design for vulkan.
2022-03-17 08:50:38 +00:00
libs/video/renderer/r_bsp.c \
[renderer] Move r_screen and r_cvar into main bin r_screen because of SCR_UpdateScreen, and r_cvar because the cvars really should never have been in a plugin in the first place (and r_screen needed access).
2021-01-12 07:14:46 +00:00
libs/video/renderer/r_cvar.c \
[renderer] Add a cell-based character buffer This is intended for the built-in 8x8 bitmap characters and quake's "conchars", but could potentially be used for any simple (non-composed characters) mono-spaced font. Currently, the buffers can be created, destroyed, cleared, scrolled vertically in either direction, and rendered to the screen in a single blast. One of the reasons for creating the buffer is to make it so scaling can be supported in the sw renderer.
2022-09-15 05:24:33 +00:00
libs/video/renderer/r_draw.c \
[renderer] Merge the fog support code GL still has its own functions for enabling and disabling fog while rendering, but GLSL doesn't need such (thanks to the shaders), nor will vulkan (and the software renderers don't support fog).
2022-03-07 17:10:47 +00:00
libs/video/renderer/r_fog.c \
[renderer] Fix non-static linking of graph code Obviously forgot to test the changes I made to graph rendering in non-static builds. Oops :P
2022-03-17 01:51:29 +00:00
libs/video/renderer/r_graph.c \
[build] Move to non-recursive make There's still some cleanup to do, but everything seems to be working nicely: `make -j` works, `make distcheck` passes. There is probably plenty of bitrot in the package directories (RPM, debian), though. The vc project files have been removed since those versions are way out of date and quakeforge is pretty much dependent on gcc now anyway. Most of the old Makefile.am files are now Makemodule.am. This should allow for new Makefile.am files that allow local building (to be added on an as-needed bases). The current remaining Makefile.am files are for standalone sub-projects.a The installable bins are currently built in the top-level build directory. This may change if the clutter gets to be too much. While this does make a noticeable difference in build times, the main reason for the switch was to take care of the growing dependency issues: now it's possible to build tools for code generation (eg, using qfcc and ruamoko programs for code-gen).
2020-06-21 14:15:17 +00:00
libs/video/renderer/r_init.c \
[renderer] Move some functions from plugins to main lib One step in cleaning up vid_render_funcs.
2022-03-07 04:40:04 +00:00
libs/video/renderer/r_light.c \
libs/video/renderer/r_main.c \
[renderer] Move most of the scene rendering into r_screen r_screen isn't really the right place, but it gets the scene rendering out of the low-level renderers and will make it easier to sort out later, and hopefully easier to figure out a good design for vulkan.
2022-03-17 08:50:38 +00:00
libs/video/renderer/r_part.c \
[renderer] Move core of scrap into shared code The actual 2d area management code is now shared, with the actual definition for scrap_t being left to the renderer specific implementation.
2021-01-12 12:10:22 +00:00
libs/video/renderer/r_scrap.c \
[renderer] Move r_screen and r_cvar into main bin r_screen because of SCR_UpdateScreen, and r_cvar because the cvars really should never have been in a plugin in the first place (and r_screen needed access).
2021-01-12 07:14:46 +00:00
libs/video/renderer/r_screen.c \
[build] Move to non-recursive make There's still some cleanup to do, but everything seems to be working nicely: `make -j` works, `make distcheck` passes. There is probably plenty of bitrot in the package directories (RPM, debian), though. The vc project files have been removed since those versions are way out of date and quakeforge is pretty much dependent on gcc now anyway. Most of the old Makefile.am files are now Makemodule.am. This should allow for new Makefile.am files that allow local building (to be added on an as-needed bases). The current remaining Makefile.am files are for standalone sub-projects.a The installable bins are currently built in the top-level build directory. This may change if the clutter gets to be too much. While this does make a noticeable difference in build times, the main reason for the switch was to take care of the growing dependency issues: now it's possible to build tools for code generation (eg, using qfcc and ruamoko programs for code-gen).
2020-06-21 14:15:17 +00:00
libs/video/renderer/r_progs.c
video_renderer_gl_libs= \
[build] Create static libs for render targets The static libs are used to build the plugins, but make it easy to use only those modules needed for tests. Fixes the link error when running "make check" with non-static plugins.
2021-03-03 04:04:26 +00:00
libs/video/renderer/librender_gl.la \
[build] Move to non-recursive make There's still some cleanup to do, but everything seems to be working nicely: `make -j` works, `make distcheck` passes. There is probably plenty of bitrot in the package directories (RPM, debian), though. The vc project files have been removed since those versions are way out of date and quakeforge is pretty much dependent on gcc now anyway. Most of the old Makefile.am files are now Makemodule.am. This should allow for new Makefile.am files that allow local building (to be added on an as-needed bases). The current remaining Makefile.am files are for standalone sub-projects.a The installable bins are currently built in the top-level build directory. This may change if the clutter gets to be too much. While this does make a noticeable difference in build times, the main reason for the switch was to take care of the growing dependency issues: now it's possible to build tools for code generation (eg, using qfcc and ruamoko programs for code-gen).
2020-06-21 14:15:17 +00:00
libs/models/libmodels_gl.la
libs_video_renderer_vid_render_gl_la_LDFLAGS= $(plugin_ldflags)
[renderer] Link plugins against external libraries With the addition of dependencies on freetype and harfbuzz, it became clear that the renderer plugins need to be explicitly linked against external dependencies (and that I need to do more installed testing, rather than just my static local builds). This fixes the unresolved symbols when attempting to load any of the plugins.
2022-09-22 06:05:49 +00:00
libs_video_renderer_vid_render_gl_la_LIBADD=\
$(video_renderer_gl_libs) \
$(renderer_libadd)
[build] Move to non-recursive make There's still some cleanup to do, but everything seems to be working nicely: `make -j` works, `make distcheck` passes. There is probably plenty of bitrot in the package directories (RPM, debian), though. The vc project files have been removed since those versions are way out of date and quakeforge is pretty much dependent on gcc now anyway. Most of the old Makefile.am files are now Makemodule.am. This should allow for new Makefile.am files that allow local building (to be added on an as-needed bases). The current remaining Makefile.am files are for standalone sub-projects.a The installable bins are currently built in the top-level build directory. This may change if the clutter gets to be too much. While this does make a noticeable difference in build times, the main reason for the switch was to take care of the growing dependency issues: now it's possible to build tools for code generation (eg, using qfcc and ruamoko programs for code-gen).
2020-06-21 14:15:17 +00:00
libs_video_renderer_vid_render_gl_la_DEPENDENCIES= $(video_renderer_gl_libs)
libs_video_renderer_vid_render_gl_la_SOURCES=\
$(video_renderer_common_sources) \
[build] Create static libs for render targets The static libs are used to build the plugins, but make it easy to use only those modules needed for tests. Fixes the link error when running "make check" with non-static plugins.
2021-03-03 04:04:26 +00:00
libs/video/renderer/vid_render_gl.c
libs_video_renderer_librender_gl_la_SOURCES = \
[build] Move to non-recursive make There's still some cleanup to do, but everything seems to be working nicely: `make -j` works, `make distcheck` passes. There is probably plenty of bitrot in the package directories (RPM, debian), though. The vc project files have been removed since those versions are way out of date and quakeforge is pretty much dependent on gcc now anyway. Most of the old Makefile.am files are now Makemodule.am. This should allow for new Makefile.am files that allow local building (to be added on an as-needed bases). The current remaining Makefile.am files are for standalone sub-projects.a The installable bins are currently built in the top-level build directory. This may change if the clutter gets to be too much. While this does make a noticeable difference in build times, the main reason for the switch was to take care of the growing dependency issues: now it's possible to build tools for code generation (eg, using qfcc and ruamoko programs for code-gen).
2020-06-21 14:15:17 +00:00
libs/video/renderer/gl/gl_draw.c \
libs/video/renderer/gl/gl_dyn_lights.c \
libs/video/renderer/gl/gl_dyn_part.c \
libs/video/renderer/gl/gl_dyn_textures.c \
[gl] Get fisheye working with frame buffers Of course, it's not as correct as glsl or sw due to using polygons and uvs rather than a fragment shader (not that such is out of the question since GL 3.0 is requested, but I don't feel like getting shaders going just for a couple of post-processing effects in an obsolete renderer).
2022-03-26 03:08:06 +00:00
libs/video/renderer/gl/gl_fisheye.c \
[build] Move to non-recursive make There's still some cleanup to do, but everything seems to be working nicely: `make -j` works, `make distcheck` passes. There is probably plenty of bitrot in the package directories (RPM, debian), though. The vc project files have been removed since those versions are way out of date and quakeforge is pretty much dependent on gcc now anyway. Most of the old Makefile.am files are now Makemodule.am. This should allow for new Makefile.am files that allow local building (to be added on an as-needed bases). The current remaining Makefile.am files are for standalone sub-projects.a The installable bins are currently built in the top-level build directory. This may change if the clutter gets to be too much. While this does make a noticeable difference in build times, the main reason for the switch was to take care of the growing dependency issues: now it's possible to build tools for code generation (eg, using qfcc and ruamoko programs for code-gen).
2020-06-21 14:15:17 +00:00
libs/video/renderer/gl/gl_fog.c \
libs/video/renderer/gl/gl_graph.c \
libs/video/renderer/gl/gl_lightmap.c \
libs/video/renderer/gl/gl_mod_alias.c \
libs/video/renderer/gl/gl_mod_iqm.c \
libs/video/renderer/gl/gl_mod_sprite.c \
libs/video/renderer/gl/gl_rmain.c \
libs/video/renderer/gl/gl_rmisc.c \
libs/video/renderer/gl/gl_rsurf.c \
libs/video/renderer/gl/gl_sky.c \
libs/video/renderer/gl/gl_sky_clip.c \
libs/video/renderer/gl/gl_textures.c \
libs/video/renderer/gl/gl_warp.c \
libs/video/renderer/gl/qfgl_ext.c \
libs/video/renderer/gl/vid_common_gl.c \
libs/video/renderer/gl/vtxarray.c
shader_src= libs/video/renderer/glsl/quakeforge.glsl
shader_gen= libs/video/renderer/glsl/quakeforge.slc
[vulkan] Add support for IQM models Despite the base IQM specification not supporting blend-shapes, I think IQM will become the basis for QF's generic model representation (at least for the more advanced renderers). After my experience with .mu models (KSP) and unity mesh objects (both normal and skinned), and reviewing the IQM spec, it looks like with the addition of support for blend-shapes, IQM is actually pretty good. This is just the preliminary work to get standard IQM models loading in vulkan (seems to work, along with unloading), and they very basics into the renderer (most likely not working: not tested yet). The rest of the renderer seems to be unaffected, though, which is good.
2022-05-04 05:07:27 +00:00
SUFFIXES += .frag .vert .spv .spvc .fc .vc .slc .glsl
[build] Move to non-recursive make There's still some cleanup to do, but everything seems to be working nicely: `make -j` works, `make distcheck` passes. There is probably plenty of bitrot in the package directories (RPM, debian), though. The vc project files have been removed since those versions are way out of date and quakeforge is pretty much dependent on gcc now anyway. Most of the old Makefile.am files are now Makemodule.am. This should allow for new Makefile.am files that allow local building (to be added on an as-needed bases). The current remaining Makefile.am files are for standalone sub-projects.a The installable bins are currently built in the top-level build directory. This may change if the clutter gets to be too much. While this does make a noticeable difference in build times, the main reason for the switch was to take care of the growing dependency issues: now it's possible to build tools for code generation (eg, using qfcc and ruamoko programs for code-gen).
2020-06-21 14:15:17 +00:00
.glsl.slc:
[build] Support silent rules for sed
2020-07-16 16:20:02 +00:00
$(V_SED)sed -e 's/^/"/' -e 's/$$/\\n"/' $< > $@.t &&\
$(am__mv) $@.t $@
[build] Move to non-recursive make There's still some cleanup to do, but everything seems to be working nicely: `make -j` works, `make distcheck` passes. There is probably plenty of bitrot in the package directories (RPM, debian), though. The vc project files have been removed since those versions are way out of date and quakeforge is pretty much dependent on gcc now anyway. Most of the old Makefile.am files are now Makemodule.am. This should allow for new Makefile.am files that allow local building (to be added on an as-needed bases). The current remaining Makefile.am files are for standalone sub-projects.a The installable bins are currently built in the top-level build directory. This may change if the clutter gets to be too much. While this does make a noticeable difference in build times, the main reason for the switch was to take care of the growing dependency issues: now it's possible to build tools for code generation (eg, using qfcc and ruamoko programs for code-gen).
2020-06-21 14:15:17 +00:00
video_renderer_glsl_libs= \
[build] Create static libs for render targets The static libs are used to build the plugins, but make it easy to use only those modules needed for tests. Fixes the link error when running "make check" with non-static plugins.
2021-03-03 04:04:26 +00:00
libs/video/renderer/librender_glsl.la \
[build] Move to non-recursive make There's still some cleanup to do, but everything seems to be working nicely: `make -j` works, `make distcheck` passes. There is probably plenty of bitrot in the package directories (RPM, debian), though. The vc project files have been removed since those versions are way out of date and quakeforge is pretty much dependent on gcc now anyway. Most of the old Makefile.am files are now Makemodule.am. This should allow for new Makefile.am files that allow local building (to be added on an as-needed bases). The current remaining Makefile.am files are for standalone sub-projects.a The installable bins are currently built in the top-level build directory. This may change if the clutter gets to be too much. While this does make a noticeable difference in build times, the main reason for the switch was to take care of the growing dependency issues: now it's possible to build tools for code generation (eg, using qfcc and ruamoko programs for code-gen).
2020-06-21 14:15:17 +00:00
libs/models/libmodels_glsl.la
libs_video_renderer_vid_render_glsl_la_LDFLAGS= $(plugin_ldflags)
[renderer] Link plugins against external libraries With the addition of dependencies on freetype and harfbuzz, it became clear that the renderer plugins need to be explicitly linked against external dependencies (and that I need to do more installed testing, rather than just my static local builds). This fixes the unresolved symbols when attempting to load any of the plugins.
2022-09-22 06:05:49 +00:00
libs_video_renderer_vid_render_glsl_la_LIBADD=\
$(video_renderer_glsl_libs) \
$(renderer_libadd)
[build] Move to non-recursive make There's still some cleanup to do, but everything seems to be working nicely: `make -j` works, `make distcheck` passes. There is probably plenty of bitrot in the package directories (RPM, debian), though. The vc project files have been removed since those versions are way out of date and quakeforge is pretty much dependent on gcc now anyway. Most of the old Makefile.am files are now Makemodule.am. This should allow for new Makefile.am files that allow local building (to be added on an as-needed bases). The current remaining Makefile.am files are for standalone sub-projects.a The installable bins are currently built in the top-level build directory. This may change if the clutter gets to be too much. While this does make a noticeable difference in build times, the main reason for the switch was to take care of the growing dependency issues: now it's possible to build tools for code generation (eg, using qfcc and ruamoko programs for code-gen).
2020-06-21 14:15:17 +00:00
libs_video_renderer_vid_render_glsl_la_DEPENDENCIES=$(video_renderer_glsl_libs)
libs_video_renderer_vid_render_glsl_la_SOURCES=\
$(video_renderer_common_sources) \
[build] Create static libs for render targets The static libs are used to build the plugins, but make it easy to use only those modules needed for tests. Fixes the link error when running "make check" with non-static plugins.
2021-03-03 04:04:26 +00:00
libs/video/renderer/vid_render_glsl.c
libs_video_renderer_librender_glsl_la_SOURCES = \
[build] Move to non-recursive make There's still some cleanup to do, but everything seems to be working nicely: `make -j` works, `make distcheck` passes. There is probably plenty of bitrot in the package directories (RPM, debian), though. The vc project files have been removed since those versions are way out of date and quakeforge is pretty much dependent on gcc now anyway. Most of the old Makefile.am files are now Makemodule.am. This should allow for new Makefile.am files that allow local building (to be added on an as-needed bases). The current remaining Makefile.am files are for standalone sub-projects.a The installable bins are currently built in the top-level build directory. This may change if the clutter gets to be too much. While this does make a noticeable difference in build times, the main reason for the switch was to take care of the growing dependency issues: now it's possible to build tools for code generation (eg, using qfcc and ruamoko programs for code-gen).
2020-06-21 14:15:17 +00:00
libs/video/renderer/glsl/glsl_alias.c \
libs/video/renderer/glsl/glsl_bsp.c \
libs/video/renderer/glsl/glsl_draw.c \
[glsl] Implement fisheye rendering The code dealing with state is a bit of a mess, but everything is working nicely. Get around 400fps when all 6 faces need to be rendered (no surprise: it should be about 1/6 of that for normal rendering). The messy state handling code did not come as a surprise as I suspected there were various mistakes in my scene rendering "recipe", and fisheye highlighted them nicely (I'm sure getting this stuff working in Vulkan will highlight even more issues).
2022-03-25 03:22:16 +00:00
libs/video/renderer/glsl/glsl_fisheye.c \
[build] Move to non-recursive make There's still some cleanup to do, but everything seems to be working nicely: `make -j` works, `make distcheck` passes. There is probably plenty of bitrot in the package directories (RPM, debian), though. The vc project files have been removed since those versions are way out of date and quakeforge is pretty much dependent on gcc now anyway. Most of the old Makefile.am files are now Makemodule.am. This should allow for new Makefile.am files that allow local building (to be added on an as-needed bases). The current remaining Makefile.am files are for standalone sub-projects.a The installable bins are currently built in the top-level build directory. This may change if the clutter gets to be too much. While this does make a noticeable difference in build times, the main reason for the switch was to take care of the growing dependency issues: now it's possible to build tools for code generation (eg, using qfcc and ruamoko programs for code-gen).
2020-06-21 14:15:17 +00:00
libs/video/renderer/glsl/glsl_iqm.c \
libs/video/renderer/glsl/glsl_lightmap.c \
libs/video/renderer/glsl/glsl_main.c \
libs/video/renderer/glsl/glsl_particles.c \
libs/video/renderer/glsl/glsl_shader.c \
libs/video/renderer/glsl/glsl_sprite.c \
libs/video/renderer/glsl/glsl_textures.c \
[glsl] Implement screen warp when in liquids Finally, after a decade :P Looks pretty good, too, and is (almost) properly scaled to the resolution (almost because the effect is a little squashed, but I think the sw renderer does the same).
2022-03-24 16:24:38 +00:00
libs/video/renderer/glsl/glsl_warp.c \
[build] Move to non-recursive make There's still some cleanup to do, but everything seems to be working nicely: `make -j` works, `make distcheck` passes. There is probably plenty of bitrot in the package directories (RPM, debian), though. The vc project files have been removed since those versions are way out of date and quakeforge is pretty much dependent on gcc now anyway. Most of the old Makefile.am files are now Makemodule.am. This should allow for new Makefile.am files that allow local building (to be added on an as-needed bases). The current remaining Makefile.am files are for standalone sub-projects.a The installable bins are currently built in the top-level build directory. This may change if the clutter gets to be too much. While this does make a noticeable difference in build times, the main reason for the switch was to take care of the growing dependency issues: now it's possible to build tools for code generation (eg, using qfcc and ruamoko programs for code-gen).
2020-06-21 14:15:17 +00:00
libs/video/renderer/glsl/qfglsl.c \
libs/video/renderer/glsl/quakeforge.glsl \
libs/video/renderer/glsl/vid_common_glsl.c
video_renderer_sw_libs= \
[build] Create static libs for render targets The static libs are used to build the plugins, but make it easy to use only those modules needed for tests. Fixes the link error when running "make check" with non-static plugins.
2021-03-03 04:04:26 +00:00
libs/video/renderer/librender_sw.la \
[build] Move to non-recursive make There's still some cleanup to do, but everything seems to be working nicely: `make -j` works, `make distcheck` passes. There is probably plenty of bitrot in the package directories (RPM, debian), though. The vc project files have been removed since those versions are way out of date and quakeforge is pretty much dependent on gcc now anyway. Most of the old Makefile.am files are now Makemodule.am. This should allow for new Makefile.am files that allow local building (to be added on an as-needed bases). The current remaining Makefile.am files are for standalone sub-projects.a The installable bins are currently built in the top-level build directory. This may change if the clutter gets to be too much. While this does make a noticeable difference in build times, the main reason for the switch was to take care of the growing dependency issues: now it's possible to build tools for code generation (eg, using qfcc and ruamoko programs for code-gen).
2020-06-21 14:15:17 +00:00
libs/models/libmodels_sw.la
libs_video_renderer_vid_render_sw_la_LDFLAGS= $(plugin_ldflags)
[renderer] Link plugins against external libraries With the addition of dependencies on freetype and harfbuzz, it became clear that the renderer plugins need to be explicitly linked against external dependencies (and that I need to do more installed testing, rather than just my static local builds). This fixes the unresolved symbols when attempting to load any of the plugins.
2022-09-22 06:05:49 +00:00
libs_video_renderer_vid_render_sw_la_LIBADD=\
$(video_renderer_sw_libs) \
$(renderer_libadd)
[build] Move to non-recursive make There's still some cleanup to do, but everything seems to be working nicely: `make -j` works, `make distcheck` passes. There is probably plenty of bitrot in the package directories (RPM, debian), though. The vc project files have been removed since those versions are way out of date and quakeforge is pretty much dependent on gcc now anyway. Most of the old Makefile.am files are now Makemodule.am. This should allow for new Makefile.am files that allow local building (to be added on an as-needed bases). The current remaining Makefile.am files are for standalone sub-projects.a The installable bins are currently built in the top-level build directory. This may change if the clutter gets to be too much. While this does make a noticeable difference in build times, the main reason for the switch was to take care of the growing dependency issues: now it's possible to build tools for code generation (eg, using qfcc and ruamoko programs for code-gen).
2020-06-21 14:15:17 +00:00
libs_video_renderer_vid_render_sw_la_DEPENDENCIES= $(video_renderer_sw_libs)
libs_video_renderer_vid_render_sw_la_SOURCES=\
$(video_renderer_common_sources) \
[build] Create static libs for render targets The static libs are used to build the plugins, but make it easy to use only those modules needed for tests. Fixes the link error when running "make check" with non-static plugins.
2021-03-03 04:04:26 +00:00
libs/video/renderer/vid_render_sw.c
libs_video_renderer_librender_sw_la_SOURCES = \
[build] Move to non-recursive make There's still some cleanup to do, but everything seems to be working nicely: `make -j` works, `make distcheck` passes. There is probably plenty of bitrot in the package directories (RPM, debian), though. The vc project files have been removed since those versions are way out of date and quakeforge is pretty much dependent on gcc now anyway. Most of the old Makefile.am files are now Makemodule.am. This should allow for new Makefile.am files that allow local building (to be added on an as-needed bases). The current remaining Makefile.am files are for standalone sub-projects.a The installable bins are currently built in the top-level build directory. This may change if the clutter gets to be too much. While this does make a noticeable difference in build times, the main reason for the switch was to take care of the growing dependency issues: now it's possible to build tools for code generation (eg, using qfcc and ruamoko programs for code-gen).
2020-06-21 14:15:17 +00:00
libs/video/renderer/sw/d_copy.S \
libs/video/renderer/sw/d_draw.S \
libs/video/renderer/sw/d_edge.c \
libs/video/renderer/sw/d_init.c \
libs/video/renderer/sw/d_modech.c \
libs/video/renderer/sw/d_part.c \
libs/video/renderer/sw/d_parta.S \
libs/video/renderer/sw/d_polysa.S \
libs/video/renderer/sw/d_polyse.c \
libs/video/renderer/sw/d_scan.c \
libs/video/renderer/sw/d_scana.S \
libs/video/renderer/sw/d_sky.c \
libs/video/renderer/sw/d_spr8.S \
libs/video/renderer/sw/d_sprite.c \
libs/video/renderer/sw/d_surf.c \
libs/video/renderer/sw/d_vars.c \
libs/video/renderer/sw/d_varsa.S \
libs/video/renderer/sw/d_zpoint.c \
libs/video/renderer/sw/draw.c \
libs/video/renderer/sw/fpu.c \
libs/video/renderer/sw/fpua.S \
libs/video/renderer/sw/nonintel.c \
libs/video/renderer/sw/surf8.S \
[renderer] Get sw fisheye working again Again, gl/vulkan not working yet (on the assumption that sw would be trickier). Fisheye overrides water warp because updating the projection map every frame is far too expensive. I've added a post-process pass to the interface in order to hide the implementation details, but I'm not sure I'm happy about how the multi-pass rendering for cube maps is handled (or having the frame buffers as exposed as they are), but mainly because Vulkan will make implementation interesting.
2022-03-24 06:45:01 +00:00
libs/video/renderer/sw/sw_fisheye.c \
[build] Move to non-recursive make There's still some cleanup to do, but everything seems to be working nicely: `make -j` works, `make distcheck` passes. There is probably plenty of bitrot in the package directories (RPM, debian), though. The vc project files have been removed since those versions are way out of date and quakeforge is pretty much dependent on gcc now anyway. Most of the old Makefile.am files are now Makemodule.am. This should allow for new Makefile.am files that allow local building (to be added on an as-needed bases). The current remaining Makefile.am files are for standalone sub-projects.a The installable bins are currently built in the top-level build directory. This may change if the clutter gets to be too much. While this does make a noticeable difference in build times, the main reason for the switch was to take care of the growing dependency issues: now it's possible to build tools for code generation (eg, using qfcc and ruamoko programs for code-gen).
2020-06-21 14:15:17 +00:00
libs/video/renderer/sw/sw_graph.c \
libs/video/renderer/sw/sw_raclip.c \
libs/video/renderer/sw/sw_raclipa.S \
libs/video/renderer/sw/sw_ralias.c \
libs/video/renderer/sw/sw_raliasa.S \
libs/video/renderer/sw/sw_rbsp.c \
libs/video/renderer/sw/sw_rdraw.c \
libs/video/renderer/sw/sw_rdrawa.S \
libs/video/renderer/sw/sw_redge.c \
libs/video/renderer/sw/sw_redgea.S \
libs/video/renderer/sw/sw_riqm.c \
libs/video/renderer/sw/sw_rmain.c \
libs/video/renderer/sw/sw_rmisc.c \
libs/video/renderer/sw/sw_rpart.c \
libs/video/renderer/sw/sw_rsky.c \
libs/video/renderer/sw/sw_rsprite.c \
libs/video/renderer/sw/sw_rsurf.c \
libs/video/renderer/sw/sw_rvarsa.S \
libs/video/renderer/sw/transform.S \
libs/video/renderer/sw/vid_common_sw.c
[vulkan] Attempt to load the render info spec It fails due to not supporting labeled arrays yet. I'm currently thinking about the design for vkgen.
2023-02-10 02:04:11 +00:00
rp_main_def_src = libs/video/renderer/vulkan/rp_main_def.plist
rp_main_def_gen = libs/video/renderer/vulkan/rp_main_def.plc
[vulkan] Clean up the sampler config loading Samplers have no direct relation to render passes or pipelines, so should not necessarily be in the same config file. This makes all the old config files obsolete, and quite a bit of support code in vkparse.c.
2023-06-25 14:33:47 +00:00
smp_quake_src = libs/video/renderer/vulkan/smp_quake.plist
smp_quake_gen = libs/video/renderer/vulkan/smp_quake.plc
[vulkan] Start work on scripted pipeline Nothing is actually done yet other than parsing the built-in property list to property list items (the actual parser is just a skeleton), but everything compiles
2020-07-16 06:42:49 +00:00
[model] Build vulkan model libs The contents are currently empty (required .c files), but this gets the build system updated.
2021-01-19 04:53:08 +00:00
video_renderer_vulkan_libs = \
[build] Create static libs for render targets The static libs are used to build the plugins, but make it easy to use only those modules needed for tests. Fixes the link error when running "make check" with non-static plugins.
2021-03-03 04:04:26 +00:00
libs/video/renderer/librender_vulkan.la \
[model] Build vulkan model libs The contents are currently empty (required .c files), but this gets the build system updated.
2021-01-19 04:53:08 +00:00
libs/models/libmodels_vulkan.la
Merge branch 'master' into vulkan
2020-06-25 05:03:52 +00:00
libs_video_renderer_vid_render_vulkan_la_LDFLAGS= $(plugin_ldflags)
[renderer] Link plugins against external libraries With the addition of dependencies on freetype and harfbuzz, it became clear that the renderer plugins need to be explicitly linked against external dependencies (and that I need to do more installed testing, rather than just my static local builds). This fixes the unresolved symbols when attempting to load any of the plugins.
2022-09-22 06:05:49 +00:00
libs_video_renderer_vid_render_vulkan_la_LIBADD=\
$(video_renderer_vulkan_libs) \
$(renderer_libadd)
[model] Build vulkan model libs The contents are currently empty (required .c files), but this gets the build system updated.
2021-01-19 04:53:08 +00:00
libs_video_renderer_vid_render_vulkan_la_DEPENDENCIES=$(video_renderer_vulkan_libs)
Merge branch 'master' into vulkan
2020-06-25 05:03:52 +00:00
libs_video_renderer_vid_render_vulkan_la_SOURCES = \
[vulkan] Make a start on the 2D pipeline Short wrappers for Draw functins are in vid_render_vulkan.c so the vulkan context can be passed on to the actual functions. The 2D shaders are set up similar to those in glsl, but with full 32-bit color (rgba) support instead of paletted. However, the textures are not loaded yet, nor is anything bound.
2021-01-10 06:52:27 +00:00
$(video_renderer_common_sources) \
[build] Create static libs for render targets The static libs are used to build the plugins, but make it easy to use only those modules needed for tests. Fixes the link error when running "make check" with non-static plugins.
2021-03-03 04:04:26 +00:00
libs/video/renderer/vid_render_vulkan.c
libs_video_renderer_librender_vulkan_la_SOURCES = \
[vulkan] Create a staging buffer struct And move the barrier prefabs into a more convenient place.
2021-01-10 16:24:15 +00:00
libs/video/renderer/vulkan/barrier.c \
Merge branch 'master' into vulkan
2020-06-25 05:03:52 +00:00
libs/video/renderer/vulkan/buffer.c \
libs/video/renderer/vulkan/command.c \
[vulkan] Implement screenshot Finally, I can brag about my progress on irc :)
2021-03-24 10:20:53 +00:00
libs/video/renderer/vulkan/capture.c \
[vulkan] Label renderpass and subpass sections This makes finding the relevant commands in render doc much much easier.
2022-05-07 03:38:31 +00:00
libs/video/renderer/vulkan/debug.c \
Merge branch 'master' into vulkan
2020-06-25 05:03:52 +00:00
libs/video/renderer/vulkan/descriptor.c \
libs/video/renderer/vulkan/device.c \
[vulkan] Create a descriptor set manager The manager allows recycling of descriptor sets and takes care of creating pools as needed.
2023-06-24 05:55:46 +00:00
libs/video/renderer/vulkan/dsmanager.c \
Merge branch 'master' into vulkan
2020-06-25 05:03:52 +00:00
libs/video/renderer/vulkan/image.c \
libs/video/renderer/vulkan/instance.c \
libs/video/renderer/vulkan/memory.c \
libs/video/renderer/vulkan/pipeline.c \
[vulkan] Move projection matrix code to its own file And move more stuff over to simd.
2021-04-25 06:47:50 +00:00
libs/video/renderer/vulkan/projection.c \
[vulkan] Generate parse data for new render pass structs There's still a lot of work to do, but the basics are in. The spec will be parsed into info structs that can then be further processed to generate all the actual structs, generally making things a little less timing dependent (eg, image view info refers to its image by name). The new render pass and subpass structs have their names mangled for now until I can switch over to the new system.
2023-02-09 05:52:43 +00:00
libs/video/renderer/vulkan/render.c \
[vulkan] Split up render job loading and running The creation of the render jobs doesn't really belong with the running of those jobs. This makes the code a little easier to navigate as it was too easy to lost between load-time and run-time code.
2023-06-15 08:29:41 +00:00
libs/video/renderer/vulkan/render_load.c \
[vulkan] Add a mini resource subsystem The resource subsystem creates buffers, images, buffer views and image views in a single batch operation, using a single memory object to back all the buffers and images. I had been doing this by hand for a while, but got tired of jumping through all those vulkan hoops. While it's still a little tedious to set up the arrays for QFV_CreateResource (and they need to be kept around for QFV_DestroyResource), it really eases calculation of memory object size and sub-resource offsets. And destroying all the objects is just one call to QFV_DestroyResource.
2022-05-04 04:59:38 +00:00
libs/video/renderer/vulkan/resource.c \
[vulkan] Rename texture.c to scrap.c I had originally planned on mixing the stage management with general texture support code like I did in glsl, but I think that was a mistake and I did keep looking for scrap.[ch] when I wanted to edit something to do with the scrap...
2021-01-21 07:39:11 +00:00
libs/video/renderer/vulkan/scrap.c \
[vulkan] Add support for building and loading shaders Shaders can be built as spv files and installed into $libdir/quakeforge/shaders or as spvc files and compiled into the engine. Loading supports $builtin/name to access builtin shaders, $shader/path to access external standard shaders and quake filesystem access for all other paths.
2020-12-23 05:32:29 +00:00
libs/video/renderer/vulkan/shader.c \
[vulkan] Create a staging buffer struct And move the barrier prefabs into a more convenient place.
2021-01-10 16:24:15 +00:00
libs/video/renderer/vulkan/staging.c \
Merge branch 'master' into vulkan
2020-06-25 05:03:52 +00:00
libs/video/renderer/vulkan/swapchain.c \
libs/video/renderer/vulkan/util.c \
libs/video/renderer/vulkan/util.h \
[vulkan] Start work on scripted pipeline Nothing is actually done yet other than parsing the built-in property list to property list items (the actual parser is just a skeleton), but everything compiles
2020-07-16 06:42:49 +00:00
libs/video/renderer/vulkan/vkparse.c \
[vulkan] Start work on alias model rendering
2021-01-26 11:58:24 +00:00
libs/video/renderer/vulkan/vulkan_alias.c \
[vulkan] Make a lot of progress for brush models Light maps are maybe updating, but as nothing is actually rendered yet, it's hard to tell.
2021-01-19 16:25:54 +00:00
libs/video/renderer/vulkan/vulkan_bsp.c \
[vulkan] Implement lighting and compose passes Lighting doesn't actually do lights yet, but it's producing pixels. Translucent seems to be working (2d draw uses it), and compose seems to be working.
2021-02-24 10:58:31 +00:00
libs/video/renderer/vulkan/vulkan_compose.c \
Merge branch 'master' into vulkan
2020-06-25 05:03:52 +00:00
libs/video/renderer/vulkan/vulkan_draw.c \
[vulkan] Add support for IQM models Despite the base IQM specification not supporting blend-shapes, I think IQM will become the basis for QF's generic model representation (at least for the more advanced renderers). After my experience with .mu models (KSP) and unity mesh objects (both normal and skinned), and reviewing the IQM spec, it looks like with the addition of support for blend-shapes, IQM is actually pretty good. This is just the preliminary work to get standard IQM models loading in vulkan (seems to work, along with unloading), and they very basics into the renderer (most likely not working: not tested yet). The rest of the renderer seems to be unaffected, though, which is good.
2022-05-04 05:07:27 +00:00
libs/video/renderer/vulkan/vulkan_iqm.c \
[vulkan] Implement lighting and compose passes Lighting doesn't actually do lights yet, but it's producing pixels. Translucent seems to be working (2d draw uses it), and compose seems to be working.
2021-02-24 10:58:31 +00:00
libs/video/renderer/vulkan/vulkan_lighting.c \
[vulkan] Make a lot of progress for brush models Light maps are maybe updating, but as nothing is actually rendered yet, it's hard to tell.
2021-01-19 16:25:54 +00:00
libs/video/renderer/vulkan/vulkan_main.c \
[vulkan] Add some matrix buffers It seems they could all be in the one buffer: there are indications that uniform binding can be fairly fine-grained. I need to investigate that.
2021-01-12 02:26:20 +00:00
libs/video/renderer/vulkan/vulkan_matrices.c \
[vulkan] Add a module to handle output When working, this will handle the output to the swap-chain images and any final post-processing effects (gamma correction, screen scaling, etc). However, currently the screen is just black because the image for getting the main render pass output isn't hooked up yet.
2022-11-22 08:47:36 +00:00
libs/video/renderer/vulkan/vulkan_output.c \
[vulkan] Upload palette as a 16x16 image It turns out my approach to alias skin coloring just doesn't work for the quake data due to the color curves not having a linear relationship, especially the bottom colors.
2022-11-15 00:26:17 +00:00
libs/video/renderer/vulkan/vulkan_palette.c \
[renderer] Stub out all the vulkan functions nq-x11 now gets through all three demos without crashing (but without rendering anything useful, though).
2021-01-18 03:46:06 +00:00
libs/video/renderer/vulkan/vulkan_particles.c \
[vulkan] Use a buffer for entity transform and color data This allows the use of an entity id to index into the entity data and fetch the transform and colormod data in the vertex shader, thus making instanced rendering possible. Non-world brush entities are still not rendered, but the world entity is using both the entity data buffer and entid buffer.
2022-05-24 15:17:57 +00:00
libs/video/renderer/vulkan/vulkan_scene.c \
[vulkan] Implement the sprite render passes It turned out the bindless approach wouldn't work too well for my design of the sprite objects, but I don't think that's a big issue at this stage (and it seems bindless is causing problems for brush/alias rendering via renderdoc and on my versa pro). However, I have figured out how to make effective use of descriptor sets (finally :P). The actual normal still needs checking, but the sprites are currently unlit so not an issue at this stage.
2021-12-14 16:22:05 +00:00
libs/video/renderer/vulkan/vulkan_sprite.c \
[vulkan] Implement basic quake texture loading It optionally generates mipmaps, and supports the main texture types (especially for texture packs), including palettes, but is otherwise rather unsophisticated code. Needs a lot of work, but testing first.
2021-01-17 17:10:56 +00:00
libs/video/renderer/vulkan/vulkan_texture.c \
[vulkan] Implement order implement transparency It's a bit flaky for particles, especially at higher frame rates, but that's due to supporting only 64 overlapping pixels. A reasonable solution is probably switching to a priority heap for the "sort" and upping the limit.
2022-11-30 18:00:47 +00:00
libs/video/renderer/vulkan/vulkan_translucent.c \
Merge branch 'master' into vulkan
2020-06-25 05:03:52 +00:00
libs/video/renderer/vulkan/vulkan_vid_common.c
[vulkan] Make script support objects more private This will help keep changes to the scripting system localized once things are further cleaned up.
2022-11-24 14:44:07 +00:00
libs/video/renderer/vulkan/vkparse.lo: \
libs/video/renderer/vulkan/vkparse.c \
[vulkan] Support Vulkan's pNext in vkparse/vkgen The real reason for the delay in implementing support for pNext is I didn't know how to approach it at the time, but with the experience I've gained using and modifying vkparse, the solution turned out to be fairly simple. This allows for the use of various extensions (eg, multiview, which was used for testing, though none of the hookup is in this commit). No checking is done on the struct type being valid other than it must be of a chainable type (ie, have its own pNext).
2022-05-29 12:53:38 +00:00
$(vkparse_src) \
[vulkan] Attempt to load the render info spec It fails due to not supporting labeled arrays yet. I'm currently thinking about the design for vkgen.
2023-02-10 02:04:11 +00:00
$(rp_main_def_gen) \
[vulkan] Clean up the sampler config loading Samplers have no direct relation to render passes or pipelines, so should not necessarily be in the same config file. This makes all the old config files obsolete, and quite a bit of support code in vkparse.c.
2023-06-25 14:33:47 +00:00
$(smp_quake_gen)
[vulkan] Start work on scripted pipeline Nothing is actually done yet other than parsing the built-in property list to property list items (the actual parser is just a skeleton), but everything compiles
2020-07-16 06:42:49 +00:00
[vulkan] Make script support objects more private This will help keep changes to the scripting system localized once things are further cleaned up.
2022-11-24 14:44:07 +00:00
libs/video/renderer/vulkan/shader.lo: \
libs/video/renderer/vulkan/shader.c \
$(vkshader_c)
[vulkan] Rework vkgen alias handling This is much cleaner and now that all the types are there properly, doing a parser generator should be easier.
2020-07-03 16:40:02 +00:00
[qwaq] Create a commandline-only version of qwaq qwaq-curses has its place, but its use for running vkgen was really a placeholder because I didn't feel like sorting out the different initialization requirements at the time. qwaq-cmd has the (currently unnecessary) threading power of qwaq-curses, but doesn't include any UI stuff and thus doesn't need curses. The work also paves the way for qwaq-x11 to become a proper engine (though sorting out its init will be taken care of later). Fixes #15.
2021-07-06 02:55:29 +00:00
qwaq_cmd = $(top_builddir)/ruamoko/qwaq/qwaq-cmd$(EXEEXT)
[build] Get make distcheck working again again... This covers only the basic check with a build in debian, but it's a good start.
2021-03-29 08:35:30 +00:00
vkparse_cinc = $(top_builddir)/libs/video/renderer/vulkan/vkparse.cinc
vkparse_hinc = $(top_builddir)/libs/video/renderer/vulkan/vkparse.hinc
[vulkan] Rework vkgen alias handling This is much cleaner and now that all the types are there properly, doing a parser generator should be easier.
2020-07-03 16:40:02 +00:00
vkparse_src = \
[vulkan] Add support for building and loading shaders Shaders can be built as spv files and installed into $libdir/quakeforge/shaders or as spvc files and compiled into the engine. Loading supports $builtin/name to access builtin shaders, $shader/path to access external standard shaders and quake filesystem access for all other paths.
2020-12-23 05:32:29 +00:00
$(vkparse_cinc) \
$(vkparse_hinc)
[vulkan] Use a property list to drive code gen The property list specifies the base structures for which parser code will be generated (along with any structures and enums upon which those structures depend). It also defines option specialized parsers for better control.
2020-07-05 05:59:56 +00:00
vkparse_plist = \
$(srcdir)/libs/video/renderer/vulkan/vkparse.plist
[vulkan] Rework vkgen alias handling This is much cleaner and now that all the types are there properly, doing a parser generator should be easier.
2020-07-03 16:40:02 +00:00
[vulkan] Move the shaders into their own directory
2021-02-10 08:43:11 +00:00
vkshaderpath = libs/video/renderer/vulkan/shader
[vulkan] Add support for 9-slice rendering There's no API yet as I need to look into the handling of qpic_t before I can get any of this into the other renderers (or even vulkan, for that matter). However, the current design for slice rendering is based on glyphs (ie, using instances and vertex pulling), with 3 strips of 3 quads, 16 verts, and 26 indices (2 reset). Hacky testing seems to work, but real tests need the API.
2022-11-18 00:44:01 +00:00
slice_src = $(vkshaderpath)/slice.vert
slice_c = $(vkshaderpath)/slice.vert.spvc
[vullkan] Rework Draw implementation Line rendering now has its own pipeline (removing the texture issue). Glyph rendering (for fonts) has been reworked to use instanced quad rendering, with the geometry (position and texture coords) in a static buffer (uniform texture buffer), and each instance has a glyph index, color, and 2d base position. Multiple fonts can be loaded, but aren't used yet: still just the one (work needs to be done on the queues to support multiple textures/fonts). Quads haven't changed much, but buffer creation and destruction has been cleaned up to use the resource functions.
2022-10-03 01:29:49 +00:00
linev_src = $(vkshaderpath)/line.vert
linev_c = $(vkshaderpath)/line.vert.spvc
linef_src = $(vkshaderpath)/line.frag
linef_c = $(vkshaderpath)/line.frag.spvc
[vulkan] Start work on particles for Vulkan This gets the pipelines loaded (and unloaded on shutdown). Probably the easy part :P. Still need to sort out the command buffers, synchronization, and particle generation (and probably a bunch else that's not coming to mind).
2021-12-16 14:17:01 +00:00
partphysicsc_src = $(vkshaderpath)/partphysics.comp
partphysicsc_c = $(vkshaderpath)/partphysics.comp.spvc
partupdatec_src = $(vkshaderpath)/partupdate.comp
partupdatec_c = $(vkshaderpath)/partupdate.comp.spvc
particlev_src = $(vkshaderpath)/particle.vert
particlev_c = $(vkshaderpath)/particle.vert.spvc
particleg_src = $(vkshaderpath)/particle.geom
particleg_c = $(vkshaderpath)/particle.geom.spvc
particlef_src = $(vkshaderpath)/particle.frag
particlef_c = $(vkshaderpath)/particle.frag.spvc
[vulkan] Create the non-C side of the sprite pipeline This adds the shaders and the pipeline specs. I'm not sure that the deferred rendering side of the render pass is appropriate, but I thought I'd give it a go, since quake sprites are really cutoff rather than translucent.
2021-12-14 05:44:16 +00:00
sprite_gbufv_src = $(vkshaderpath)/sprite_gbuf.vert
sprite_gbufv_c = $(vkshaderpath)/sprite_gbuf.vert.spvc
sprite_gbuff_src = $(vkshaderpath)/sprite_gbuf.frag
sprite_gbuff_c = $(vkshaderpath)/sprite_gbuf.frag.spvc
sprite_depthv_src = $(vkshaderpath)/sprite_depth.vert
sprite_depthv_c = $(vkshaderpath)/sprite_depth.vert.spvc
sprite_depthf_src = $(vkshaderpath)/sprite_depth.frag
sprite_depthf_c = $(vkshaderpath)/sprite_depth.frag.spvc
[vulkan] Do a depth pass for 2d objects While the HUD and status bar don't cut out a lot of screen (normally), they might start to make a difference when I get transparency working properly. The main thing is this is a step towards pulling the 2d rendering into another render pass so the main deferred pass is world-only.
2022-11-20 17:29:03 +00:00
twod_depthf_src = $(vkshaderpath)/twod_depth.frag
twod_depthf_c = $(vkshaderpath)/twod_depth.frag.spvc
[vulkan] Move the shaders into their own directory
2021-02-10 08:43:11 +00:00
twodv_src = $(vkshaderpath)/twod.vert
twodv_c = $(vkshaderpath)/twod.vert.spvc
twodf_src = $(vkshaderpath)/twod.frag
twodf_c = $(vkshaderpath)/twod.frag.spvc
quakebspv_src = $(vkshaderpath)/quakebsp.vert
quakebspv_c = $(vkshaderpath)/quakebsp.vert.spvc
quakebspf_src = $(vkshaderpath)/quakebsp.frag
quakebspf_c = $(vkshaderpath)/quakebsp.frag.spvc
[vulkan] Convert bsp and draw to deferred This has bsp and draw passing muster with the validation layers.
2021-02-19 02:14:54 +00:00
bsp_depth_src = $(vkshaderpath)/bsp_depth.vert
bsp_depth_c = $(vkshaderpath)/bsp_depth.vert.spvc
bsp_gbufv_src = $(vkshaderpath)/bsp_gbuf.vert
bsp_gbufv_c = $(vkshaderpath)/bsp_gbuf.vert.spvc
bsp_gbufg_src = $(vkshaderpath)/bsp_gbuf.geom
bsp_gbufg_c = $(vkshaderpath)/bsp_gbuf.geom.spvc
bsp_gbuff_src = $(vkshaderpath)/bsp_gbuf.frag
bsp_gbuff_c = $(vkshaderpath)/bsp_gbuf.frag.spvc
[vulkan] Start work on shadows This gets the shaders needed for creating shadow maps, and the changes to the lighting pipeline for binding the shadow maps, but no generation or reading is done yet. It feels like parts of various systems are getting a little big for their britches and I need to do an audit of various things.
2021-04-24 01:40:39 +00:00
bsp_shadow_src = $(vkshaderpath)/bsp_shadow.vert
bsp_shadow_c = $(vkshaderpath)/bsp_shadow.vert.spvc
[vulkan] Fix up commands for deferred rendering Nothing gets output yet (lighting and composite passes not implemented), but everything passes validation until exit (not destroying everything).
2021-02-23 06:43:02 +00:00
bsp_skyf_src = $(vkshaderpath)/bsp_sky.frag
bsp_skyf_c = $(vkshaderpath)/bsp_sky.frag.spvc
[vulkan] Implement water surface rendering They're unlit (fullbright, but that's nothing new for quake), but working nicely. As a bonus, sort out the sky pass (forced to due to the way command buffers are used).
2021-03-23 03:24:24 +00:00
bsp_turbf_src = $(vkshaderpath)/bsp_turb.frag
bsp_turbf_c = $(vkshaderpath)/bsp_turb.frag.spvc
[vulkan] Implement lighting and compose passes Lighting doesn't actually do lights yet, but it's producing pixels. Translucent seems to be working (2d draw uses it), and compose seems to be working.
2021-02-24 10:58:31 +00:00
lightingf_src = $(vkshaderpath)/lighting.frag
lightingf_c = $(vkshaderpath)/lighting.frag.spvc
composef_src = $(vkshaderpath)/compose.frag
composef_c = $(vkshaderpath)/compose.frag.spvc
[vulkan] Move oit blending into compose subpass I had debated putting the blending in the compose subpass or a separate pass but went with the separate pass originally, but it turns out that removing the separate pass gains 1-3% (5-15/545 fps in a timedemo of demo1).
2022-12-01 14:03:55 +00:00
oit_blend = $(vkshaderpath)/oit_blend.finc
[vulkan] Implement order implement transparency It's a bit flaky for particles, especially at higher frame rates, but that's due to supporting only 64 overlapping pixels. A reasonable solution is probably switching to a priority heap for the "sort" and upping the limit.
2022-11-30 18:00:47 +00:00
oit_store = $(vkshaderpath)/oit_store.finc
oit_h = $(vkshaderpath)/oit.h
[build] Fix distcheck once again Probably the hardest part of QF to maintain.
2022-12-02 08:10:04 +00:00
matrices_h = $(vkshaderpath)/matrices.h
entity_h = $(vkshaderpath)/entity.h
[vulkan] Move the shaders into their own directory
2021-02-10 08:43:11 +00:00
aliasv_src = $(vkshaderpath)/alias.vert
aliasv_c = $(vkshaderpath)/alias.vert.spvc
aliasf_src = $(vkshaderpath)/alias.frag
aliasf_c = $(vkshaderpath)/alias.frag.spvc
[vulkan] Create shaders for alias deferred rendering A simple (no uv output) vertex shader that still blends the two frames, and the relevant g-buffer fragment shader.
2021-02-17 04:35:19 +00:00
alias_depth_src = $(vkshaderpath)/alias_depth.vert
alias_depth_c = $(vkshaderpath)/alias_depth.vert.spvc
alias_gbuf_src = $(vkshaderpath)/alias_gbuf.frag
alias_gbuf_c = $(vkshaderpath)/alias_gbuf.frag.spvc
[vulkan] Start work on shadows This gets the shaders needed for creating shadow maps, and the changes to the lighting pipeline for binding the shadow maps, but no generation or reading is done yet. It feels like parts of various systems are getting a little big for their britches and I need to do an audit of various things.
2021-04-24 01:40:39 +00:00
alias_shadow_src = $(vkshaderpath)/alias_shadow.vert
alias_shadow_c = $(vkshaderpath)/alias_shadow.vert.spvc
[vulkan] Add support for IQM models Despite the base IQM specification not supporting blend-shapes, I think IQM will become the basis for QF's generic model representation (at least for the more advanced renderers). After my experience with .mu models (KSP) and unity mesh objects (both normal and skinned), and reviewing the IQM spec, it looks like with the addition of support for blend-shapes, IQM is actually pretty good. This is just the preliminary work to get standard IQM models loading in vulkan (seems to work, along with unloading), and they very basics into the renderer (most likely not working: not tested yet). The rest of the renderer seems to be unaffected, though, which is good.
2022-05-04 05:07:27 +00:00
iqmv_src = $(vkshaderpath)/iqm.vert
iqmv_c = $(vkshaderpath)/iqm.vert.spvc
iqmf_src = $(vkshaderpath)/iqm.frag
iqmf_c = $(vkshaderpath)/iqm.frag.spvc
[vulkan] Add a module to handle output When working, this will handle the output to the swap-chain images and any final post-processing effects (gamma correction, screen scaling, etc). However, currently the screen is just black because the image for getting the main render pass output isn't hooked up yet.
2022-11-22 08:47:36 +00:00
output_src = $(vkshaderpath)/output.frag
output_c = $(vkshaderpath)/output.frag.spvc
[vulkan] Move the shaders into their own directory
2021-02-10 08:43:11 +00:00
passthrough_src = $(vkshaderpath)/passthrough.vert
passthrough_c = $(vkshaderpath)/passthrough.vert.spvc
[vulkan] Switch to full screen triangle instead of quad While I have trouble imagining it making that much performance difference going from 4 verts to 3 for a whopping 2 polygons, or even from 2 triangles to 1 for each poly, using only indices for the vertices does remove a lot of code, and better yet, some memory and buffer allocations... always a good thing. That said, I guess freeing up a GPU thread for something else could make a difference.
2022-04-01 10:50:41 +00:00
fstriangle_src = $(vkshaderpath)/fstriangle.vert
fstriangle_c = $(vkshaderpath)/fstriangle.vert.spvc
[vulkan] Create a water warp output pipeline Although it works as intended (tested via hacking), it's not hooked up as the current frame buffer handling in r_screen is not readily compatible with how vulkan output is handled. This will need some thought to get working.
2022-11-27 03:48:51 +00:00
fstrianglest_src = $(vkshaderpath)/fstrianglest.vert
fstrianglest_c = $(vkshaderpath)/fstrianglest.vert.spvc
[vulkan] Move the shaders into their own directory
2021-02-10 08:43:11 +00:00
pushcolor_src = $(vkshaderpath)/pushcolor.frag
pushcolor_c = $(vkshaderpath)/pushcolor.frag.spvc
[vulkan] Implement most of the changes for cube rendering There are some missing parts from this commit as these are the fairly clean changes. Missing is building a separate set of pipelines for the new render pass (might be able to get away from that), OIT heads texture is flat rather than an array, view matrices aren't set up, and the fisheye renderer isn't hooked up to the output pass (code exists but is messy). However, with the missing parts included, testing shows things mostly working: the cube map is rendered correctly even though it's not displayed correctly (incorrect view). This has definitely proven to be a good test for Vulkan's multiview feature (very nice).
2023-01-23 02:14:06 +00:00
fisheye_src = $(vkshaderpath)/fisheye.frag
fisheye_c = $(vkshaderpath)/fisheye.frag.spvc
[vulkan] Create a water warp output pipeline Although it works as intended (tested via hacking), it's not hooked up as the current frame buffer handling in r_screen is not readily compatible with how vulkan output is handled. This will need some thought to get working.
2022-11-27 03:48:51 +00:00
waterwarp_src = $(vkshaderpath)/waterwarp.frag
waterwarp_c = $(vkshaderpath)/waterwarp.frag.spvc
[vulkan] Add support for building and loading shaders Shaders can be built as spv files and installed into $libdir/quakeforge/shaders or as spvc files and compiled into the engine. Loading supports $builtin/name to access builtin shaders, $shader/path to access external standard shaders and quake filesystem access for all other paths.
2020-12-23 05:32:29 +00:00
[vulkan] Use matrices header in geometry shaders I had missed them earlier as I had forgotten about them (looked only at vertex shaders).
2023-01-22 08:30:25 +00:00
$(slice_c): $(slice_src) $(matrices_h)
[vulkan] Add support for 9-slice rendering There's no API yet as I need to look into the handling of qpic_t before I can get any of this into the other renderers (or even vulkan, for that matter). However, the current design for slice rendering is based on glyphs (ie, using instances and vertex pulling), with 3 strips of 3 quads, 16 verts, and 26 indices (2 reset). Hacky testing seems to work, but real tests need the API.
2022-11-18 00:44:01 +00:00
[build] Fix distcheck once again Probably the hardest part of QF to maintain.
2022-12-02 08:10:04 +00:00
$(linev_c): $(linev_src) $(matrices_h)
[vullkan] Rework Draw implementation Line rendering now has its own pipeline (removing the texture issue). Glyph rendering (for fonts) has been reworked to use instanced quad rendering, with the geometry (position and texture coords) in a static buffer (uniform texture buffer), and each instance has a glyph index, color, and 2d base position. Multiple fonts can be loaded, but aren't used yet: still just the one (work needs to be done on the queues to support multiple textures/fonts). Quads haven't changed much, but buffer creation and destruction has been cleaned up to use the resource functions.
2022-10-03 01:29:49 +00:00
$(linef_c): $(linef_src)
[vulkan] Start work on particles for Vulkan This gets the pipelines loaded (and unloaded on shutdown). Probably the easy part :P. Still need to sort out the command buffers, synchronization, and particle generation (and probably a bunch else that's not coming to mind).
2021-12-16 14:17:01 +00:00
$(partphysicsc_c): $(partphysicsc_src)
$(partupdatec_c): $(partupdatec_src)
[build] Fix distcheck once again Probably the hardest part of QF to maintain.
2022-12-02 08:10:04 +00:00
$(particlev_c): $(particlev_src) $(matrices_h)
[vulkan] Use matrices header in geometry shaders I had missed them earlier as I had forgotten about them (looked only at vertex shaders).
2023-01-22 08:30:25 +00:00
$(particleg_c): $(particleg_src) $(matrices_h)
[vulkan] Implement order implement transparency It's a bit flaky for particles, especially at higher frame rates, but that's due to supporting only 64 overlapping pixels. A reasonable solution is probably switching to a priority heap for the "sort" and upping the limit.
2022-11-30 18:00:47 +00:00
$(particlef_c): $(particlef_src) $(oit_store) $(oit_h)
[vulkan] Start work on particles for Vulkan This gets the pipelines loaded (and unloaded on shutdown). Probably the easy part :P. Still need to sort out the command buffers, synchronization, and particle generation (and probably a bunch else that's not coming to mind).
2021-12-16 14:17:01 +00:00
[build] Fix distcheck once again Probably the hardest part of QF to maintain.
2022-12-02 08:10:04 +00:00
$(sprite_gbufv_c): $(sprite_gbufv_src) $(matrices_h)
[vulkan] Create the non-C side of the sprite pipeline This adds the shaders and the pipeline specs. I'm not sure that the deferred rendering side of the render pass is appropriate, but I thought I'd give it a go, since quake sprites are really cutoff rather than translucent.
2021-12-14 05:44:16 +00:00
$(sprite_gbuff_c): $(sprite_gbuff_src)
[build] Fix distcheck once again Probably the hardest part of QF to maintain.
2022-12-02 08:10:04 +00:00
$(sprite_depthv_c): $(sprite_depthv_src) $(matrices_h)
[vulkan] Create the non-C side of the sprite pipeline This adds the shaders and the pipeline specs. I'm not sure that the deferred rendering side of the render pass is appropriate, but I thought I'd give it a go, since quake sprites are really cutoff rather than translucent.
2021-12-14 05:44:16 +00:00
$(sprite_depthf_c): $(sprite_depthf_src)
[vulkan] Do a depth pass for 2d objects While the HUD and status bar don't cut out a lot of screen (normally), they might start to make a difference when I get transparency working properly. The main thing is this is a step towards pulling the 2d rendering into another render pass so the main deferred pass is world-only.
2022-11-20 17:29:03 +00:00
$(twod_depthf_c): $(twod_depthf_src)
[build] Fix distcheck once again Probably the hardest part of QF to maintain.
2022-12-02 08:10:04 +00:00
$(twodv_c): $(twodv_src) $(matrices_h)
[vulkan] Make a start on the 2D pipeline Short wrappers for Draw functins are in vid_render_vulkan.c so the vulkan context can be passed on to the actual functions. The 2D shaders are set up similar to those in glsl, but with full 32-bit color (rgba) support instead of paletted. However, the textures are not loaded yet, nor is anything bound.
2021-01-10 06:52:27 +00:00
$(twodf_c): $(twodf_src)
[build] Fix distcheck once again Probably the hardest part of QF to maintain.
2022-12-02 08:10:04 +00:00
$(quakebspv_c): $(quakebspv_src) $(entity_h) $(matrices_h)
[vulkan] Create shanders for brush models The fragment shader is a bit of a mini mega-shader, but I do want to try out specializations.
2021-01-18 08:13:52 +00:00
$(quakebspf_c): $(quakebspf_src)
[build] Fix distcheck once again Probably the hardest part of QF to maintain.
2022-12-02 08:10:04 +00:00
$(bsp_depth_c): $(bsp_depth_src) $(entity_h) $(matrices_h)
[vulkan] Convert bsp and draw to deferred This has bsp and draw passing muster with the validation layers.
2021-02-19 02:14:54 +00:00
[build] Fix distcheck once again Probably the hardest part of QF to maintain.
2022-12-02 08:10:04 +00:00
$(bsp_gbufv_c): $(bsp_gbufv_src) $(entity_h) $(matrices_h)
[vulkan] Convert bsp and draw to deferred This has bsp and draw passing muster with the validation layers.
2021-02-19 02:14:54 +00:00
[vulkan] Use matrices header in geometry shaders I had missed them earlier as I had forgotten about them (looked only at vertex shaders).
2023-01-22 08:30:25 +00:00
$(bsp_gbufg_c): $(bsp_gbufg_src) $(matrices_h)
[vulkan] Convert bsp and draw to deferred This has bsp and draw passing muster with the validation layers.
2021-02-19 02:14:54 +00:00
$(bsp_gbuff_c): $(bsp_gbuff_src)
[build] Fix distcheck once again Probably the hardest part of QF to maintain.
2022-12-02 08:10:04 +00:00
$(bsp_shadow_c): $(bsp_shadow_src) $(entity_h)
[vulkan] Start work on shadows This gets the shaders needed for creating shadow maps, and the changes to the lighting pipeline for binding the shadow maps, but no generation or reading is done yet. It feels like parts of various systems are getting a little big for their britches and I need to do an audit of various things.
2021-04-24 01:40:39 +00:00
[vulkan] Implement order implement transparency It's a bit flaky for particles, especially at higher frame rates, but that's due to supporting only 64 overlapping pixels. A reasonable solution is probably switching to a priority heap for the "sort" and upping the limit.
2022-11-30 18:00:47 +00:00
$(bsp_skyf_c): $(bsp_skyf_src) $(oit_store) $(oit_h)
[vulkan] Fix up commands for deferred rendering Nothing gets output yet (lighting and composite passes not implemented), but everything passes validation until exit (not destroying everything).
2021-02-23 06:43:02 +00:00
[vulkan] Implement order implement transparency It's a bit flaky for particles, especially at higher frame rates, but that's due to supporting only 64 overlapping pixels. A reasonable solution is probably switching to a priority heap for the "sort" and upping the limit.
2022-11-30 18:00:47 +00:00
$(bsp_turbf_c): $(bsp_turbf_src) $(oit_store) $(oit_h)
[vulkan] Implement water surface rendering They're unlit (fullbright, but that's nothing new for quake), but working nicely. As a bonus, sort out the sky pass (forced to due to the way command buffers are used).
2021-03-23 03:24:24 +00:00
[vulkan] Implement lighting and compose passes Lighting doesn't actually do lights yet, but it's producing pixels. Translucent seems to be working (2d draw uses it), and compose seems to be working.
2021-02-24 10:58:31 +00:00
$(lightingf_c): $(lightingf_src)
[vulkan] Move oit blending into compose subpass I had debated putting the blending in the compose subpass or a separate pass but went with the separate pass originally, but it turns out that removing the separate pass gains 1-3% (5-15/545 fps in a timedemo of demo1).
2022-12-01 14:03:55 +00:00
$(composef_c): $(composef_src) $(oit_blend) $(oit_h)
[vulkan] Implement order implement transparency It's a bit flaky for particles, especially at higher frame rates, but that's due to supporting only 64 overlapping pixels. A reasonable solution is probably switching to a priority heap for the "sort" and upping the limit.
2022-11-30 18:00:47 +00:00
[build] Fix distcheck once again Probably the hardest part of QF to maintain.
2022-12-02 08:10:04 +00:00
$(aliasv_c): $(aliasv_src) $(matrices_h)
[vulkan] Start work on the alias pipeline
2021-01-25 15:55:45 +00:00
[build] Fix distcheck once again Probably the hardest part of QF to maintain.
2022-12-02 08:10:04 +00:00
$(alias_depth_c): $(alias_depth_src) $(matrices_h)
[vulkan] Create shaders for alias deferred rendering A simple (no uv output) vertex shader that still blends the two frames, and the relevant g-buffer fragment shader.
2021-02-17 04:35:19 +00:00
[vulkan] Start work on the alias pipeline
2021-01-25 15:55:45 +00:00
$(aliasf_c): $(aliasf_src)
[vulkan] Create shaders for alias deferred rendering A simple (no uv output) vertex shader that still blends the two frames, and the relevant g-buffer fragment shader.
2021-02-17 04:35:19 +00:00
$(alias_gbuf_c): $(alias_gbuf_src)
[vulkan] Start work on shadows This gets the shaders needed for creating shadow maps, and the changes to the lighting pipeline for binding the shadow maps, but no generation or reading is done yet. It feels like parts of various systems are getting a little big for their britches and I need to do an audit of various things.
2021-04-24 01:40:39 +00:00
$(alias_shadow_c): $(alias_shadow_src)
[build] Fix distcheck once again Probably the hardest part of QF to maintain.
2022-12-02 08:10:04 +00:00
$(iqmv_c): $(iqmv_src) $(matrices_h)
[vulkan] Add support for IQM models Despite the base IQM specification not supporting blend-shapes, I think IQM will become the basis for QF's generic model representation (at least for the more advanced renderers). After my experience with .mu models (KSP) and unity mesh objects (both normal and skinned), and reviewing the IQM spec, it looks like with the addition of support for blend-shapes, IQM is actually pretty good. This is just the preliminary work to get standard IQM models loading in vulkan (seems to work, along with unloading), and they very basics into the renderer (most likely not working: not tested yet). The rest of the renderer seems to be unaffected, though, which is good.
2022-05-04 05:07:27 +00:00
$(iqmf_c): $(iqmf_src)
[build] Fix distcheck once again Probably the hardest part of QF to maintain.
2022-12-02 08:10:04 +00:00
$(output_c): $(output_src) $(matrices_h)
[vulkan] Add a module to handle output When working, this will handle the output to the swap-chain images and any final post-processing effects (gamma correction, screen scaling, etc). However, currently the screen is just black because the image for getting the main render pass output isn't hooked up yet.
2022-11-22 08:47:36 +00:00
[vulkan] Add support for building and loading shaders Shaders can be built as spv files and installed into $libdir/quakeforge/shaders or as spvc files and compiled into the engine. Loading supports $builtin/name to access builtin shaders, $shader/path to access external standard shaders and quake filesystem access for all other paths.
2020-12-23 05:32:29 +00:00
$(passthrough_c): $(passthrough_src)
[vulkan] Switch to full screen triangle instead of quad While I have trouble imagining it making that much performance difference going from 4 verts to 3 for a whopping 2 polygons, or even from 2 triangles to 1 for each poly, using only indices for the vertices does remove a lot of code, and better yet, some memory and buffer allocations... always a good thing. That said, I guess freeing up a GPU thread for something else could make a difference.
2022-04-01 10:50:41 +00:00
$(fstriangle_c): $(fstriangle_src)
[vulkan] Create a water warp output pipeline Although it works as intended (tested via hacking), it's not hooked up as the current frame buffer handling in r_screen is not readily compatible with how vulkan output is handled. This will need some thought to get working.
2022-11-27 03:48:51 +00:00
$(fstrianglest_c): $(fstrianglest_src)
[vulkan] Add support for building and loading shaders Shaders can be built as spv files and installed into $libdir/quakeforge/shaders or as spvc files and compiled into the engine. Loading supports $builtin/name to access builtin shaders, $shader/path to access external standard shaders and quake filesystem access for all other paths.
2020-12-23 05:32:29 +00:00
$(pushcolor_c): $(pushcolor_src)
[vulkan] Implement most of the changes for cube rendering There are some missing parts from this commit as these are the fairly clean changes. Missing is building a separate set of pipelines for the new render pass (might be able to get away from that), OIT heads texture is flat rather than an array, view matrices aren't set up, and the fisheye renderer isn't hooked up to the output pass (code exists but is messy). However, with the missing parts included, testing shows things mostly working: the cube map is rendered correctly even though it's not displayed correctly (incorrect view). This has definitely proven to be a good test for Vulkan's multiview feature (very nice).
2023-01-23 02:14:06 +00:00
$(fisheye_c): $(fisheye_src) $(matrices_h)
[build] Fix distcheck once again Probably the hardest part of QF to maintain.
2022-12-02 08:10:04 +00:00
$(waterwarp_c): $(waterwarp_src) $(matrices_h)
[vulkan] Create a water warp output pipeline Although it works as intended (tested via hacking), it's not hooked up as the current frame buffer handling in r_screen is not readily compatible with how vulkan output is handled. This will need some thought to get working.
2022-11-27 03:48:51 +00:00
[vulkan] Add support for building and loading shaders Shaders can be built as spv files and installed into $libdir/quakeforge/shaders or as spvc files and compiled into the engine. Loading supports $builtin/name to access builtin shaders, $shader/path to access external standard shaders and quake filesystem access for all other paths.
2020-12-23 05:32:29 +00:00
vkshader_c = \
[vulkan] Add support for 9-slice rendering There's no API yet as I need to look into the handling of qpic_t before I can get any of this into the other renderers (or even vulkan, for that matter). However, the current design for slice rendering is based on glyphs (ie, using instances and vertex pulling), with 3 strips of 3 quads, 16 verts, and 26 indices (2 reset). Hacky testing seems to work, but real tests need the API.
2022-11-18 00:44:01 +00:00
$(slice_c) \
[vullkan] Rework Draw implementation Line rendering now has its own pipeline (removing the texture issue). Glyph rendering (for fonts) has been reworked to use instanced quad rendering, with the geometry (position and texture coords) in a static buffer (uniform texture buffer), and each instance has a glyph index, color, and 2d base position. Multiple fonts can be loaded, but aren't used yet: still just the one (work needs to be done on the queues to support multiple textures/fonts). Quads haven't changed much, but buffer creation and destruction has been cleaned up to use the resource functions.
2022-10-03 01:29:49 +00:00
$(linev_c) \
$(linef_c) \
[vulkan] Start work on particles for Vulkan This gets the pipelines loaded (and unloaded on shutdown). Probably the easy part :P. Still need to sort out the command buffers, synchronization, and particle generation (and probably a bunch else that's not coming to mind).
2021-12-16 14:17:01 +00:00
$(partphysicsc_c) \
$(partupdatec_c) \
$(particlev_c) \
$(particleg_c) \
$(particlef_c) \
[vulkan] Create the non-C side of the sprite pipeline This adds the shaders and the pipeline specs. I'm not sure that the deferred rendering side of the render pass is appropriate, but I thought I'd give it a go, since quake sprites are really cutoff rather than translucent.
2021-12-14 05:44:16 +00:00
$(sprite_gbufv_c) \
$(sprite_gbuff_c) \
$(sprite_depthv_c) \
$(sprite_depthf_c) \
[vulkan] Fix broken line drawing Line drawing was broken with the 2d depth pass (which will go away in the end, but I like the organization of the draw code).
2022-11-25 02:12:05 +00:00
$(twodv_c) \
$(twodf_c) \
[vulkan] Do a depth pass for 2d objects While the HUD and status bar don't cut out a lot of screen (normally), they might start to make a difference when I get transparency working properly. The main thing is this is a step towards pulling the 2d rendering into another render pass so the main deferred pass is world-only.
2022-11-20 17:29:03 +00:00
$(twod_depthf_c) \
[vulkan] Create shanders for brush models The fragment shader is a bit of a mini mega-shader, but I do want to try out specializations.
2021-01-18 08:13:52 +00:00
$(quakebspv_c) \
$(quakebspf_c) \
[vulkan] Convert bsp and draw to deferred This has bsp and draw passing muster with the validation layers.
2021-02-19 02:14:54 +00:00
$(bsp_depth_c) \
$(bsp_gbufv_c) \
$(bsp_gbufg_c) \
$(bsp_gbuff_c) \
[vulkan] Start work on shadows This gets the shaders needed for creating shadow maps, and the changes to the lighting pipeline for binding the shadow maps, but no generation or reading is done yet. It feels like parts of various systems are getting a little big for their britches and I need to do an audit of various things.
2021-04-24 01:40:39 +00:00
$(bsp_shadow_c) \
[vulkan] Fix up commands for deferred rendering Nothing gets output yet (lighting and composite passes not implemented), but everything passes validation until exit (not destroying everything).
2021-02-23 06:43:02 +00:00
$(bsp_skyf_c) \
[vulkan] Implement water surface rendering They're unlit (fullbright, but that's nothing new for quake), but working nicely. As a bonus, sort out the sky pass (forced to due to the way command buffers are used).
2021-03-23 03:24:24 +00:00
$(bsp_turbf_c) \
[vulkan] Implement lighting and compose passes Lighting doesn't actually do lights yet, but it's producing pixels. Translucent seems to be working (2d draw uses it), and compose seems to be working.
2021-02-24 10:58:31 +00:00
$(lightingf_c) \
$(composef_c) \
[vulkan] Start work on the alias pipeline
2021-01-25 15:55:45 +00:00
$(aliasv_c) \
[vulkan] Create shaders for alias deferred rendering A simple (no uv output) vertex shader that still blends the two frames, and the relevant g-buffer fragment shader.
2021-02-17 04:35:19 +00:00
$(alias_depth_c) \
[vulkan] Start work on the alias pipeline
2021-01-25 15:55:45 +00:00
$(aliasf_c) \
[vulkan] Create shaders for alias deferred rendering A simple (no uv output) vertex shader that still blends the two frames, and the relevant g-buffer fragment shader.
2021-02-17 04:35:19 +00:00
$(alias_gbuf_c) \
[vulkan] Start work on shadows This gets the shaders needed for creating shadow maps, and the changes to the lighting pipeline for binding the shadow maps, but no generation or reading is done yet. It feels like parts of various systems are getting a little big for their britches and I need to do an audit of various things.
2021-04-24 01:40:39 +00:00
$(alias_shadow_c) \
[vulkan] Add support for IQM models Despite the base IQM specification not supporting blend-shapes, I think IQM will become the basis for QF's generic model representation (at least for the more advanced renderers). After my experience with .mu models (KSP) and unity mesh objects (both normal and skinned), and reviewing the IQM spec, it looks like with the addition of support for blend-shapes, IQM is actually pretty good. This is just the preliminary work to get standard IQM models loading in vulkan (seems to work, along with unloading), and they very basics into the renderer (most likely not working: not tested yet). The rest of the renderer seems to be unaffected, though, which is good.
2022-05-04 05:07:27 +00:00
$(iqmv_c) \
$(iqmf_c) \
[vulkan] Add a module to handle output When working, this will handle the output to the swap-chain images and any final post-processing effects (gamma correction, screen scaling, etc). However, currently the screen is just black because the image for getting the main render pass output isn't hooked up yet.
2022-11-22 08:47:36 +00:00
$(output_c) \
[vulkan] Add support for building and loading shaders Shaders can be built as spv files and installed into $libdir/quakeforge/shaders or as spvc files and compiled into the engine. Loading supports $builtin/name to access builtin shaders, $shader/path to access external standard shaders and quake filesystem access for all other paths.
2020-12-23 05:32:29 +00:00
$(passthrough_c) \
[vulkan] Switch to full screen triangle instead of quad While I have trouble imagining it making that much performance difference going from 4 verts to 3 for a whopping 2 polygons, or even from 2 triangles to 1 for each poly, using only indices for the vertices does remove a lot of code, and better yet, some memory and buffer allocations... always a good thing. That said, I guess freeing up a GPU thread for something else could make a difference.
2022-04-01 10:50:41 +00:00
$(fstriangle_c) \
[vulkan] Create a water warp output pipeline Although it works as intended (tested via hacking), it's not hooked up as the current frame buffer handling in r_screen is not readily compatible with how vulkan output is handled. This will need some thought to get working.
2022-11-27 03:48:51 +00:00
$(fstrianglest_c) \
[vulkan] Start work on shadows This gets the shaders needed for creating shadow maps, and the changes to the lighting pipeline for binding the shadow maps, but no generation or reading is done yet. It feels like parts of various systems are getting a little big for their britches and I need to do an audit of various things.
2021-04-24 01:40:39 +00:00
$(pushcolor_c) \
[vulkan] Create a water warp output pipeline Although it works as intended (tested via hacking), it's not hooked up as the current frame buffer handling in r_screen is not readily compatible with how vulkan output is handled. This will need some thought to get working.
2022-11-27 03:48:51 +00:00
$(shadow_c) \
[vulkan] Implement most of the changes for cube rendering There are some missing parts from this commit as these are the fairly clean changes. Missing is building a separate set of pipelines for the new render pass (might be able to get away from that), OIT heads texture is flat rather than an array, view matrices aren't set up, and the fisheye renderer isn't hooked up to the output pass (code exists but is messy). However, with the missing parts included, testing shows things mostly working: the cube map is rendered correctly even though it's not displayed correctly (incorrect view). This has definitely proven to be a good test for Vulkan's multiview feature (very nice).
2023-01-23 02:14:06 +00:00
$(fisheye_c) \
[vulkan] Create a water warp output pipeline Although it works as intended (tested via hacking), it's not hooked up as the current frame buffer handling in r_screen is not readily compatible with how vulkan output is handled. This will need some thought to get working.
2022-11-27 03:48:51 +00:00
$(waterwarp_c)
[vulkan] Add support for building and loading shaders Shaders can be built as spv files and installed into $libdir/quakeforge/shaders or as spvc files and compiled into the engine. Loading supports $builtin/name to access builtin shaders, $shader/path to access external standard shaders and quake filesystem access for all other paths.
2020-12-23 05:32:29 +00:00
[vulkan] Rework vkgen alias handling This is much cleaner and now that all the types are there properly, doing a parser generator should be easier.
2020-07-03 16:40:02 +00:00
V_VKGEN = $(V_VKGEN_@AM_V@)
V_VKGEN_ = $(V_VKGEN_@AM_DEFAULT_V@)
V_VKGEN_0 = @echo " VKGEN " $@;
V_VKGEN_1 =
[qwaq] Create a commandline-only version of qwaq qwaq-curses has its place, but its use for running vkgen was really a placeholder because I didn't feel like sorting out the different initialization requirements at the time. qwaq-cmd has the (currently unnecessary) threading power of qwaq-curses, but doesn't include any UI stuff and thus doesn't need curses. The work also paves the way for qwaq-x11 to become a proper engine (though sorting out its init will be taken care of later). Fixes #15.
2021-07-06 02:55:29 +00:00
$(vkparse_cinc): $(vkgen) $(qwaq_cmd) $(vkparse_plist)
$(V_VKGEN)$(QWAQ) $(vkgen) -- $(vkparse_plist) $(vkparse_cinc).t $(vkparse_hinc).t &&\
[vulkan] Add support for building and loading shaders Shaders can be built as spv files and installed into $libdir/quakeforge/shaders or as spvc files and compiled into the engine. Loading supports $builtin/name to access builtin shaders, $shader/path to access external standard shaders and quake filesystem access for all other paths.
2020-12-23 05:32:29 +00:00
$(am__mv) $(vkparse_cinc).t $(vkparse_cinc) &&\
$(am__mv) $(vkparse_hinc).t $(vkparse_hinc)
[vulkan] Hook up the expression parser The pipeline parser still isn't hooked up yet as something isn't quite right, but it seems all the parsing works.
2020-12-21 09:38:31 +00:00
[vulkan] Add support for building and loading shaders Shaders can be built as spv files and installed into $libdir/quakeforge/shaders or as spvc files and compiled into the engine. Loading supports $builtin/name to access builtin shaders, $shader/path to access external standard shaders and quake filesystem access for all other paths.
2020-12-23 05:32:29 +00:00
$(vkparse_hinc): $(vkparse_cinc)
[vulkan] Hook up the expression parser The pipeline parser still isn't hooked up yet as something isn't quite right, but it seems all the parsing works.
2020-12-21 09:38:31 +00:00
# do nothing: hinc generated at the same time as cinc
[vulkan] Add a tool for making vulkan enum tables The tables are generated from the enums pulled out of the vulkan headers using a ruamoko program (thanks to its reflection capabilities). They will be used for parsing property lists used to create render passes and pipelines.
2020-06-28 10:08:18 +00:00
[build] Move to non-recursive make There's still some cleanup to do, but everything seems to be working nicely: `make -j` works, `make distcheck` passes. There is probably plenty of bitrot in the package directories (RPM, debian), though. The vc project files have been removed since those versions are way out of date and quakeforge is pretty much dependent on gcc now anyway. Most of the old Makefile.am files are now Makemodule.am. This should allow for new Makefile.am files that allow local building (to be added on an as-needed bases). The current remaining Makefile.am files are for standalone sub-projects.a The installable bins are currently built in the top-level build directory. This may change if the clutter gets to be too much. While this does make a noticeable difference in build times, the main reason for the switch was to take care of the growing dependency issues: now it's possible to build tools for code generation (eg, using qfcc and ruamoko programs for code-gen).
2020-06-21 14:15:17 +00:00
CLEANFILES += \
libs/video/renderer/glsl/*.vc \
libs/video/renderer/glsl/*.fc \
[vulkan] Rework vkgen alias handling This is much cleaner and now that all the types are there properly, doing a parser generator should be easier.
2020-07-03 16:40:02 +00:00
libs/video/renderer/glsl/*.slc \
[vulkan] Start work on scripted pipeline Nothing is actually done yet other than parsing the built-in property list to property list items (the actual parser is just a skeleton), but everything compiles
2020-07-16 06:42:49 +00:00
libs/video/renderer/vulkan/*.plc \
[build] Get make distcheck working again again... This covers only the basic check with a build in debian, but it's a good start.
2021-03-29 08:35:30 +00:00
libs/video/renderer/vulkan/shader/*.spv \
libs/video/renderer/vulkan/shader/*.spvc \
[build] Fix some distcheck bitrot
2021-08-02 04:47:00 +00:00
vkgen.sym \
[vulkan] Rework vkgen alias handling This is much cleaner and now that all the types are there properly, doing a parser generator should be easier.
2020-07-03 16:40:02 +00:00
$(vkparse_src)
[vulkan] Start work on scripted pipeline Nothing is actually done yet other than parsing the built-in property list to property list items (the actual parser is just a skeleton), but everything compiles
2020-07-16 06:42:49 +00:00
BUILT_SOURCES += $(shader_gen)
[vulkan] Add support for building and loading shaders Shaders can be built as spv files and installed into $libdir/quakeforge/shaders or as spvc files and compiled into the engine. Loading supports $builtin/name to access builtin shaders, $shader/path to access external standard shaders and quake filesystem access for all other paths.
2020-12-23 05:32:29 +00:00
#shader_DATA += \
# libs/video/renderer/vulkan/passthrough.vert.spv \
# libs/video/renderer/vulkan/pushcolor.frag.spv
[build] Get make distcheck working again again... This covers only the basic check with a build in debian, but it's a good start.
2021-03-29 08:35:30 +00:00
EXTRA_DIST += \
[build] Fix distcheck once again Probably the hardest part of QF to maintain.
2022-12-02 08:10:04 +00:00
libs/video/renderer/vulkan/vkparse.plist \
libs/video/renderer/vulkan/vkparse.h \
[vulkan] Attempt to load the render info spec It fails due to not supporting labeled arrays yet. I'm currently thinking about the design for vkgen.
2023-02-10 02:04:11 +00:00
$(rp_main_def_src) \
[vulkan] Clean up the sampler config loading Samplers have no direct relation to render passes or pipelines, so should not necessarily be in the same config file. This makes all the old config files obsolete, and quite a bit of support code in vkparse.c.
2023-06-25 14:33:47 +00:00
$(smp_quake_src) \
[vulkan] Move oit blending into compose subpass I had debated putting the blending in the compose subpass or a separate pass but went with the separate pass originally, but it turns out that removing the separate pass gains 1-3% (5-15/545 fps in a timedemo of demo1).
2022-12-01 14:03:55 +00:00
$(oit_blend) \
$(oit_store) \
$(oit_h) \
[build] Fix distcheck once again Probably the hardest part of QF to maintain.
2022-12-02 08:10:04 +00:00
$(matrices_h) \
$(entity_h) \
$(slice_src) \
$(linev_src) \
$(linef_src) \
$(partphysicsc_src) \
$(partupdatec_src) \
$(particlev_src) \
$(particleg_src) \
$(particlef_src) \
$(sprite_gbufv_src) \
$(sprite_gbuff_src) \
$(sprite_depthv_src) \
$(sprite_depthf_src) \
$(twod_depthf_src) \
$(twodv_src) \
$(twodf_src) \
$(quakebspv_src) \
$(quakebspf_src) \
$(bsp_depth_src) \
$(bsp_gbufv_src) \
$(bsp_gbufg_src) \
$(bsp_gbuff_src) \
$(bsp_shadow_src) \
$(bsp_skyf_src) \
$(bsp_turbf_src) \
$(lightingf_src) \
$(composef_src) \
$(aliasv_src) \
$(aliasf_src) \
$(alias_depth_src) \
$(alias_gbuf_src) \
$(alias_shadow_src) \
$(iqmv_src) \
$(iqmf_src) \
$(output_src) \
$(passthrough_src) \
$(fstriangle_src) \
$(fstrianglest_src) \
$(pushcolor_src) \
[vulkan] Implement most of the changes for cube rendering There are some missing parts from this commit as these are the fairly clean changes. Missing is building a separate set of pipelines for the new render pass (might be able to get away from that), OIT heads texture is flat rather than an array, view matrices aren't set up, and the fisheye renderer isn't hooked up to the output pass (code exists but is messy). However, with the missing parts included, testing shows things mostly working: the cube map is rendered correctly even though it's not displayed correctly (incorrect view). This has definitely proven to be a good test for Vulkan's multiview feature (very nice).
2023-01-23 02:14:06 +00:00
$(fisheye_src) \
[build] Fix distcheck once again Probably the hardest part of QF to maintain.
2022-12-02 08:10:04 +00:00
$(waterwarp_src)
Reference in a new issue Copy permalink