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

506 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_sw32.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_sw32.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_bsp.c \
libs/video/renderer/r_dyn_textures.c \
libs/video/renderer/r_efrag.c \
libs/video/renderer/r_ent.c \
libs/video/renderer/r_graph.c \
libs/video/renderer/r_iqm.c \
libs/video/renderer/r_light.c \
libs/video/renderer/r_main.c \
libs/video/renderer/r_part.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@ \
libs/util/libQFutil.la
libs_video_renderer_libQFrenderer_la_LDFLAGS= @STATIC@
libs_video_renderer_libQFrenderer_la_LIBADD= $(renderer_libs)
libs_video_renderer_libQFrenderer_la_DEPENDENCIES= $(renderer_libs)
libs_video_renderer_libQFrenderer_la_SOURCES=\
[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 \
[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 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)
libs_video_renderer_vid_render_gl_la_LIBADD= $(video_renderer_gl_libs)
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 \
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_screen.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/namehack.h \
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
[build] Move plist rules to root Makefile They are globally useful rather than specific to the vulkan renderer.
2021-11-25 10:59:17 +00:00
SUFFICES += .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)
libs_video_renderer_vid_render_glsl_la_LIBADD= $(video_renderer_glsl_libs)
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 \
libs/video/renderer/glsl/glsl_fog.c \
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_screen.c \
libs/video/renderer/glsl/glsl_shader.c \
libs/video/renderer/glsl/glsl_sprite.c \
libs/video/renderer/glsl/glsl_textures.c \
libs/video/renderer/glsl/namehack.h \
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)
libs_video_renderer_vid_render_sw_la_LIBADD= $(video_renderer_sw_libs)
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_fill.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/screen.c \
libs/video/renderer/sw/surf8.S \
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
video_renderer_sw32_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_sw32.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_sw32_la_LDFLAGS= $(plugin_ldflags)
libs_video_renderer_vid_render_sw32_la_LIBADD= $(video_renderer_sw32_libs)
libs_video_renderer_vid_render_sw32_la_DEPENDENCIES=$(video_renderer_sw32_libs)
libs_video_renderer_vid_render_sw32_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_sw32.c
libs_video_renderer_librender_sw32_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/sw32/d_edge.c \
libs/video/renderer/sw32/d_fill.c \
libs/video/renderer/sw32/d_init.c \
libs/video/renderer/sw32/d_modech.c \
libs/video/renderer/sw32/d_part.c \
libs/video/renderer/sw32/d_polyse.c \
libs/video/renderer/sw32/d_scan.c \
libs/video/renderer/sw32/d_sky.c \
libs/video/renderer/sw32/d_sprite.c \
libs/video/renderer/sw32/d_surf.c \
libs/video/renderer/sw32/d_vars.c \
libs/video/renderer/sw32/d_zpoint.c \
libs/video/renderer/sw32/draw.c \
libs/video/renderer/sw32/namehack.h \
libs/video/renderer/sw32/screen.c \
libs/video/renderer/sw32/sw32_graph.c \
libs/video/renderer/sw32/sw32_raclip.c \
libs/video/renderer/sw32/sw32_ralias.c \
libs/video/renderer/sw32/sw32_rbsp.c \
libs/video/renderer/sw32/sw32_rdraw.c \
libs/video/renderer/sw32/sw32_redge.c \
libs/video/renderer/sw32/sw32_riqm.c \
libs/video/renderer/sw32/sw32_rmain.c \
libs/video/renderer/sw32/sw32_rmisc.c \
libs/video/renderer/sw32/sw32_rpart.c \
libs/video/renderer/sw32/sw32_rsky.c \
libs/video/renderer/sw32/sw32_rsprite.c \
libs/video/renderer/sw32/sw32_rsurf.c \
libs/video/renderer/sw32/vid_common_sw32.c
[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
pipeline_src = libs/video/renderer/vulkan/qfpipeline.plist
pipeline_gen = libs/video/renderer/vulkan/qfpipeline.plc
[vulkan] Start moving towards a deferred renderer After getting lights even vaguely working for alias models, I realized that it just wasn't going to be feasible to do nice lighting with forward rendering. This gets the bulk of the work done for deferred rendering, but still need to sort out the shaders before any real testing can be done.
2021-02-14 02:35:06 +00:00
renderpass_src = libs/video/renderer/vulkan/deferred.plist
renderpass_gen = libs/video/renderer/vulkan/deferred.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)
[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_LIBADD= $(video_renderer_vulkan_libs)
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 \
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 \
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 \
Merge branch 'master' into vulkan
2020-06-25 05:03:52 +00:00
libs/video/renderer/vulkan/renderpass.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] 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 \
[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] 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 \
Merge branch 'master' into vulkan
2020-06-25 05:03:52 +00:00
libs/video/renderer/vulkan/vulkan_vid_common.c
[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.lo: libs/video/renderer/vulkan/vkparse.c $(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
libs/video/renderer/vulkan/shader.lo: libs/video/renderer/vulkan/shader.c $(vkshader_c)
[vulkan] Start moving towards a deferred renderer After getting lights even vaguely working for alias models, I realized that it just wasn't going to be feasible to do nice lighting with forward rendering. This gets the bulk of the work done for deferred rendering, but still need to sort out the shaders before any real testing can be done.
2021-02-14 02:35:06 +00:00
libs/video/renderer/vulkan/vulkan_vid_common.lo: libs/video/renderer/vulkan/vulkan_vid_common.c $(vkparse_src) $(pipeline_gen) ${renderpass_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] 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] 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] 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 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] 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
pushcolor_src = $(vkshaderpath)/pushcolor.frag
pushcolor_c = $(vkshaderpath)/pushcolor.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
shadow_src = $(vkshaderpath)/shadow.geom
shadow_c = $(vkshaderpath)/shadow.geom.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] 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)
$(particlev_c): $(particlev_src)
$(particleg_c): $(particleg_src)
$(particlef_c): $(particlef_src)
[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_gbufv_src)
$(sprite_gbuff_c): $(sprite_gbuff_src)
$(sprite_depthv_c): $(sprite_depthv_src)
$(sprite_depthf_c): $(sprite_depthf_src)
[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
$(twodv_c): $(twodv_src)
$(twodf_c): $(twodf_src)
[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): $(quakebspv_src)
$(quakebspf_c): $(quakebspf_src)
[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_depth_src)
$(bsp_gbufv_c): $(bsp_gbufv_src)
$(bsp_gbufg_c): $(bsp_gbufg_src)
$(bsp_gbuff_c): $(bsp_gbuff_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
$(bsp_shadow_c): $(bsp_shadow_src)
[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): $(bsp_skyf_src)
[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): $(bsp_turbf_src)
[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)
$(composef_c): $(composef_src)
[vulkan] Start work on the alias pipeline
2021-01-25 15:55:45 +00:00
$(aliasv_c): $(aliasv_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_depth_c): $(alias_depth_src)
[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)
[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)
$(pushcolor_c): $(pushcolor_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
$(shadow_c): $(shadow_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
vkshader_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] 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
$(twodv_c) \
$(twodf_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 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] 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) \
$(shadow_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 += \
libs/video/renderer/vulkan/deferred.plist \
libs/video/renderer/vulkan/qfpipeline.plist \
libs/video/renderer/vulkan/vkparse.plist \
libs/video/renderer/vulkan/vkparse.h \
libs/video/renderer/vulkan/shader/alias.frag \
libs/video/renderer/vulkan/shader/alias.vert \
libs/video/renderer/vulkan/shader/alias_depth.vert \
libs/video/renderer/vulkan/shader/alias_gbuf.frag \
[build] Fix some distcheck bitrot
2021-08-02 04:47:00 +00:00
libs/video/renderer/vulkan/shader/alias_shadow.vert \
[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/bsp_depth.vert \
libs/video/renderer/vulkan/shader/bsp_gbuf.frag \
libs/video/renderer/vulkan/shader/bsp_gbuf.geom \
libs/video/renderer/vulkan/shader/bsp_gbuf.vert \
[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
libs/video/renderer/vulkan/shader/bsp_shadow.vert \
[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/bsp_sky.frag \
libs/video/renderer/vulkan/shader/bsp_turb.frag \
libs/video/renderer/vulkan/shader/compose.frag \
libs/video/renderer/vulkan/shader/lighting.frag \
libs/video/renderer/vulkan/shader/passthrough.vert \
[build] Clean up a pile of distcheck issues
2021-12-20 15:40:47 +00:00
libs/video/renderer/vulkan/shader/partphysics.comp \
libs/video/renderer/vulkan/shader/partupdate.comp \
libs/video/renderer/vulkan/shader/particle.vert \
libs/video/renderer/vulkan/shader/particle.geom \
libs/video/renderer/vulkan/shader/particle.frag \
[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/pushcolor.frag \
libs/video/renderer/vulkan/shader/quakebsp.frag \
libs/video/renderer/vulkan/shader/quakebsp.vert \
[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
libs/video/renderer/vulkan/shader/shadow.geom \
[build] Clean up a pile of distcheck issues
2021-12-20 15:40:47 +00:00
libs/video/renderer/vulkan/shader/sprite_depth.vert \
libs/video/renderer/vulkan/shader/sprite_depth.frag \
libs/video/renderer/vulkan/shader/sprite_gbuf.vert \
libs/video/renderer/vulkan/shader/sprite_gbuf.frag \
[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/twod.frag \
libs/video/renderer/vulkan/shader/twod.vert
Reference in a new issue Copy permalink