qf
/
quakeforge
mirror of https://git.code.sf.net/p/quake/quakeforge
0
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

[model] Build vulkan model libs 

The contents are currently empty (required .c files), but this gets the
build system updated.
This commit is contained in:
Bill Currie 2021-01-19 13:53:08 +09:00
parent 6e0cb7b917
commit 7a353d5aee
12 changed files with 93 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
config.d/build_control.m4
View File

@ -72,10 +72,14 @@ if test "x$HAVE_X" = xyes; then
CL_TARGETS="$CL_TARGETS X11"
VID_TARGETS="$VID_TARGETS libs/video/targets/libQFx11.la"
if test "$HAVE_VULKAN" = "yes"; then
QF_NEED(vid_render, [sw sw32 gl glsl vulkan])
else
QF_NEED(vid_render, [sw sw32 gl glsl])
QF_NEED(vid_render, [vulkan])
QF_NEED(models, [vulkan])
QF_NEED(alias, [vulkan])
QF_NEED(brush, [vulkan])
QF_NEED(iqm, [vulkan])
QF_NEED(sprite, [vulkan])
fi
QF_NEED(vid_render, [sw sw32 gl glsl])
QF_NEED(models, [sw gl glsl])
QF_NEED(alias, [sw gl glsl])
QF_NEED(brush, [sw gl glsl])
@ -100,10 +104,13 @@ if test "x$HAVE_SDL" = xyes; then
CL_TARGETS="$CL_TARGETS SDL"
VID_TARGETS="$VID_TARGETS libs/video/targets/libQFsdl.la"
if test "$HAVE_VULKAN" = "yes"; then
QF_NEED(vid_render, [sw sw32 gl glsl vulkan])
else
QF_NEED(vid_render, [sw sw32 gl glsl])
QF_NEED(vid_render, [vulkan])
QF_NEED(alias, [vulkan])
QF_NEED(brush, [vulkan])
QF_NEED(iqm, [vulkan])
QF_NEED(sprite, [vulkan])
fi
QF_NEED(vid_render, [sw sw32 gl glsl])
QF_NEED(models, [sw gl glsl])
QF_NEED(alias, [sw gl glsl])
QF_NEED(brush, [sw gl glsl])
@ -291,11 +298,11 @@ QF_PROCESS_NEED_DIRS(top, [libs hw nq qtv qw tools ruamoko])
QF_PROCESS_NEED_LIBS(swrend, [asm])
QF_PROCESS_NEED_DIRS(vid_render, [gl glsl sw sw32 vulkan])
QF_PROCESS_NEED_LIBS(models, [gl glsl sw], [libs/models])
QF_PROCESS_NEED_LIBS(alias, [gl glsl sw], [libs/models/alias])
QF_PROCESS_NEED_LIBS(brush, [gl glsl sw], [libs/models/brush])
QF_PROCESS_NEED_LIBS(iqm, [gl glsl sw], [libs/models/iqm])
QF_PROCESS_NEED_LIBS(sprite, [gl glsl sw], [libs/models/sprite])
QF_PROCESS_NEED_LIBS(models, [gl glsl sw vulkan], [libs/models])
QF_PROCESS_NEED_LIBS(alias, [gl glsl sw vulkan], [libs/models/alias])
QF_PROCESS_NEED_LIBS(brush, [gl glsl sw vulkan], [libs/models/brush])
QF_PROCESS_NEED_LIBS(iqm, [gl glsl sw vulkan], [libs/models/iqm])
QF_PROCESS_NEED_LIBS(sprite, [gl glsl sw vulkan], [libs/models/sprite])
QF_PROCESS_NEED_LIBS(vid, [common sdl svga x11], [libs/video/targets])
QF_PROCESS_NEED_LIBS(qw, [client common sdl server], [qw/source], a)

17
libs/models/Makemodule.am
View File

