graphics/vulkan-validation-layers: unbreak build after 25856cf8cf

layers/gpu_validation/gpu_validation.cpp:1014:48: error: use of undeclared identifier 'kInstBindlessBoundsOutDescSet'; did you mean 'kInstBindlessBoundsOutDescIndex'?
            strm << "(set = " <<  debug_record[kInstBindlessBoundsOutDescSet] << ", binding = " << debug_record[kInstBindlessBoundsOutDescBinding] << ") Index of "
                                               ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~
                                               kInstBindlessBoundsOutDescIndex
/usr/local/include/spirv-tools/instrument.hpp:149:18: note: 'kInstBindlessBoundsOutDescIndex' declared here
static const int kInstBindlessBoundsOutDescIndex = kInstStageOutCnt + 1;
                 ^
layers/gpu_validation/gpu_validation.cpp:1014:113: error: use of undeclared identifier 'kInstBindlessBoundsOutDescBinding'
            strm << "(set = " <<  debug_record[kInstBindlessBoundsOutDescSet] << ", binding = " << debug_record[kInstBindlessBoundsOutDescBinding] << ") Index of "
                                                                                                                ^
layers/gpu_validation/gpu_validation.cpp:1019:47: error: use of undeclared identifier 'kInstBindlessUninitOutDescSet'; did you mean 'kInstBindlessUninitOutDescIndex'?
            strm << "(set = " << debug_record[kInstBindlessUninitOutDescSet] << ", binding = " << debug_record[kInstBindlessUninitOutBinding] << ") Descriptor index "
                                              ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~
                                              kInstBindlessUninitOutDescIndex
/usr/local/include/spirv-tools/instrument.hpp:155:18: note: 'kInstBindlessUninitOutDescIndex' declared here
static const int kInstBindlessUninitOutDescIndex = kInstStageOutCnt + 1;
                 ^
layers/gpu_validation/gpu_validation.cpp:1019:112: error: use of undeclared identifier 'kInstBindlessUninitOutBinding'
            strm << "(set = " << debug_record[kInstBindlessUninitOutDescSet] << ", binding = " << debug_record[kInstBindlessUninitOutBinding] << ") Descriptor index "
                                                                                                               ^
layers/gpu_validation/gpu_validation.cpp:1033:51: error: use of undeclared identifier 'kInstBindlessBuffOOBOutDescSet'; did you mean 'kInstBindlessBuffOOBOutDescIndex'?
                strm << "(set = " << debug_record[kInstBindlessBuffOOBOutDescSet] << ", binding = " << debug_record[kInstBindlessBuffOOBOutDescBinding]
                                                  ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
                                                  kInstBindlessBuffOOBOutDescIndex
/usr/local/include/spirv-tools/instrument.hpp:162:18: note: 'kInstBindlessBuffOOBOutDescIndex' declared here
static const int kInstBindlessBuffOOBOutDescIndex = kInstStageOutCnt + 1;
                 ^
layers/gpu_validation/gpu_validation.cpp:1033:117: error: use of undeclared identifier 'kInstBindlessBuffOOBOutDescBinding'; did you mean 'kInstBindlessBuffOOBOutDescIndex'?
                strm << "(set = " << debug_record[kInstBindlessBuffOOBOutDescSet] << ", binding = " << debug_record[kInstBindlessBuffOOBOutDescBinding]
                                                                                                                    ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
                                                                                                                    kInstBindlessBuffOOBOutDescIndex
/usr/local/include/spirv-tools/instrument.hpp:162:18: note: 'kInstBindlessBuffOOBOutDescIndex' declared here
static const int kInstBindlessBuffOOBOutDescIndex = kInstStageOutCnt + 1;
                 ^
layers/gpu_validation/gpu_validation.cpp:1038:51: error: use of undeclared identifier 'kInstBindlessBuffOOBOutDescSet'; did you mean 'kInstBindlessBuffOOBOutDescIndex'?
                strm << "(set = " << debug_record[kInstBindlessBuffOOBOutDescSet] << ", binding = " << debug_record[kInstBindlessBuffOOBOutDescBinding]
                                                  ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
                                                  kInstBindlessBuffOOBOutDescIndex
/usr/local/include/spirv-tools/instrument.hpp:162:18: note: 'kInstBindlessBuffOOBOutDescIndex' declared here
static const int kInstBindlessBuffOOBOutDescIndex = kInstStageOutCnt + 1;
                 ^
layers/gpu_validation/gpu_validation.cpp:1038:117: error: use of undeclared identifier 'kInstBindlessBuffOOBOutDescBinding'; did you mean 'kInstBindlessBuffOOBOutDescIndex'?
                strm << "(set = " << debug_record[kInstBindlessBuffOOBOutDescSet] << ", binding = " << debug_record[kInstBindlessBuffOOBOutDescBinding]
                                                                                                                    ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
                                                                                                                    kInstBindlessBuffOOBOutDescIndex
