Browse Source
Merge pull request #4858 from lioncash/initializer
General: Resolve a few missing 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
5 changed files with
24 additions and
4 deletions
-
src/core/arm/arm_interface.cpp
-
src/core/hle/service/nvflinger/buffer_queue.cpp
-
src/video_core/renderer_vulkan/vk_device.cpp
-
src/video_core/renderer_vulkan/vk_graphics_pipeline.cpp
-
src/video_core/texture_cache/surface_params.cpp
|
|
|
@ -147,10 +147,18 @@ std::vector<ARM_Interface::BacktraceEntry> ARM_Interface::GetBacktraceFromContex |
|
|
|
auto fp = ctx.cpu_registers[29]; |
|
|
|
auto lr = ctx.cpu_registers[30]; |
|
|
|
while (true) { |
|
|
|
out.push_back({"", 0, lr, 0}); |
|
|
|
if (!fp) { |
|
|
|
out.push_back({ |
|
|
|
.module = "", |
|
|
|
.address = 0, |
|
|
|
.original_address = lr, |
|
|
|
.offset = 0, |
|
|
|
.name = {}, |
|
|
|
}); |
|
|
|
|
|
|
|
if (fp == 0) { |
|
|
|
break; |
|
|
|
} |
|
|
|
|
|
|
|
lr = memory.Read64(fp + 8) - 4; |
|
|
|
fp = memory.Read64(fp); |
|
|
|
} |
|
|
|
|
|
|
|
@ -29,6 +29,10 @@ void BufferQueue::SetPreallocatedBuffer(u32 slot, const IGBPBuffer& igbp_buffer) |
|
|
|
.slot = slot, |
|
|
|
.status = Buffer::Status::Free, |
|
|
|
.igbp_buffer = igbp_buffer, |
|
|
|
.transform = {}, |
|
|
|
.crop_rect = {}, |
|
|
|
.swap_interval = 0, |
|
|
|
.multi_fence = {}, |
|
|
|
}); |
|
|
|
|
|
|
|
buffer_wait_event.writable->Signal(); |
|
|
|
|
|
|
|
@ -771,13 +771,18 @@ void VKDevice::CollectTelemetryParameters() { |
|
|
|
VkPhysicalDeviceDriverPropertiesKHR driver{ |
|
|
|
.sType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_DRIVER_PROPERTIES_KHR, |
|
|
|
.pNext = nullptr, |
|
|
|
.driverID = {}, |
|
|
|
.driverName = {}, |
|
|
|
.driverInfo = {}, |
|
|
|
.conformanceVersion = {}, |
|
|
|
}; |
|
|
|
|
|
|
|
VkPhysicalDeviceProperties2KHR properties{ |
|
|
|
VkPhysicalDeviceProperties2KHR device_properties{ |
|
|
|
.sType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_PROPERTIES_2_KHR, |
|
|
|
.pNext = &driver, |
|
|
|
.properties = {}, |
|
|
|
}; |
|
|
|
physical.GetProperties2KHR(properties); |
|
|
|
physical.GetProperties2KHR(device_properties); |
|
|
|
|
|
|
|
driver_id = driver.driverID; |
|
|
|
vendor_name = driver.driverName; |
|
|
|
|
|
|
|
@ -159,6 +159,7 @@ std::vector<vk::ShaderModule> VKGraphicsPipeline::CreateShaderModules( |
|
|
|
.sType = VK_STRUCTURE_TYPE_SHADER_MODULE_CREATE_INFO, |
|
|
|
.pNext = nullptr, |
|
|
|
.flags = 0, |
|
|
|
.codeSize = 0, |
|
|
|
}; |
|
|
|
|
|
|
|
std::vector<vk::ShaderModule> modules; |
|
|
|
@ -388,6 +389,7 @@ vk::Pipeline VKGraphicsPipeline::CreatePipeline(const RenderPassParams& renderpa |
|
|
|
.logicOp = VK_LOGIC_OP_COPY, |
|
|
|
.attachmentCount = static_cast<u32>(num_attachments), |
|
|
|
.pAttachments = cb_attachments.data(), |
|
|
|
.blendConstants = {}, |
|
|
|
}; |
|
|
|
|
|
|
|
std::vector dynamic_states{ |
|
|
|
|
|
|
|
@ -240,6 +240,7 @@ SurfaceParams SurfaceParams::CreateForFermiCopySurface( |
|
|
|
.is_tiled = is_tiled, |
|
|
|
.srgb_conversion = config.format == Tegra::RenderTargetFormat::B8G8R8A8_SRGB || |
|
|
|
config.format == Tegra::RenderTargetFormat::A8B8G8R8_SRGB, |
|
|
|
.is_layered = false, |
|
|
|
.block_width = is_tiled ? std::min(config.BlockWidth(), 5U) : 0U, |
|
|
|
.block_height = is_tiled ? std::min(config.BlockHeight(), 5U) : 0U, |
|
|
|
.block_depth = is_tiled ? std::min(config.BlockDepth(), 5U) : 0U, |
|
|
|
|