Merge pull request #4469 from lioncash/missing

vk_texture_cache: Silence -Wmissing-field-initializer warnings
This commit is contained in:
bunnei 2020-08-04 06:59:51 -07:00 committed by GitHub
commit 0ae267bf77
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 18 additions and 3 deletions

View File

@ -696,6 +696,7 @@ void VKBlitScreen::CreateFramebuffers() {
.flags = 0, .flags = 0,
.renderPass = *renderpass, .renderPass = *renderpass,
.attachmentCount = 1, .attachmentCount = 1,
.pAttachments = nullptr,
.width = size.width, .width = size.width,
.height = size.height, .height = size.height,
.layers = 1, .layers = 1,

View File

@ -771,8 +771,9 @@ std::vector<VkDeviceQueueCreateInfo> VKDevice::GetDeviceQueueCreateInfos() const
.pNext = nullptr, .pNext = nullptr,
.flags = 0, .flags = 0,
.queueFamilyIndex = queue_family, .queueFamilyIndex = queue_family,
.queueCount = 1,
.pQueuePriorities = nullptr,
}); });
ci.queueCount = 1;
ci.pQueuePriorities = &QUEUE_PRIORITY; ci.pQueuePriorities = &QUEUE_PRIORITY;
} }

View File

@ -261,8 +261,13 @@ VKComputePipeline& VKPipelineCache::GetComputePipeline(const ComputePipelineCach
} }
const Specialization specialization{ const Specialization specialization{
.base_binding = 0,
.workgroup_size = key.workgroup_size, .workgroup_size = key.workgroup_size,
.shared_memory_size = key.shared_memory_size, .shared_memory_size = key.shared_memory_size,
.point_size = std::nullopt,
.enabled_attributes = {},
.attribute_types = {},
.ndc_minus_one_to_one = false,
}; };
const SPIRVShader spirv_shader{Decompile(device, shader->GetIR(), ShaderType::Compute, const SPIRVShader spirv_shader{Decompile(device, shader->GetIR(), ShaderType::Compute,
shader->GetRegistry(), specialization), shader->GetRegistry(), specialization),

View File

@ -815,8 +815,13 @@ bool RasterizerVulkan::WalkAttachmentOverlaps(const CachedSurfaceView& attachmen
std::tuple<VkFramebuffer, VkExtent2D> RasterizerVulkan::ConfigureFramebuffers( std::tuple<VkFramebuffer, VkExtent2D> RasterizerVulkan::ConfigureFramebuffers(
VkRenderPass renderpass) { VkRenderPass renderpass) {
FramebufferCacheKey key{renderpass, std::numeric_limits<u32>::max(), FramebufferCacheKey key{
std::numeric_limits<u32>::max(), std::numeric_limits<u32>::max()}; .renderpass = renderpass,
.width = std::numeric_limits<u32>::max(),
.height = std::numeric_limits<u32>::max(),
.layers = std::numeric_limits<u32>::max(),
.views = {},
};
const auto try_push = [&key](const View& view) { const auto try_push = [&key](const View& view) {
if (!view) { if (!view) {

View File

@ -47,6 +47,7 @@ vk::Sampler VKSamplerCache::CreateSampler(const Tegra::Texture::TSCEntry& tsc) c
VkSamplerCustomBorderColorCreateInfoEXT border{ VkSamplerCustomBorderColorCreateInfoEXT border{
.sType = VK_STRUCTURE_TYPE_SAMPLER_CUSTOM_BORDER_COLOR_CREATE_INFO_EXT, .sType = VK_STRUCTURE_TYPE_SAMPLER_CUSTOM_BORDER_COLOR_CREATE_INFO_EXT,
.pNext = nullptr, .pNext = nullptr,
.customBorderColor = {},
.format = VK_FORMAT_UNDEFINED, .format = VK_FORMAT_UNDEFINED,
}; };
std::memcpy(&border.customBorderColor, color.data(), sizeof(color)); std::memcpy(&border.customBorderColor, color.data(), sizeof(color));

View File

@ -473,6 +473,8 @@ VkImageView CachedSurfaceView::GetAttachment() {
.aspectMask = aspect_mask, .aspectMask = aspect_mask,
.baseMipLevel = base_level, .baseMipLevel = base_level,
.levelCount = num_levels, .levelCount = num_levels,
.baseArrayLayer = 0,
.layerCount = 0,
}, },
}; };
if (image_view_type == VK_IMAGE_VIEW_TYPE_3D) { if (image_view_type == VK_IMAGE_VIEW_TYPE_3D) {