Browse Source
Merge pull request #4469 from lioncash/missing
vk_texture_cache: Silence -Wmissing-field-initializer warnings
pull/15/merge
bunnei
5 years ago
committed by
GitHub
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with
18 additions and
3 deletions
-
src/video_core/renderer_vulkan/vk_blit_screen.cpp
-
src/video_core/renderer_vulkan/vk_device.cpp
-
src/video_core/renderer_vulkan/vk_pipeline_cache.cpp
-
src/video_core/renderer_vulkan/vk_rasterizer.cpp
-
src/video_core/renderer_vulkan/vk_sampler_cache.cpp
-
src/video_core/renderer_vulkan/vk_texture_cache.cpp
|
|
|
@ -696,6 +696,7 @@ void VKBlitScreen::CreateFramebuffers() { |
|
|
|
.flags = 0, |
|
|
|
.renderPass = *renderpass, |
|
|
|
.attachmentCount = 1, |
|
|
|
.pAttachments = nullptr, |
|
|
|
.width = size.width, |
|
|
|
.height = size.height, |
|
|
|
.layers = 1, |
|
|
|
|
|
|
|
@ -771,8 +771,9 @@ std::vector<VkDeviceQueueCreateInfo> VKDevice::GetDeviceQueueCreateInfos() const |
|
|
|
.pNext = nullptr, |
|
|
|
.flags = 0, |
|
|
|
.queueFamilyIndex = queue_family, |
|
|
|
.queueCount = 1, |
|
|
|
.pQueuePriorities = nullptr, |
|
|
|
}); |
|
|
|
ci.queueCount = 1; |
|
|
|
ci.pQueuePriorities = &QUEUE_PRIORITY; |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
@ -261,8 +261,13 @@ VKComputePipeline& VKPipelineCache::GetComputePipeline(const ComputePipelineCach |
|
|
|
} |
|
|
|
|
|
|
|
const Specialization specialization{ |
|
|
|
.base_binding = 0, |
|
|
|
.workgroup_size = key.workgroup_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, |
|
|
|
shader->GetRegistry(), specialization), |
|
|
|
|
|
|
|
@ -815,8 +815,13 @@ bool RasterizerVulkan::WalkAttachmentOverlaps(const CachedSurfaceView& attachmen |
|
|
|
|
|
|
|
std::tuple<VkFramebuffer, VkExtent2D> RasterizerVulkan::ConfigureFramebuffers( |
|
|
|
VkRenderPass renderpass) { |
|
|
|
FramebufferCacheKey key{renderpass, std::numeric_limits<u32>::max(), |
|
|
|
std::numeric_limits<u32>::max(), std::numeric_limits<u32>::max()}; |
|
|
|
FramebufferCacheKey key{ |
|
|
|
.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) { |
|
|
|
if (!view) { |
|
|
|
|
|
|
|
@ -47,6 +47,7 @@ vk::Sampler VKSamplerCache::CreateSampler(const Tegra::Texture::TSCEntry& tsc) c |
|
|
|
VkSamplerCustomBorderColorCreateInfoEXT border{ |
|
|
|
.sType = VK_STRUCTURE_TYPE_SAMPLER_CUSTOM_BORDER_COLOR_CREATE_INFO_EXT, |
|
|
|
.pNext = nullptr, |
|
|
|
.customBorderColor = {}, |
|
|
|
.format = VK_FORMAT_UNDEFINED, |
|
|
|
}; |
|
|
|
std::memcpy(&border.customBorderColor, color.data(), sizeof(color)); |
|
|
|
|
|
|
|
@ -473,6 +473,8 @@ VkImageView CachedSurfaceView::GetAttachment() { |
|
|
|
.aspectMask = aspect_mask, |
|
|
|
.baseMipLevel = base_level, |
|
|
|
.levelCount = num_levels, |
|
|
|
.baseArrayLayer = 0, |
|
|
|
.layerCount = 0, |
|
|
|
}, |
|
|
|
}; |
|
|
|
if (image_view_type == VK_IMAGE_VIEW_TYPE_3D) { |
|
|
|
|