fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-05-05 05:18:08 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

nvk: Add input attachments support for multiview

Browse source 
Signed-off-by: Rebecca Mckeever <rebecca.mckeever@collabora.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/24326>
This commit is contained in:
Rebecca Mckeever 2023-03-03 11:51:07 -08:00 • committed by Marge Bot
parent ec4e014b9b
commit 5472e96849
2 changed files with 6 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/nouveau/vulkan/nvk_physical_device.c
View file

@ -85,7 +85,7 @@ nvk_GetPhysicalDeviceProperties2(VkPhysicalDevice physicalDevice,
.maxPerStageDescriptorStorageBuffers = UINT32_MAX,
.maxPerStageDescriptorSampledImages = UINT32_MAX,
.maxPerStageDescriptorStorageImages = UINT32_MAX,
.maxPerStageDescriptorInputAttachments = 0, /* TODO */
.maxPerStageDescriptorInputAttachments = UINT32_MAX,
.maxPerStageResources = UINT32_MAX,
.maxDescriptorSetSamplers = UINT32_MAX,
.maxDescriptorSetUniformBuffers = UINT32_MAX,
@ -94,7 +94,7 @@ nvk_GetPhysicalDeviceProperties2(VkPhysicalDevice physicalDevice,
.maxDescriptorSetStorageBuffersDynamic = NVK_MAX_DYNAMIC_BUFFERS / 2,
.maxDescriptorSetSampledImages = UINT32_MAX,
.maxDescriptorSetStorageImages = UINT32_MAX,
.maxDescriptorSetInputAttachments =0, /* TODO */
.maxDescriptorSetInputAttachments = UINT32_MAX,
.maxComputeSharedMemorySize = 49152,
.maxComputeWorkGroupCount = {0x7fffffff, 65535, 65535},
.maxComputeWorkGroupInvocations = 1024,

5
src/nouveau/vulkan/nvk_shader.c
View file

@ -310,7 +310,10 @@ nvk_lower_nir(struct nvk_device *device, nir_shader *nir,
NIR_PASS(_, nir, nir_shader_instructions_pass, lower_fragcoord_instr,
nir_metadata_block_index | nir_metadata_dominance, NULL);
NIR_PASS(_, nir, nir_lower_input_attachments,
&(nir_input_attachment_options) { });
&(nir_input_attachment_options) {
.use_layer_id_sysval = true,
.use_view_id_for_layer = true,
});
}
nir_lower_compute_system_values_options csv_options = {