v2024.1 flatpak build fails: validation_state.cpp error: ‘BlockMatchSamplerQCOM’ is not a member of ‘spv::Decoration’

[fastrizwaan]

FAILED: third_party/spirv-tools/source/CMakeFiles/SPIRV-Tools-shared.dir/val/validation_state.cpp.o 
/usr/bin/c++ -DSPIRV_COLOR_TERMINAL -DSPIRV_LINUX -DSPIRV_TIMER_ENABLED -DSPIRV_TOOLS_IMPLEMENTATION -DSPIRV_TOOLS_SHAREDLIB -DSPIRV_Tools_shared_EXPORTS -I/run/build/shaderc/third_party/spirv-tools -I/run/build/shaderc/third_party/spirv-tools/include -I/run/build/shaderc/_flatpak_build/third_party/spirv-tools -I/run/build/shaderc/third_party/spirv-headers/include -O2 -pipe -g -Wp,-D_FORTIFY_SOURCE=2 -Wp,-D_GLIBCXX_ASSERTIONS -fexceptions -fstack-protector-strong -grecord-gcc-switches -fasynchronous-unwind-tables -fstack-clash-protection -fcf-protection -fno-omit-frame-pointer -Wimplicit-fallthrough -g -std=c++17 -fPIC -fvisibility=hidden -Wextra-semi -w -DSPIRV_CHECK_CONTEXT -Wall -Wextra -Wnon-virtual-dtor -Wno-missing-field-initializers -Werror -Wno-long-long -Wshadow -Wundef -Wconversion -Wno-sign-conversion -fno-exceptions -MD -MT third_party/spirv-tools/source/CMakeFiles/SPIRV-Tools-shared.dir/val/validation_state.cpp.o -MF third_party/spirv-tools/source/CMakeFiles/SPIRV-Tools-shared.dir/val/validation_state.cpp.o.d -o third_party/spirv-tools/source/CMakeFiles/SPIRV-Tools-shared.dir/val/validation_state.cpp.o -c /run/build/shaderc/third_party/spirv-tools/source/val/validation_state.cpp
/run/build/shaderc/third_party/spirv-tools/source/val/validation_state.cpp: In member function ‘void spvtools::val::ValidationState_t::RegisterQCOMImageProcessingTextureConsumer(uint32_t, const spvtools::val::Instruction*, const spvtools::val::Instruction*)’:
/run/build/shaderc/third_party/spirv-tools/source/val/validation_state.cpp:619:50: error: ‘BlockMatchSamplerQCOM’ is not a member of ‘spv::Decoration’; did you mean ‘BlockMatchTextureQCOM’?
  619 |       HasDecoration(texture_id, spv::Decoration::BlockMatchSamplerQCOM)) {
      |                                                  ^~~~~~~~~~~~~~~~~~~~~
      |                                                  BlockMatchTextureQCOM
[96/409] Building CXX object third_party/spirv-tools/source/CMakeFiles/SPIRV-Tools-shared.dir/val/validate_type.cpp.o
[97/409] Building CXX object third_party/spirv-tools/source/CMakeFiles/SPIRV-Tools-shared.dir/val/validate_interfaces.cpp.o
[98/409] Building CXX object third_party/glslang/glslang/CMakeFiles/MachineIndependent.dir/cmake_pch.hxx.gch
[99/409] Building CXX object third_party/glslang/SPIRV/CMakeFiles/SPVRemapper.dir/SPVRemapper.cpp.o
[100/409] Building CXX object third_party/spirv-tools/source/CMakeFiles/SPIRV-Tools-shared.dir/val/validate.cpp.o
[101/409] Building CXX object third_party/spirv-tools/source/CMakeFiles/SPIRV-Tools-shared.dir/val/validate_memory.cpp.o
[102/409] Building CXX object third_party/spirv-tools/source/CMakeFiles/SPIRV-Tools-shared.dir/val/function.cpp.o
[103/409] Building CXX object third_party/spirv-tools/source/CMakeFiles/SPIRV-Tools-shared.dir/val/validate_extensions.cpp.o
[104/409] Building CXX object third_party/spirv-tools/source/CMakeFiles/SPIRV-Tools-shared.dir/val/validate_decorations.cpp.o
[105/409] Building CXX object third_party/spirv-tools/source/CMakeFiles/SPIRV-Tools-shared.dir/val/validate_builtins.cpp.o
ninja: build stopped: subcommand failed.
FB: host_command_exited_cb 151816 256

https://buildbot.flathub.org/#/builders/5/builds/14038

Hi, spirv-tools fails to build on freedesktop 23.08 flatpak container.

v2023.2 builds fine.

It is being used in MPV flatpak. Kindly advise. https://github.com/flathub/io.mpv.Mpv/pull/425

[alan-baker]

You are using mismatched SPIRV-Headers. Use the commit mentioned in the DEPS file.

[fastrizwaan]

thank you. it worked.