FaSTTUBe/GST-Tensordecoder-ov_ep
37
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

vulkan: minor meson clean ups

Browse Source 
Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/4621>
This commit is contained in:
Víctor Manuel Jáquez Leal 2023-05-12 17:13:21 +02:00 committed by GStreamer Marge Bot
parent 0219b6f6fa
commit 7df7efdc3f
2 changed files with 14 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
subprojects/gst-plugins-bad/ext/vulkan/meson.build
View File

@ -15,7 +15,7 @@ assert(glslc.found(), 'Expected glslc to be available')
subdir('shaders') subdir('shaders')
vulkan_sources = [ vulkan_sources = files(
'gstvulkan.c', 'gstvulkan.c',
'gstvulkanelement.c', 'gstvulkanelement.c',
'vkcolorconvert.c', 'vkcolorconvert.c',
@ -27,22 +27,19 @@ vulkan_sources = [
'vkupload.c', 'vkupload.c',
'vkviewconvert.c', 'vkviewconvert.c',
'vkoverlaycompositor.c', 'vkoverlaycompositor.c',
] )
vulkan_plugin_enum_headers = [ vulkan_plugin_enum_headers = files(
'vkviewconvert.h', 'vkviewconvert.h',
] )
vulkan_plugin_enums = gnome.mkenums_simple('gstvulkan-plugins-enumtypes', vulkan_plugin_enums = gnome.mkenums_simple('gstvulkan-plugins-enumtypes',
sources : vulkan_plugin_enum_headers, sources : vulkan_plugin_enum_headers,
body_prefix : '#ifdef HAVE_CONFIG_H\n#include "config.h"\n#endif', body_prefix : '#ifdef HAVE_CONFIG_H\n#include "config.h"\n#endif',
header_prefix : '#include <gst/gst.h>') header_prefix : '#include <gst/gst.h>')
vulkan_plugin_enumtypes_c = vulkan_plugin_enums[0]
vulkan_plugin_enumtypes_h = vulkan_plugin_enums[1]
vulkan_plugin_gen_sources = [vulkan_plugin_enumtypes_h]
gstvulkan_plugin = library('gstvulkan', gstvulkan_plugin = library('gstvulkan',
vulkan_sources, vulkan_compiled_shader_sources, vulkan_plugin_enumtypes_c, vulkan_plugin_enumtypes_h, vulkan_sources, vulkan_compiled_shader_sources, vulkan_plugin_enums,
c_args : gst_plugins_bad_args, c_args : gst_plugins_bad_args,
objc_args : gst_plugins_bad_args, objc_args : gst_plugins_bad_args,
link_args : noseh_link_args, link_args : noseh_link_args,

18
subprojects/gst-plugins-bad/ext/vulkan/shaders/meson.build
View File

@ -43,16 +43,14 @@ foreach shader: gst_vulkan_shader_sources
c_shader_header = basename + '.h' c_shader_header = basename + '.h'
compiled_shader = custom_target(spv_shader, compiled_shader = custom_target(spv_shader,
input: shader, input: shader,
output: spv_shader, output: spv_shader,
depfile: '@PLAINNAME@.d', depfile: '@PLAINNAME@.d',
command: [glslc] + glslc_build_options + [ command: [glslc] + glslc_build_options + [stage_arg,
stage_arg, '--target-env=vulkan1.0',
'--target-env=vulkan1.0', '-MD', '-MF', '@DEPFILE@',
'-MD', '-MF', '@DEPFILE@', '@INPUT@',
'@INPUT@', '-o', '@OUTPUT@'])
'-o', '@OUTPUT@'
])
c_shader = custom_target (c_shader_source, c_shader = custom_target (c_shader_source,
input: compiled_shader, input: compiled_shader,