@ -6,7 +6,11 @@ include libs/models/test/Makemodule.am
lib_LTLIBRARIES += libs/models/libQFmodels.la
noinst_LTLIBRARIES += @models_libs@
EXTRA_LTLIBRARIES += libs/models/libmodels_gl.la libs/models/libmodels_glsl.la libs/models/libmodels_sw.la
EXTRA_LTLIBRARIES += \
libs/models/libmodels_gl.la \
libs/models/libmodels_glsl.la \
libs/models/libmodels_sw.la \
libs/models/libmodels_vulkan.la
models_sources = libs/models/clip_hull.c libs/models/model.c libs/models/portal.c libs/models/trace.c libs/models/winding.c
@ -53,3 +57,14 @@ libs_models_libmodels_sw_la_LDFLAGS=
libs_models_libmodels_sw_la_LIBADD= $(sw_libs)
libs_models_libmodels_sw_la_DEPENDENCIES= $(sw_libs)
libs_models_libmodels_sw_la_SOURCES= libs/models/sw_skin.c libs/models/skin.c
vulkan_libs= \
libs/models/alias/libalias_vulkan.la \
libs/models/brush/libbrush_vulkan.la \
libs/models/iqm/libiqm_vulkan.la \
libs/models/sprite/libsprite_vulkan.la \
libs/image/libQFimage.la
libs_models_libmodels_vulkan_la_LDFLAGS=
libs_models_libmodels_vulkan_la_LIBADD= $(vulkan_libs)
libs_models_libmodels_vulkan_la_DEPENDENCIES= $(vulkan_libs)
libs_models_libmodels_vulkan_la_SOURCES= libs/models/vulkan_skin.c libs/models/skin.c

15
libs/models/alias/Makemodule.am
View File

@ -1,15 +1,26 @@
noinst_LTLIBRARIES += @alias_libs@
EXTRA_LTLIBRARIES += libs/models/alias/libalias_gl.la libs/models/alias/libalias_glsl.la libs/models/alias/libalias_sw.la
EXTRA_LTLIBRARIES += \
libs/models/alias/libalias_gl.la \
libs/models/alias/libalias_glsl.la \
libs/models/alias/libalias_sw.la \
libs/models/alias/libalias_vulkan.la
alias_src= libs/models/alias/model_alias.c
alias_gl_src= libs/models/alias/gl_mesh.c libs/models/alias/gl_model_alias.c libs/models/alias/floodfill.c
alias_glsl_src= libs/models/alias/glsl_model_alias.c libs/models/alias/floodfill.c
alias_sw_src= libs/models/alias/sw_model_alias.c
alias_vulkan_src= libs/models/alias/vulkan_model_alias.c
libs_models_alias_libalias_gl_la_SOURCES= $(alias_gl_src) $(alias_src)
libs_models_alias_libalias_glsl_la_SOURCES= $(alias_glsl_src) $(alias_src)
libs_models_alias_libalias_sw_la_SOURCES= $(alias_sw_src) $(alias_src)
libs_models_alias_libalias_vulkan_la_SOURCES= $(alias_vulkan_src) $(alias_src)
EXTRA_DIST += $(alias_gl_src) $(alias_glsl_src) $(alias_sw_src) $(alias_src)
EXTRA_DIST += \
$(alias_gl_src) \
$(alias_glsl_src) \
$(alias_sw_src) \
$(alias_vulkan_src) \
$(alias_src)

0
libs/models/alias/vulkan_model_alias.c Normal file
View File

16
libs/models/brush/Makemodule.am
View File

@ -1,10 +1,15 @@
noinst_LTLIBRARIES += libs/models/brush/libbrush.la @brush_libs@
EXTRA_LTLIBRARIES += libs/models/brush/libbrush_gl.la libs/models/brush/libbrush_glsl.la libs/models/brush/libbrush_sw.la
EXTRA_LTLIBRARIES += \
libs/models/brush/libbrush_gl.la \
libs/models/brush/libbrush_glsl.la \
libs/models/brush/libbrush_sw.la \
libs/models/brush/libbrush_vulkan.la
brush_src= libs/models/brush/model_brush.c
brush_gl_src= libs/models/brush/gl_model_brush.c
brush_glsl_src= libs/models/brush/glsl_model_brush.c
brush_sw_src= libs/models/brush/sw_model_brush.c
brush_vulkan_src= libs/models/brush/vulkan_model_brush.c
libs_models_brush_libbrush_la_SOURCES= $(brush_src)
@ -14,4 +19,11 @@ libs_models_brush_libbrush_glsl_la_SOURCES= $(brush_glsl_src) $(brush_src)
libs_models_brush_libbrush_sw_la_SOURCES= $(brush_sw_src) $(brush_src)
EXTRA_DIST += $(brush_gl_src) $(brush_glsl_src) $(brush_sw_src) $(brush_src)
libs_models_brush_libbrush_vulkan_la_SOURCES= $(brush_vulkan_src) $(brush_src)
EXTRA_DIST += \
$(brush_gl_src) \
$(brush_glsl_src) \
$(brush_sw_src) \
${brush_vulkan_src} \
$(brush_src)

0
libs/models/brush/vulkan_model_brush.c Normal file
View File

16
libs/models/iqm/Makemodule.am
View File

