history-museum/winamp
1
0
Fork 0
mirror of https://github.com/WinampDesktop/winamp.git synced 2025-06-17 19:45:45 -04:00
Code Issues Actions Packages Projects Releases Wiki Activity

Clean up some compiler warnings

Browse Source
This commit is contained in:
Connor McLaughlin
2020-10-11 12:14:29 +10:00
parent 5e65882920
commit d39c9f5d1c
13 changed files with 14 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/frontend-common/common_host_interface.h
View File

@ -261,9 +261,6 @@ protected:
/// Sets the base path for the user directory. Can be overridden by platform/frontend/command line.
virtual void SetUserDirectory();
/// Performs the initial load of settings. Should call CheckSettings() and LoadSettings(SettingsInterface&).
virtual void LoadSettings() = 0;
/// Updates logging settings.
virtual void UpdateLogSettings(LOGLEVEL level, const char* filter, bool log_to_console, bool log_to_debug,
bool log_to_window, bool log_to_file);
@ -284,6 +281,7 @@ protected:
virtual void SetDefaultSettings(SettingsInterface& si) override;
/// Loads settings to m_settings and any frontend-specific parameters.
using HostInterface::LoadSettings;
virtual void LoadSettings(SettingsInterface& si) override;
/// Saves current settings variables to ini.

8
src/frontend-common/vulkan_host_display.cpp
View File

@ -576,7 +576,7 @@ bool VulkanHostDisplay::Render()
void VulkanHostDisplay::BeginSwapChainRenderPass(VkFramebuffer framebuffer)
{
const VkClearValue clear_value = {};
const VkClearValue clear_value = {{{0.0f, 0.0f, 0.0f, 1.0f}}};
const VkRenderPassBeginInfo rp = {VK_STRUCTURE_TYPE_RENDER_PASS_BEGIN_INFO,
nullptr,
m_swap_chain->GetClearRenderPass(),
@ -714,8 +714,8 @@ std::vector<std::string> VulkanHostDisplay::EnumerateAdapterNames()
#ifndef LIBRETRO
VulkanHostDisplay::PostProcessingStage::PostProcessingStage(PostProcessingStage&& move)
: output_texture(std::move(move.output_texture)), output_framebuffer(move.output_framebuffer),
pipeline(move.pipeline), uniforms_size(move.uniforms_size)
: pipeline(move.pipeline), output_framebuffer(move.output_framebuffer),
output_texture(std::move(move.output_texture)), uniforms_size(move.uniforms_size)
{
move.output_framebuffer = VK_NULL_HANDLE;
move.pipeline = VK_NULL_HANDLE;
@ -870,8 +870,6 @@ void VulkanHostDisplay::ApplyPostProcessingChain(s32 final_left, s32 final_top,
s32 texture_view_x, s32 texture_view_y, s32 texture_view_width,
s32 texture_view_height)
{
static constexpr std::array<float, 4> clear_color = {0.0f, 0.0f, 0.0f, 1.0f};
if (!CheckPostProcessingRenderTargets(m_swap_chain->GetWidth(), m_swap_chain->GetHeight()))
{
BeginSwapChainRenderPass(m_swap_chain->GetCurrentFramebuffer());