/usr/local/include/spirv-tools/instrument.hpp:162:18: note: 'kInstBindlessBuffOOBOutDescIndex' declared here
static const int kInstBindlessBuffOOBOutDescIndex = kInstStageOutCnt + 1;
                 ^
layers/gpu_validation/gpu_validation.cpp:1052:51: error: use of undeclared identifier 'kInstBindlessBuffOOBOutDescSet'; did you mean 'kInstBindlessBuffOOBOutDescIndex'?
                strm << "(set = " << debug_record[kInstBindlessBuffOOBOutDescSet] << ", binding = " << debug_record[kInstBindlessBuffOOBOutDescBinding]
                                                  ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
                                                  kInstBindlessBuffOOBOutDescIndex
/usr/local/include/spirv-tools/instrument.hpp:162:18: note: 'kInstBindlessBuffOOBOutDescIndex' declared here
static const int kInstBindlessBuffOOBOutDescIndex = kInstStageOutCnt + 1;
                 ^
layers/gpu_validation/gpu_validation.cpp:1052:117: error: use of undeclared identifier 'kInstBindlessBuffOOBOutDescBinding'; did you mean 'kInstBindlessBuffOOBOutDescIndex'?
                strm << "(set = " << debug_record[kInstBindlessBuffOOBOutDescSet] << ", binding = " << debug_record[kInstBindlessBuffOOBOutDescBinding]
                                                                                                                    ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
                                                                                                                    kInstBindlessBuffOOBOutDescIndex
/usr/local/include/spirv-tools/instrument.hpp:162:18: note: 'kInstBindlessBuffOOBOutDescIndex' declared here
static const int kInstBindlessBuffOOBOutDescIndex = kInstStageOutCnt + 1;
                 ^
layers/gpu_validation/gpu_validation.cpp:1057:51: error: use of undeclared identifier 'kInstBindlessBuffOOBOutDescSet'; did you mean 'kInstBindlessBuffOOBOutDescIndex'?
                strm << "(set = " << debug_record[kInstBindlessBuffOOBOutDescSet] << ", binding = " << debug_record[kInstBindlessBuffOOBOutDescBinding]
                                                  ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
                                                  kInstBindlessBuffOOBOutDescIndex
/usr/local/include/spirv-tools/instrument.hpp:162:18: note: 'kInstBindlessBuffOOBOutDescIndex' declared here
static const int kInstBindlessBuffOOBOutDescIndex = kInstStageOutCnt + 1;
                 ^
layers/gpu_validation/gpu_validation.cpp:1057:117: error: use of undeclared identifier 'kInstBindlessBuffOOBOutDescBinding'; did you mean 'kInstBindlessBuffOOBOutDescIndex'?
                strm << "(set = " << debug_record[kInstBindlessBuffOOBOutDescSet] << ", binding = " << debug_record[kInstBindlessBuffOOBOutDescBinding]
                                                                                                                    ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
                                                                                                                    kInstBindlessBuffOOBOutDescIndex
/usr/local/include/spirv-tools/instrument.hpp:162:18: note: 'kInstBindlessBuffOOBOutDescIndex' declared here
static const int kInstBindlessBuffOOBOutDescIndex = kInstStageOutCnt + 1;
                 ^

Regressed by:	https://github.com/KhronosGroup/Vulkan-ValidationLayers/commit/da7711a4f0ab
This commit is contained in:
Jan Beich 2023-06-01 01:18:15 +00:00
parent 8a1f869ebd
commit f47ab3c753
2 changed files with 4 additions and 1 deletions

View file

@ -1,11 +1,12 @@
PORTNAME= spirv-tools
DISTVERSIONPREFIX= v
DISTVERSION= 2023.2
PORTREVISION= 1
PORTREVISION= 2
CATEGORIES= graphics
PATCH_SITES= https://github.com/${GH_ACCOUNT}/${GH_PROJECT}/commit/
PATCHFILES+= d4c0abdcad60.patch:-p1 # https://github.com/KhronosGroup/SPIRV-Tools/pull/5178
PATCHFILES+= 0ce36ad7856e.patch:-p1 # https://github.com/KhronosGroup/SPIRV-Tools/pull/5178
MAINTAINER= jbeich@FreeBSD.org
COMMENT= Tools for processing SPIR-V intermediate shader language modules

View file

@ -5,3 +5,5 @@ SHA256 (KhronosGroup-SPIRV-Headers-1.5.4.raytracing.fixed-245-g1feaf44_GH0.tar.g
SIZE (KhronosGroup-SPIRV-Headers-1.5.4.raytracing.fixed-245-g1feaf44_GH0.tar.gz) = 450276
SHA256 (d4c0abdcad60.patch) = 1c90a90b12005fae60baa736e84c76006f88ee2c572332a8851cb7e62338c624
SIZE (d4c0abdcad60.patch) = 146761
SHA256 (0ce36ad7856e.patch) = 14b657e86ae5917cb9103956215a39ba70f3894e468aae16fd49e2830923c506
SIZE (0ce36ad7856e.patch) = 111883