@ -1,10 +1,15 @@
noinst_LTLIBRARIES += @iqm_libs@
EXTRA_LTLIBRARIES += libs/models/iqm/libiqm_gl.la libs/models/iqm/libiqm_glsl.la libs/models/iqm/libiqm_sw.la
EXTRA_LTLIBRARIES += \
libs/models/iqm/libiqm_gl.la \
libs/models/iqm/libiqm_glsl.la \
libs/models/iqm/libiqm_sw.la \
libs/models/iqm/libiqm_vulkan.la
iqm_src= libs/models/iqm/model_iqm.c
iqm_gl_src= libs/models/iqm/gl_model_iqm.c
iqm_glsl_src= libs/models/iqm/glsl_model_iqm.c
iqm_sw_src= libs/models/iqm/sw_model_iqm.c
iqm_vulkan_src= libs/models/iqm/vulkan_model_iqm.c
libs_models_iqm_libiqm_gl_la_SOURCES= $(iqm_gl_src) $(iqm_src)
@ -12,4 +17,11 @@ libs_models_iqm_libiqm_glsl_la_SOURCES= $(iqm_glsl_src) $(iqm_src)
libs_models_iqm_libiqm_sw_la_SOURCES= $(iqm_sw_src) $(iqm_src)
EXTRA_DIST += $(iqm_gl_src) $(iqm_glsl_src) $(iqm_sw_src) $(iqm_src)
libs_models_iqm_libiqm_vulkan_la_SOURCES= $(iqm_vulkan_src) $(iqm_src)
EXTRA_DIST += \
$(iqm_gl_src) \
$(iqm_glsl_src) \
$(iqm_sw_src) \
$(iqm_vulkan_src) \
$(iqm_src)

0
libs/models/iqm/vulkan_model_iqm.c Normal file
View File

16
libs/models/sprite/Makemodule.am
View File

@ -1,10 +1,15 @@
noinst_LTLIBRARIES += @sprite_libs@
EXTRA_LTLIBRARIES += libs/models/sprite/libsprite_gl.la libs/models/sprite/libsprite_glsl.la libs/models/sprite/libsprite_sw.la
EXTRA_LTLIBRARIES += \
libs/models/sprite/libsprite_gl.la \
libs/models/sprite/libsprite_glsl.la \
libs/models/sprite/libsprite_sw.la \
libs/models/sprite/libsprite_vulkan.la
sprite_src= libs/models/sprite/model_sprite.c
sprite_gl_src= libs/models/sprite/gl_model_sprite.c
sprite_glsl_src= libs/models/sprite/glsl_model_sprite.c
sprite_sw_src= libs/models/sprite/sw_model_sprite.c
sprite_vulkan_src= libs/models/sprite/vulkan_model_sprite.c
libs_models_sprite_libsprite_gl_la_SOURCES= $(sprite_gl_src) $(sprite_src)
@ -12,4 +17,11 @@ libs_models_sprite_libsprite_glsl_la_SOURCES= $(sprite_glsl_src) $(sprite_src)
libs_models_sprite_libsprite_sw_la_SOURCES= $(sprite_sw_src) $(sprite_src)
EXTRA_DIST += $(sprite_gl_src) $(sprite_glsl_src) $(sprite_sw_src) $(sprite_src)
libs_models_sprite_libsprite_vulkan_la_SOURCES= $(sprite_vulkan_src) $(sprite_src)
EXTRA_DIST += \
$(sprite_gl_src) \
$(sprite_glsl_src) \
$(sprite_sw_src) \
$(sprite_vulkan_src) \
$(sprite_src)

0
libs/models/sprite/vulkan_model_sprite.c Normal file
View File

0
libs/models/vulkan_skin.c Normal file
View File

7
libs/video/renderer/Makemodule.am
View File

@ -210,10 +210,11 @@ libs_video_renderer_vid_render_sw32_la_SOURCES=\
pipeline_src = libs/video/renderer/vulkan/qfpipeline.plist
pipeline_gen = libs/video/renderer/vulkan/qfpipeline.plc
vulkan_libs =
video_renderer_vulkan_libs = \
libs/models/libmodels_vulkan.la
libs_video_renderer_vid_render_vulkan_la_LDFLAGS= $(plugin_ldflags)
libs_video_renderer_vid_render_vulkan_la_LIBADD= $(vulkan_libs)
libs_video_renderer_vid_render_vulkan_la_DEPENDENCIES=$(vulkan_libs)
libs_video_renderer_vid_render_vulkan_la_LIBADD= $(video_renderer_vulkan_libs)
libs_video_renderer_vid_render_vulkan_la_DEPENDENCIES=$(video_renderer_vulkan_libs)
libs_video_renderer_vid_render_vulkan_la_SOURCES = \
$(video_renderer_common_sources) \
libs/video/renderer/vid_render_vulkan.c \