Skip to content

Commit

Permalink
scripts: Update VUL
Browse files Browse the repository at this point in the history
  • Loading branch information
@spencer-lunarg
spencer-lunarg committed Apr 29, 2024
1 parent bacc84e commit 72856ef
Show file tree
Hide file tree
Showing 3 changed files with 26 additions and 6 deletions.
8 changes: 4 additions & 4 deletions layers/chassis/layer_chassis_dispatch_manual.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1401,25 +1401,25 @@ void DispatchGetDescriptorEXT(VkDevice device, const VkDescriptorGetInfoEXT *pDe
case VK_DESCRIPTOR_TYPE_UNIFORM_TEXEL_BUFFER:
if (pDescriptorInfo->data.pUniformTexelBuffer) {
address_info.initialize(pDescriptorInfo->data.pUniformTexelBuffer);
local_pDescriptorInfo.data.pUniformTexelBuffer = &address_info;
local_pDescriptorInfo.data.pUniformTexelBuffer = address_info.ptr();

This comment has been minimized.

Sign in to view

Copy link
@y-novikov

y-novikov Apr 29, 2024

Contributor

ANGLE/Chromium build isn't happy with this change.
https://ci.chromium.org/ui/p/angle/builders/try/mac-test/18579/overview
../../third_party/vulkan-deps/vulkan-validation-layers/src/layers/chassis/layer_chassis_dispatch_manual.cpp:1404:79: error: incompatible pointer types assigning to 'safe_VkDescriptorAddressInfoEXT *' from 'VkDescriptorAddressInfoEXT *'
@cnorthrop

This comment has been minimized.

Sign in to view

Copy link
@spencer-lunarg

spencer-lunarg Apr 29, 2024

Author Contributor

So the Chromium build is successful... not sure why it is different (https://github.com/KhronosGroup/Vulkan-ValidationLayers/actions/runs/8871870920/job/24355438832)

Regardless, will take a look

This comment has been minimized.

Sign in to view

Copy link
@spencer-lunarg

spencer-lunarg Apr 29, 2024

Author Contributor

ok, so the issue is using the https://github.com/KhronosGroup/Vulkan-Utility-Libraries from before this commit... does it not grab the latest ToT or whatever the VVL grabs?

This comment has been minimized.

Sign in to view

Copy link
@y-novikov

y-novikov Apr 29, 2024

Contributor

Thanks for looking.
Our mirror of Vulkan-Utility-Libraries didn't update yet.
So, this needs KhronosGroup/Vulkan-Utility-Libraries#202?
I'll check why our mirroring is stalled.

This comment has been minimized.

Sign in to view

Copy link
@spencer-lunarg

spencer-lunarg Apr 29, 2024

Author Contributor

yes, it needs KhronosGroup/Vulkan-Utility-Libraries#202

the problem was maybe when that was merged, it would have broke VVL so they needed to be updated together

This comment has been minimized.

Sign in to view

Copy link
@y-novikov

y-novikov Apr 29, 2024

Contributor

We do the updates together, no problem there.
For some reason https://chromium.googlesource.com/external/github.com/KhronosGroup/Vulkan-Utility-Libraries/+/refs/heads/upstream/main didn't update and is still on https://chromium.googlesource.com/external/github.com/KhronosGroup/Vulkan-Utility-Libraries/+/d0ffc68fe796ffd5752b7a2cba7c4f1d80ed7283.
I asked our Git admins to investigate.

This comment has been minimized.

Sign in to view

Copy link
@y-novikov

y-novikov Apr 29, 2024

Contributor

They fixed it.
Rolled successfully with the updated Vulkan-Utility-Libraries https://chromium-review.googlesource.com/c/angle/angle/+/5495021.
}
break;
case VK_DESCRIPTOR_TYPE_STORAGE_TEXEL_BUFFER:
if (pDescriptorInfo->data.pStorageTexelBuffer) {
address_info.initialize(pDescriptorInfo->data.pStorageTexelBuffer);
local_pDescriptorInfo.data.pStorageTexelBuffer = &address_info;
local_pDescriptorInfo.data.pStorageTexelBuffer = address_info.ptr();
}
break;
case VK_DESCRIPTOR_TYPE_UNIFORM_BUFFER:
if (pDescriptorInfo->data.pUniformBuffer) {
address_info.initialize(pDescriptorInfo->data.pUniformBuffer);
local_pDescriptorInfo.data.pUniformBuffer = &address_info;
local_pDescriptorInfo.data.pUniformBuffer = address_info.ptr();
}
break;
case VK_DESCRIPTOR_TYPE_STORAGE_BUFFER:
if (pDescriptorInfo->data.pStorageBuffer) {
address_info.initialize(pDescriptorInfo->data.pStorageBuffer);
local_pDescriptorInfo.data.pStorageBuffer = &address_info;
local_pDescriptorInfo.data.pStorageBuffer = address_info.ptr();
}
break;
case VK_DESCRIPTOR_TYPE_ACCELERATION_STRUCTURE_KHR:
Expand Down
2 changes: 1 addition & 1 deletion scripts/known_good.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
"sub_dir": "Vulkan-Utility-Libraries",
"build_dir": "Vulkan-Utility-Libraries/build",
"install_dir": "Vulkan-Utility-Libraries/build/install",
"commit": "d0ffc68fe796ffd5752b7a2cba7c4f1d80ed7283",
"commit": "68780d9b8c4dd256e55a3df60969970cb29911ce",
"deps": [
{
"var_name": "VULKAN_HEADERS_INSTALL_DIR",
Expand Down
22 changes: 21 additions & 1 deletion tests/unit/pipeline_positive.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1699,4 +1699,24 @@ TEST_F(PositivePipeline, AttachmentCountIgnored) {
pipe.AddDynamicState(VK_DYNAMIC_STATE_COLOR_BLEND_ADVANCED_EXT);
pipe.cb_ci_.attachmentCount = 0;
pipe.CreateGraphicsPipeline();
}
}

TEST_F(PositivePipeline, DynamicRasterizationState) {
TEST_DESCRIPTION("https://github.com/KhronosGroup/Vulkan-ValidationLayers/issues/7899");
AddRequiredExtensions(VK_EXT_EXTENDED_DYNAMIC_STATE_2_EXTENSION_NAME);
AddRequiredFeature(vkt::Feature::extendedDynamicState2);
RETURN_IF_SKIP(Init());
InitRenderTarget();

VkPipelineMultisampleStateCreateInfo ms_ci = vku::InitStructHelper();
ms_ci.rasterizationSamples = VK_SAMPLE_COUNT_1_BIT;
ms_ci.sampleShadingEnable = 0;
ms_ci.minSampleShading = 1.0;
ms_ci.pSampleMask = nullptr;

CreatePipelineHelper pipe(*this);
pipe.AddDynamicState(VK_DYNAMIC_STATE_RASTERIZER_DISCARD_ENABLE);
pipe.gp_ci_.pRasterizationState = nullptr;
pipe.ms_ci_ = ms_ci;
pipe.CreateGraphicsPipeline();
}

0 comments on commit 72856ef

Please sign in to comment.