OpenHarmony/third_party_mesa3d
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

anv: use a list of generated shaders

Browse Source 
Signed-off-by: Lionel Landwerlin <lionel.g.landwerlin@intel.com>
Reviewed-by: Ivan Briano <ivan.briano@intel.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/20497>
This commit is contained in:
Lionel Landwerlin
2023-01-02 00:42:59 +02:00
committed by Marge Bot
parent b32303c369
commit ec66054426
2 changed files with 23 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/intel/vulkan/meson.build
View File

@@ -114,7 +114,7 @@ foreach g : [['90', ['gfx8_cmd_buffer.c']],
_gfx_ver = g[0]
libanv_per_hw_ver_libs += static_library(
'anv_per_hw_ver@0@'.format(_gfx_ver),
[anv_per_hw_ver_files, g[1], anv_entrypoints[0], gfx11_generated_draws_spv_h, ],
[anv_per_hw_ver_files, g[1], anv_entrypoints[0], generated_draws_spvs, ],
include_directories : [
inc_include, inc_src, inc_mapi, inc_mesa, inc_gallium, inc_compiler, inc_intel,
],
@@ -205,7 +205,7 @@ libanv_common = static_library(
[
libanv_files, anv_entrypoints, sha1_h,
gen_xml_pack, float64_spv_h,
gfx11_generated_draws_spv_h,
generated_draws_spvs,
],
include_directories : [
inc_include, inc_src, inc_mapi, inc_mesa, inc_gallium, inc_intel, inc_compiler,

35
src/intel/vulkan/shaders/meson.build
View File

@@ -32,17 +32,24 @@ float64_spv_h = custom_target(
]
)
gfx11_generated_draws_spv_h = custom_target(
'gfx11_generated_draws_spv.h',
input : [glsl2spirv, 'gfx11_generated_draws.glsl',
files('common_generated_draws.glsl')],
output : 'gfx11_generated_draws_spv.h',
command : [
prog_python, '@INPUT0@', '@INPUT1@', '@OUTPUT@',
prog_glslang,
'--vn', 'gfx11_generated_draws_spv_source',
'--glsl-version', '450',
'--stage', 'frag',
'-I' + meson.current_source_dir(),
]
)
generated_draws_shaders = [
'gfx11_generated_draws.glsl',
]
generated_draws_spvs = []
foreach f : generated_draws_shaders
spv_filename = f.replace('.glsl', '_spv.h')
src_name = f.replace('.glsl', '_spv_source')
generated_draws_spvs += custom_target(
spv_filename,
input : [glsl2spirv, f, files('common_generated_draws.glsl')],
output : spv_filename,
command : [
prog_python, '@INPUT0@', '@INPUT1@', '@OUTPUT@',
prog_glslang,
'--vn', src_name,
'--glsl-version', '450',
'--stage', 'frag',
'-I' + meson.current_source_dir(),
])
endforeach