Skip to content

Commit 4066b98

Browse files
ziga-lunargziga-lunarg
committed
tests: Rename descriptor heap ext tests
1 parent b5f924b commit 4066b98

18 files changed

Lines changed: 860 additions & 860 deletions

‎tests/CMakeLists.txt‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -59,10 +59,10 @@ target_sources(vk_layer_validation_tests PRIVATE
5959
unit/legacy_positive.cpp
6060
unit/descriptor_buffer.cpp
6161
unit/descriptor_buffer_positive.cpp
62-
unit/descriptor_heap.cpp
63-
unit/descriptor_heap_positive.cpp
64-
unit/descriptor_heap_untyped.cpp
65-
unit/descriptor_heap_untyped_positive.cpp
62+
unit/descriptor_heap_ext.cpp
63+
unit/descriptor_heap_ext_positive.cpp
64+
unit/descriptor_heap_untyped_ext.cpp
65+
unit/descriptor_heap_untyped_ext_positive.cpp
6666
unit/descriptor_indexing.cpp
6767
unit/descriptor_indexing_positive.cpp
6868
unit/descriptors.cpp
@@ -111,8 +111,8 @@ target_sources(vk_layer_validation_tests PRIVATE
111111
unit/gpu_av_descriptor_class_general_buffer_coop_mat_positive.cpp
112112
unit/gpu_av_descriptor_class_texel_buffer.cpp
113113
unit/gpu_av_descriptor_class_texel_buffer_positive.cpp
114-
unit/gpu_av_descriptor_heap.cpp
115-
unit/gpu_av_descriptor_heap_positive.cpp
114+
unit/gpu_av_descriptor_heap_ext.cpp
115+
unit/gpu_av_descriptor_heap_ext_positive.cpp
116116
unit/gpu_av_descriptor_indexing.cpp
117117
unit/gpu_av_descriptor_indexing_positive.cpp
118118
unit/gpu_av_descriptor_post_process.cpp

‎tests/framework/descriptor_heap_object.cpp‎

Lines changed: 24 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -38,26 +38,26 @@ static bool IsImage(VkDescriptorType type) {
3838
VK_DESCRIPTOR_TYPE_SAMPLE_WEIGHT_IMAGE_QCOM, VK_DESCRIPTOR_TYPE_STORAGE_IMAGE, VK_DESCRIPTOR_TYPE_INPUT_ATTACHMENT});
3939
}
4040

