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

324 lines
12 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@
noinst_LTLIBRARIES += libs/video/renderer/libQFrenderer.la @vid_render_static_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
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 \
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 \
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= \
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) \
libs/video/renderer/vid_render_gl.c \
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] Support silent rules for sed
2020-07-16 16:20:02 +00:00
V_SED = $(V_SED_@AM_V@)
V_SED_ = $(V_SED_@AM_DEFAULT_V@)
V_SED_0 = @echo " SED " $@;
V_SED_1 =
[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
SUFFICES=.frag .vert .spv .spvc .fc .vc .slc .glsl .plist .plc
[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
[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
.plist.plc:
[build] Support silent rules for sed
2020-07-16 16:20:02 +00:00
$(V_SED)sed -e 's/"/\\"/g' -e 's/^/"/' -e 's/$$/\\n"/' $< > $@.t &&\
$(am__mv) $@.t $@
[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
[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= \
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) \
libs/video/renderer/vid_render_glsl.c \
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= \
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) \
libs/video/renderer/vid_render_sw.c \
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= \
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) \
libs/video/renderer/vid_render_sw32.c \
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
[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 = \
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) \
Merge branch 'master' into vulkan
2020-06-25 05:03:52 +00:00
libs/video/renderer/vid_render_vulkan.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/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 \
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/namehack.h \
libs/video/renderer/vulkan/pipeline.c \
libs/video/renderer/vulkan/renderpass.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 \
[vulkan] Use a scrap texture for draw The scrap texture did very good things for the glsl renderer and the better control over data copying might help it do even better things for vulkan, especially with lots of little icons.
2021-01-13 01:43:23 +00:00
libs/video/renderer/vulkan/texture.c \
Merge branch 'master' into vulkan
2020-06-25 05:03:52 +00:00
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 \
Merge branch 'master' into vulkan
2020-06-25 05:03:52 +00:00
libs/video/renderer/vulkan/vulkan_draw.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 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)
libs/video/renderer/vulkan/vulkan_vid_common.lo: libs/video/renderer/vulkan/vulkan_vid_common.c $(vkparse_src) $(pipeline_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
[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
qwaq_curses = ruamoko/qwaq/qwaq-curses$(EXEEXT)
[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
vkparse_cinc = libs/video/renderer/vulkan/vkparse.cinc
vkparse_hinc = 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] 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_src = libs/video/renderer/vulkan/twod.vert
twodv_c = libs/video/renderer/vulkan/twod.vert.spvc
twodf_src = libs/video/renderer/vulkan/twod.frag
twodf_c = libs/video/renderer/vulkan/twod.frag.spvc
[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_src = libs/video/renderer/vulkan/quakebsp.vert
quakebspv_c = libs/video/renderer/vulkan/quakebsp.vert.spvc
quakebspf_src = libs/video/renderer/vulkan/quakebsp.frag
quakebspf_c = libs/video/renderer/vulkan/quakebsp.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
passthrough_src = libs/video/renderer/vulkan/passthrough.vert
passthrough_c = libs/video/renderer/vulkan/passthrough.vert.spvc
pushcolor_src = libs/video/renderer/vulkan/pushcolor.frag
pushcolor_c = libs/video/renderer/vulkan/pushcolor.frag.spvc
[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] 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)
vkshader_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] 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) \
$(pushcolor_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
V_VKGEN = $(V_VKGEN_@AM_V@)
V_VKGEN_ = $(V_VKGEN_@AM_DEFAULT_V@)
V_VKGEN_0 = @echo " VKGEN " $@;
V_VKGEN_1 =
[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): $(vkgen) $(qwaq_curses) $(vkparse_plist)
$(V_VKGEN)$(qwaq_curses) $(vkgen) -- $(vkparse_plist) $(vkparse_cinc).t $(vkparse_hinc).t &&\
$(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 \
[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/*.spv \
libs/video/renderer/vulkan/*.spvc \
[build] Support silent rules for sed
2020-07-16 16:20:02 +00:00
libs/video/renderer/vulkan/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
EXTRA_DIST += $(shader_DATA:.spv=)
Reference in a new issue Copy permalink