Skip to content

Commit 828c128

Browse files
committed
Use newer vku.
1 parent bccdc49 commit 828c128

File tree

5 files changed

+12
-13
lines changed

5 files changed

+12
-13
lines changed

interface/vulkan/descriptor_set_layout/GBufferInput.cppm

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,10 +13,9 @@ namespace vk_deferred::vulkan::dsl {
1313
device,
1414
vk::DescriptorSetLayoutCreateInfo {
1515
{},
16-
vku::unsafeProxy({
17-
vk::DescriptorSetLayoutBinding { 0, vk::DescriptorType::eInputAttachment, 1, vk::ShaderStageFlagBits::eFragment }, // Position.
18-
vk::DescriptorSetLayoutBinding { 1, vk::DescriptorType::eInputAttachment, 1, vk::ShaderStageFlagBits::eFragment }, // [0, 1] bounded normal.
19-
}),
16+
vku::unsafeProxy(getBindings(
17+
{ 1, vk::ShaderStageFlagBits::eFragment }, /* Position */
18+
{ 1, vk::ShaderStageFlagBits::eFragment } /* [0, 1] bounded normal */)),
2019
},
2120
} { }
2221
};

interface/vulkan/descriptor_set_layout/HdrInput.cppm

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,7 @@ namespace vk_deferred::vulkan::dsl {
1313
device,
1414
vk::DescriptorSetLayoutCreateInfo {
1515
{},
16-
vku::unsafeProxy({
17-
vk::DescriptorSetLayoutBinding { 0, vk::DescriptorType::eInputAttachment, 1, vk::ShaderStageFlagBits::eFragment }, // HDR image.
18-
}),
16+
vku::unsafeProxy(getBindings({ 1, vk::ShaderStageFlagBits::eFragment })), // HDR image.
1917
},
2018
} { }
2119
};

interface/vulkan/pipeline/DeferredLightRenderer.cppm

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ namespace vk_deferred::vulkan::inline pipeline {
2727
const rp::Deferred &renderPass [[clang::lifetimebound]]
2828
) : pipelineLayout { device, vk::PipelineLayoutCreateInfo {
2929
{},
30-
vku::unsafeProxy(*descriptorSetLayout),
30+
*descriptorSetLayout,
3131
vku::unsafeProxy({
3232
vk::PushConstantRange { vk::ShaderStageFlagBits::eAllGraphics, 0, sizeof(PushConstant) },
3333
}),

interface/vulkan/pipeline/ToneMappingRenderer.cppm

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ namespace vk_deferred::vulkan::inline pipeline {
2121
const rp::Deferred &renderPass [[clang::lifetimebound]]
2222
) : pipelineLayout { device, vk::PipelineLayoutCreateInfo {
2323
{},
24-
vku::unsafeProxy(*descriptorSetLayout),
24+
*descriptorSetLayout,
2525
} },
2626
pipeline { device, nullptr, vku::getDefaultGraphicsPipelineCreateInfo(
2727
createPipelineStages(

vcpkg-configuration.json

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,18 @@
11
{
22
"default-registry": {
33
"kind": "git",
4-
"baseline": "9558037875497b9db8cf38fcd7db68ec661bffe7",
4+
"baseline": "1a66c32c6f90c2f646529975c3c076ed3dbdae0c",
55
"repository": "https://github.com/microsoft/vcpkg"
66
},
77
"registries": [
88
{
99
"kind": "git",
10-
"repository": "https://github.com/stripe2933/vcpkg-registry",
10+
"baseline": "321a2d1ca63182bca45a23c63e9e1e34ed54affa",
1111
"reference": "main",
12-
"baseline": "5970fb4977482cb3831e90b4cdb4d16f8f80c4ac",
13-
"packages": ["vku"]
12+
"repository": "https://github.com/stripe2933/vcpkg-registry",
13+
"packages": [
14+
"vku"
15+
]
1416
}
1517
],
1618
"overlay-ports": [

0 commit comments

Comments
 (0)