41-
void DescriptorHeap::AddDescriptorHeapRequirements(VkLayerTest& test) {
41+
void DescriptorHeapEXT::AddDescriptorHeapRequirements(VkLayerTest& test) {
4242
test.AddRequiredExtensions(VK_EXT_DESCRIPTOR_HEAP_EXTENSION_NAME);
4343
test.AddRequiredFeature(vkt::Feature::bufferDeviceAddress);
4444
test.AddRequiredFeature(vkt::Feature::descriptorHeap);
4545
}
4646

47-
void DescriptorHeap::AddUntypedDescriptorHeapRequirements(VkLayerTest &test) {
47+
void DescriptorHeapEXT::AddUntypedDescriptorHeapRequirements(VkLayerTest &test) {
4848
test.AddRequiredExtensions(VK_EXT_DESCRIPTOR_HEAP_EXTENSION_NAME);
4949
test.AddRequiredExtensions(VK_KHR_SHADER_UNTYPED_POINTERS_EXTENSION_NAME);
5050
test.AddRequiredFeature(vkt::Feature::shaderUntypedPointers);
5151
test.AddRequiredFeature(vkt::Feature::bufferDeviceAddress);
5252
test.AddRequiredFeature(vkt::Feature::descriptorHeap);
5353
}
5454

55-
DescriptorHeap::DescriptorHeap(VkLayerTest& test) : test_(&test) {
55+
DescriptorHeapEXT::DescriptorHeapEXT(VkLayerTest& test) : test_(&test) {
5656
heap_props.pNext = &tensor_heap_props;
5757
test_->GetPhysicalDeviceProperties2(heap_props);
5858
}
5959

60-
void DescriptorHeap::CreateResourceHeap(VkDeviceSize app_size, bool reserved_range_in_front) {
60+
void DescriptorHeapEXT::CreateResourceHeap(VkDeviceSize app_size, bool reserved_range_in_front) {
6161
resource_reserved_range_in_front_ = reserved_range_in_front;
6262
const VkDeviceSize heap_size = AlignResource(app_size + heap_props.minResourceHeapReservedRange);
6363

@@ -73,7 +73,7 @@ void DescriptorHeap::CreateResourceHeap(VkDeviceSize app_size, bool reserved_ran
7373
}
7474
}
7575

76-
void DescriptorHeap::CreateSamplerHeap(VkDeviceSize app_size, bool reserved_range_in_front, bool use_embedded_samplers) {
76+
void DescriptorHeapEXT::CreateSamplerHeap(VkDeviceSize app_size, bool reserved_range_in_front, bool use_embedded_samplers) {
7777
embedded_samplers = use_embedded_samplers;
7878
sampler_reserved_range_in_front_ = reserved_range_in_front;
7979
const VkDeviceSize reserved_range =
@@ -92,12 +92,12 @@ void DescriptorHeap::CreateSamplerHeap(VkDeviceSize app_size, bool reserved_rang
9292
}
9393
}
9494

95-
VkDeviceSize DescriptorHeap::WriteBufferDescriptor(const vkt::Buffer& buffer, VkDescriptorType desc_type) {
95+
VkDeviceSize DescriptorHeapEXT::WriteBufferDescriptor(const vkt::Buffer& buffer, VkDescriptorType desc_type) {
9696
const VkDeviceAddressRangeKHR addr_range = buffer.AddressRange();
9797
return WriteBufferDescriptor(addr_range, desc_type);
9898
}
9999

100-
VkDeviceSize DescriptorHeap::WriteBufferDescriptor(VkDeviceAddressRangeKHR addr_range, VkDescriptorType desc_type) {
100+
VkDeviceSize DescriptorHeapEXT::WriteBufferDescriptor(VkDeviceAddressRangeKHR addr_range, VkDescriptorType desc_type) {
101101
heap_offset_ = Align(heap_offset_, heap_props.bufferDescriptorAlignment);
102102
const VkDeviceSize write_offset = WriteBufferDescriptorAtOffset(addr_range, desc_type, heap_offset_);
103103

@@ -107,19 +107,19 @@ VkDeviceSize DescriptorHeap::WriteBufferDescriptor(VkDeviceAddressRangeKHR addr_
107107
return write_offset;
108108
}
109109

110-
VkDeviceSize DescriptorHeap::WriteBufferDescriptorAtOffset(const vkt::Buffer& buffer, VkDescriptorType desc_type,
110+
VkDeviceSize DescriptorHeapEXT::WriteBufferDescriptorAtOffset(const vkt::Buffer& buffer, VkDescriptorType desc_type,
111111
VkDeviceSize heap_offset) {
112112
return WriteBufferDescriptorAtOffset(buffer.AddressRange(), desc_type, heap_offset);
113113
}
114114

115-
VkDeviceSize DescriptorHeap::WriteBufferDescriptorAtOffset(VkDeviceAddressRangeKHR addr_range, VkDescriptorType desc_type,
115+
VkDeviceSize DescriptorHeapEXT::WriteBufferDescriptorAtOffset(VkDeviceAddressRangeKHR addr_range, VkDescriptorType desc_type,
116116
VkDeviceSize heap_offset) {
117117
assert(IsValueIn(desc_type, {VK_DESCRIPTOR_TYPE_UNIFORM_BUFFER, VK_DESCRIPTOR_TYPE_STORAGE_BUFFER,
118118
VK_DESCRIPTOR_TYPE_UNIFORM_TEXEL_BUFFER, VK_DESCRIPTOR_TYPE_STORAGE_TEXEL_BUFFER}));
119119
return WriteDescriptorAtOffset(addr_range, desc_type, heap_offset);
120120
}
121121

122-
VkDeviceSize DescriptorHeap::WriteImageDescriptorAtOffset(const vkt::Image& image, VkDeviceSize heap_offset,
122+
VkDeviceSize DescriptorHeapEXT::WriteImageDescriptorAtOffset(const vkt::Image& image, VkDeviceSize heap_offset,
123123
VkDescriptorType desc_type, VkImageLayout layout) {
124124
VkImageViewCreateInfo view_info = image.BasicViewCreatInfo();
125125
VkImageDescriptorInfoEXT image_info = vku::InitStructHelper();
@@ -128,7 +128,7 @@ VkDeviceSize DescriptorHeap::WriteImageDescriptorAtOffset(const vkt::Image& imag
128128
return WriteDescriptorAtOffset(&image_info, desc_type, heap_offset);
129129
}
130130

131-
VkDeviceSize DescriptorHeap::WriteImageDescriptor(const vkt::Image& image, VkDescriptorType desc_type, VkImageLayout layout) {
131+
VkDeviceSize DescriptorHeapEXT::WriteImageDescriptor(const vkt::Image& image, VkDescriptorType desc_type, VkImageLayout layout) {
132132
heap_offset_ = Align(heap_offset_, heap_props.imageDescriptorAlignment);
133133

134134
VkImageViewCreateInfo view_info = image.BasicViewCreatInfo();
@@ -144,12 +144,12 @@ VkDeviceSize DescriptorHeap::WriteImageDescriptor(const vkt::Image& image, VkDes
144144
return write_offset;
145145
}
146146

147-
VkDeviceSize DescriptorHeap::WriteAccelerationStructureDescriptor(vkt::as::AccelerationStructureKHR& as) {
147+
VkDeviceSize DescriptorHeapEXT::WriteAccelerationStructureDescriptor(vkt::as::AccelerationStructureKHR& as) {
148148
const VkDeviceAddress as_addr = as.GetAccelerationStructureDeviceAddress();
149149
return WriteAccelerationStructureDescriptor(as_addr);
150150
}
151151

152-
VkDeviceSize DescriptorHeap::WriteAccelerationStructureDescriptor(VkDeviceAddress as_addr) {
152+
VkDeviceSize DescriptorHeapEXT::WriteAccelerationStructureDescriptor(VkDeviceAddress as_addr) {
153153
constexpr VkDescriptorType as_desc_type = VK_DESCRIPTOR_TYPE_ACCELERATION_STRUCTURE_KHR;
154154
heap_offset_ = Align(heap_offset_, heap_props.bufferDescriptorAlignment);
155155
// Per the spec, size can be 0
@@ -162,7 +162,7 @@ VkDeviceSize DescriptorHeap::WriteAccelerationStructureDescriptor(VkDeviceAddres
162162
return write_offset;
163163
}
164164

165-
VkDeviceSize DescriptorHeap::WriteSamplerDescriptor(VkSamplerCreateInfo* sampler_create_info) {
165+
VkDeviceSize DescriptorHeapEXT::WriteSamplerDescriptor(VkSamplerCreateInfo* sampler_create_info) {
166166
VkSamplerCreateInfo safe_create_info = SafeSaneSamplerCreateInfo();
167167

168168
sampler_heap_offset_ = Align(sampler_heap_offset_, heap_props.samplerDescriptorAlignment);
@@ -180,7 +180,7 @@ VkDeviceSize DescriptorHeap::WriteSamplerDescriptor(VkSamplerCreateInfo* sampler
180180
return write_offset;
181181
}
182182

183-
VkDeviceSize DescriptorHeap::WriteSamplerDescriptorAtOffset(VkSamplerCreateInfo* sampler_create_info, VkDeviceSize heap_offset) {
183+
VkDeviceSize DescriptorHeapEXT::WriteSamplerDescriptorAtOffset(VkSamplerCreateInfo* sampler_create_info, VkDeviceSize heap_offset) {
184184
VkSamplerCreateInfo safe_create_info = SafeSaneSamplerCreateInfo();
185185

186186
VkHostAddressRangeEXT sampler_host_data{};
@@ -193,7 +193,7 @@ VkDeviceSize DescriptorHeap::WriteSamplerDescriptorAtOffset(VkSamplerCreateInfo*
193193
return heap_offset;
194194
}
195195

196-
VkDeviceSize DescriptorHeap::WriteNullDescriptorAtOffset(VkDescriptorType desc_type, VkDeviceSize heap_offset) {
196+
VkDeviceSize DescriptorHeapEXT::WriteNullDescriptorAtOffset(VkDescriptorType desc_type, VkDeviceSize heap_offset) {
197197
assert(resource_heap_.handle() != VK_NULL_HANDLE);
198198
VkResourceDescriptorInfoEXT desc_info = vku::InitStructHelper();
199199
desc_info.type = desc_type;
@@ -216,23 +216,23 @@ VkDeviceSize DescriptorHeap::WriteNullDescriptorAtOffset(VkDescriptorType desc_t
216216
return heap_offset;
217217
}
218218

219-
VkDeviceSize DescriptorHeap::AlignResource(VkDeviceSize offset) {
219+
VkDeviceSize DescriptorHeapEXT::AlignResource(VkDeviceSize offset) {
220220
VkDeviceSize aligned_offset = Align(offset, heap_props.bufferDescriptorAlignment);
221221
aligned_offset = Align(aligned_offset, heap_props.imageDescriptorAlignment);
222222
return aligned_offset;
223223
}
224224

225-
VkDeviceSize DescriptorHeap::AlignSampler(VkDeviceSize offset) { return Align(offset, heap_props.samplerDescriptorAlignment); }
225+
VkDeviceSize DescriptorHeapEXT::AlignSampler(VkDeviceSize offset) { return Align(offset, heap_props.samplerDescriptorAlignment); }
226226

227-
VkDeviceSize DescriptorHeap::GetResourceHeapReservedRangeOffset() const {
227+
VkDeviceSize DescriptorHeapEXT::GetResourceHeapReservedRangeOffset() const {
228228
if (resource_reserved_range_in_front_) {
229229
return 0;
230230
} else {
231231
return resource_heap_.CreateInfo().size - heap_props.minResourceHeapReservedRange;
232232
}
233233
}
234234

235-
VkDeviceSize DescriptorHeap::GetSamplerHeapReservedRangeOffset() const {
235+
VkDeviceSize DescriptorHeapEXT::GetSamplerHeapReservedRangeOffset() const {
236236
const VkDeviceSize min_reserved_range =
237237
embedded_samplers ? heap_props.minSamplerHeapReservedRangeWithEmbedded : heap_props.minSamplerHeapReservedRange;
238238
if (resource_reserved_range_in_front_) {
@@ -242,15 +242,15 @@ VkDeviceSize DescriptorHeap::GetSamplerHeapReservedRangeOffset() const {
242242
}
243243
}
244244

245-
void DescriptorHeap::BindResourceHeap(vkt::CommandBuffer& cmd_buffer) {
245+
void DescriptorHeapEXT::BindResourceHeap(vkt::CommandBuffer& cmd_buffer) {
246246
VkBindHeapInfoEXT bind_resource_info = vku::InitStructHelper();
247247
bind_resource_info.heapRange = resource_heap_.AddressRange();
248248
bind_resource_info.reservedRangeOffset = GetResourceHeapReservedRangeOffset();
249249
bind_resource_info.reservedRangeSize = heap_props.minResourceHeapReservedRange;
250250
vk::CmdBindResourceHeapEXT(cmd_buffer, &bind_resource_info);
251251
}
252252

253-
void DescriptorHeap::BindSamplerHeap(vkt::CommandBuffer &cmd_buffer) {
253+
void DescriptorHeapEXT::BindSamplerHeap(vkt::CommandBuffer &cmd_buffer) {
254254
const VkDeviceSize min_reserved_range =
255255
embedded_samplers ? heap_props.minSamplerHeapReservedRangeWithEmbedded : heap_props.minSamplerHeapReservedRange;
256256
VkBindHeapInfoEXT bind_resource_info = vku::InitStructHelper();
@@ -261,7 +261,7 @@ void DescriptorHeap::BindSamplerHeap(vkt::CommandBuffer &cmd_buffer) {
261261
}
262262

263263
// Buffer variation
264-
VkDeviceSize DescriptorHeap::WriteDescriptorAtOffset(VkDeviceAddressRangeKHR addr_range, VkDescriptorType desc_type,
264+
VkDeviceSize DescriptorHeapEXT::WriteDescriptorAtOffset(VkDeviceAddressRangeKHR addr_range, VkDescriptorType desc_type,
265265
VkDeviceSize heap_offset) {
266266
assert(resource_heap_.handle() != VK_NULL_HANDLE);
267267
VkResourceDescriptorInfoEXT desc_info = vku::InitStructHelper();
@@ -280,7 +280,7 @@ VkDeviceSize DescriptorHeap::WriteDescriptorAtOffset(VkDeviceAddressRangeKHR add
280280
}
281281

282282
// Image variation
283-
VkDeviceSize DescriptorHeap::WriteDescriptorAtOffset(const VkImageDescriptorInfoEXT* image_info, VkDescriptorType desc_type,
283+
VkDeviceSize DescriptorHeapEXT::WriteDescriptorAtOffset(const VkImageDescriptorInfoEXT* image_info, VkDescriptorType desc_type,
284284
VkDeviceSize heap_offset) {
285285
assert(resource_heap_.handle() != VK_NULL_HANDLE);
286286
VkResourceDescriptorInfoEXT desc_info = vku::InitStructHelper();

‎tests/framework/descriptor_heap_object.h‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,12 +30,12 @@ namespace as {
3030
class AccelerationStructureKHR;
3131
}
3232

33-
class DescriptorHeap {
33+
class DescriptorHeapEXT {
3434
public:
3535
static void AddDescriptorHeapRequirements(VkLayerTest& test);
3636
static void AddUntypedDescriptorHeapRequirements(VkLayerTest &test);
3737

38-
DescriptorHeap(VkLayerTest& test);
38+
DescriptorHeapEXT(VkLayerTest& test);
3939
void CreateResourceHeap(VkDeviceSize app_size, bool reserved_range_in_front = false);
4040
void CreateSamplerHeap(VkDeviceSize app_size, bool reserved_range_in_front = false, bool use_embedded_samplers = false);
4141

‎tests/framework/layer_validation_tests.h‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -290,7 +290,7 @@ class GpuAVRayQueryTest : public GpuAVTest {
290290
void InitGpuAVRayQuery(std::vector<VkLayerSettingEXT> layer_settings = {});
291291
};
292292

293-
class GpuAVDescriptorHeap : public GpuAVTest {
293+
class GpuAVDescriptorHeapEXT : public GpuAVTest {
294294
public:
295295
void InitGpuAVDescriptorHeap(std::vector<VkLayerSettingEXT> layer_settings = {}, bool safe_mode = true);
296296

@@ -336,7 +336,7 @@ class DescriptorIndexingTest : public VkLayerTest {
336336
void ComputePipelineShaderTest(const char *shader, std::vector<VkDescriptorSetLayoutBinding> &bindings);
337337
};
338338

339-
class DescriptorHeapTest : public VkLayerTest {
339+
class DescriptorHeapTestEXT : public VkLayerTest {
340340
public:
341341
void InitBasicDescriptorHeap();
342342
void InitUntypedDescriptorHeap();

‎tests/framework/pipeline_helper.cpp‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -468,9 +468,9 @@ SimpleGPL::SimpleGPL(VkLayerTest& test, VkPipelineLayout layout, const char* ver
468468
pipe_.Init(*device, exe_pipe_ci);
469469
}
470470

471-
HeapComputePipeline::HeapComputePipeline(vkt::Device& device, const char* source, const spv_target_env env,
472-
const VkShaderDescriptorSetAndBindingMappingInfoEXT* mapping_info,
473-
SpvSourceType source_type, const VkSpecializationInfo* specialization_info) {
471+
HeapComputePipelineEXT::HeapComputePipelineEXT(vkt::Device& device, const char* source, const spv_target_env env,
472+
const VkShaderDescriptorSetAndBindingMappingInfoEXT* mapping_info,
473+
SpvSourceType source_type, const VkSpecializationInfo* specialization_info) {
474474
VkShaderObj cs_module(device, source, VK_SHADER_STAGE_COMPUTE_BIT, env, source_type, specialization_info);
475475

476476
VkPipelineCreateFlags2CreateInfoKHR flags2_ci = vku::InitStructHelper();

‎tests/framework/pipeline_helper.h‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -227,12 +227,12 @@ class SimpleGPL {
227227

228228
// Helper to more quickly build heap pipelines
229229
// (which don't have things like pipeline layouts or descriptor sets)
230-
class HeapComputePipeline {
230+
class HeapComputePipelineEXT {
231231
public:
232232
// Force spirv env as likely don't want to build with 1.0
233-
HeapComputePipeline(vkt::Device& device, const char* source, const spv_target_env env,
234-
const VkShaderDescriptorSetAndBindingMappingInfoEXT* mapping_info = nullptr,
235-
SpvSourceType source_type = SPV_SOURCE_GLSL, const VkSpecializationInfo* specialization_info = nullptr);
233+
HeapComputePipelineEXT(vkt::Device& device, const char* source, const spv_target_env env,
234+
const VkShaderDescriptorSetAndBindingMappingInfoEXT* mapping_info = nullptr,
235+
SpvSourceType source_type = SPV_SOURCE_GLSL, const VkSpecializationInfo* specialization_info = nullptr);
236236

237237
const VkPipeline& Handle() const { return pipe_.handle(); }
238238
operator VkPipeline() const { return pipe_; }

‎tests/unit/debug_printf.cpp‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -5843,8 +5843,8 @@ TEST_F(NegativeDebugPrintf, DescriptorHeap) {
58435843
mapping_info.mappingCount = 1u;
58445844
mapping_info.pMappings = &mapping;
58455845

5846-
vkt::HeapComputePipeline pipe(*m_device, cs_source, SPV_ENV_VULKAN_1_0, &mapping_info);
5847-
vkt::HeapComputePipeline pipe2(*m_device, cs_source, SPV_ENV_VULKAN_1_0, &mapping_info);
5846+
vkt::HeapComputePipelineEXT pipe(*m_device, cs_source, SPV_ENV_VULKAN_1_0, &mapping_info);
5847+
vkt::HeapComputePipelineEXT pipe2(*m_device, cs_source, SPV_ENV_VULKAN_1_0, &mapping_info);
58485848

58495849
VkBindHeapInfoEXT bind_resource_info = vku::InitStructHelper();
58505850
bind_resource_info.heapRange.address = descriptor_heap.Address();
@@ -6024,7 +6024,7 @@ TEST_F(NegativeDebugPrintf, DescriptorHeapUntypedPointers) {
60246024
debugPrintfEXT("c == %u\n", heapBuffer[2].data);
60256025
}
60266026
)glsl";
6027-
vkt::HeapComputePipeline pipe(*m_device, cs_source, SPV_ENV_VULKAN_1_2);
6027+
vkt::HeapComputePipelineEXT pipe(*m_device, cs_source, SPV_ENV_VULKAN_1_2);
60286028

60296029
VkBindHeapInfoEXT bind_resource_info = vku::InitStructHelper();
60306030
bind_resource_info.heapRange.address = descriptor_heap.Address();
@@ -6264,7 +6264,7 @@ TEST_F(NegativeDebugPrintf, DescriptorHeapPushConstantOnly) {
62646264
debugPrintfEXT("int == %u", pc.x);
62656265
}
62666266
)glsl";
6267-
vkt::HeapComputePipeline pipe(*m_device, cs_source, SPV_ENV_VULKAN_1_0);
6267+
vkt::HeapComputePipelineEXT pipe(*m_device, cs_source, SPV_ENV_VULKAN_1_0);
62686268

62696269
m_command_buffer.Begin();
62706270
vk::CmdBindPipeline(m_command_buffer, VK_PIPELINE_BIND_POINT_COMPUTE, pipe);
@@ -6338,7 +6338,7 @@ TEST_F(NegativeDebugPrintf, DeviceLocalHeap) {
63386338
mapping_info.mappingCount = 1u;
63396339
mapping_info.pMappings = &mapping;
63406340

6341-
vkt::HeapComputePipeline pipe(*m_device, cs_source, SPV_ENV_VULKAN_1_0, &mapping_info);
6341+
vkt::HeapComputePipelineEXT pipe(*m_device, cs_source, SPV_ENV_VULKAN_1_0, &mapping_info);
63426342

63436343
VkBindHeapInfoEXT bind_resource_info = vku::InitStructHelper();
63446344
bind_resource_info.heapRange.address = descriptor_heap.Address();
@@ -6700,7 +6700,7 @@ TEST_F(NegativeDebugPrintf, DescriptorHeapRebindHeap) {
67006700
mapping_info.mappingCount = 1u;
67016701
mapping_info.pMappings = &mapping;
67026702

6703-
vkt::HeapComputePipeline pipe(*m_device, cs_source, SPV_ENV_VULKAN_1_0, &mapping_info);
6703+
vkt::HeapComputePipelineEXT pipe(*m_device, cs_source, SPV_ENV_VULKAN_1_0, &mapping_info);
67046704

67056705
VkBindHeapInfoEXT bind_resource_info = vku::InitStructHelper();
67066706
bind_resource_info.heapRange.address = descriptor_heap.Address();

0 commit comments

Comments
 (0)