Skip to content

Commit 2be5552

Browse files
authored
Merge branch 'main' into export-D70415647
2 parents 6b34d20 + bdafb22 commit 2be5552

File tree

2 files changed

+4
-3
lines changed

2 files changed

+4
-3
lines changed

backends/vulkan/runtime/api/Context.cpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -274,13 +274,13 @@ VkPipeline Context::get_shader_pipeline(
274274
VkPipelineLayout pipeline_layout =
275275
pipeline_layout_cache().retrieve(shader_layout, push_constants_size);
276276

277-
vkapi::SpecVarList spec_constants_full_list = {4u, 4u, 1u};
278-
spec_constants_full_list.append(spec_constants);
277+
const utils::WorkgroupSize local_workgroup_size(4u, 4u, 1u);
279278

280279
VkPipeline pipeline = pipeline_cache().retrieve(
281280
{pipeline_layout,
282281
shader_cache().retrieve(shader),
283-
spec_constants_full_list});
282+
spec_constants,
283+
local_workgroup_size});
284284

285285
return pipeline;
286286
}

backends/vulkan/runtime/vk_api/Adapter.cpp

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -274,6 +274,7 @@ std::string Adapter::stringize() const {
274274
PRINT_PROP(limits, maxImageDimension1D);
275275
PRINT_PROP(limits, maxImageDimension2D);
276276
PRINT_PROP(limits, maxImageDimension3D);
277+
PRINT_PROP(limits, maxStorageBufferRange);
277278
PRINT_PROP(limits, maxTexelBufferElements);
278279
PRINT_PROP(limits, maxPushConstantsSize);
279280
PRINT_PROP(limits, maxMemoryAllocationCount);

0 commit comments

Comments
 (0)