Lint fixes
This commit is contained in:
parent
f7ad825736
commit
cf9a6f8477
|
@ -17,9 +17,9 @@
|
||||||
#include "Common/MsgHandler.h"
|
#include "Common/MsgHandler.h"
|
||||||
|
|
||||||
#include "VideoBackends/Metal/MTLBoundingBox.h"
|
#include "VideoBackends/Metal/MTLBoundingBox.h"
|
||||||
|
#include "VideoBackends/Metal/MTLGfx.h"
|
||||||
#include "VideoBackends/Metal/MTLObjectCache.h"
|
#include "VideoBackends/Metal/MTLObjectCache.h"
|
||||||
#include "VideoBackends/Metal/MTLPerfQuery.h"
|
#include "VideoBackends/Metal/MTLPerfQuery.h"
|
||||||
#include "VideoBackends/Metal/MTLGfx.h"
|
|
||||||
#include "VideoBackends/Metal/MTLStateTracker.h"
|
#include "VideoBackends/Metal/MTLStateTracker.h"
|
||||||
#include "VideoBackends/Metal/MTLUtil.h"
|
#include "VideoBackends/Metal/MTLUtil.h"
|
||||||
#include "VideoBackends/Metal/MTLVertexManager.h"
|
#include "VideoBackends/Metal/MTLVertexManager.h"
|
||||||
|
@ -106,11 +106,8 @@ bool Metal::VideoBackend::Initialize(const WindowSystemInfo& wsi)
|
||||||
g_state_tracker = std::make_unique<StateTracker>();
|
g_state_tracker = std::make_unique<StateTracker>();
|
||||||
|
|
||||||
return InitializeShared(
|
return InitializeShared(
|
||||||
std::make_unique<Metal::Gfx>(std::move(layer)),
|
std::make_unique<Metal::Gfx>(std::move(layer)), std::make_unique<Metal::VertexManager>(),
|
||||||
std::make_unique<Metal::VertexManager>(),
|
std::make_unique<Metal::PerfQuery>(), std::make_unique<Metal::BoundingBox>());
|
||||||
std::make_unique<Metal::PerfQuery>(),
|
|
||||||
std::make_unique<Metal::BoundingBox>()
|
|
||||||
);
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -8,8 +8,8 @@
|
||||||
|
|
||||||
#include "VideoBackends/Metal/MRCHelpers.h"
|
#include "VideoBackends/Metal/MRCHelpers.h"
|
||||||
|
|
||||||
#include "VideoCommon/RenderState.h"
|
|
||||||
#include "VideoCommon/BPMemory.h"
|
#include "VideoCommon/BPMemory.h"
|
||||||
|
#include "VideoCommon/RenderState.h"
|
||||||
|
|
||||||
struct AbstractPipelineConfig;
|
struct AbstractPipelineConfig;
|
||||||
class AbstractPipeline;
|
class AbstractPipeline;
|
||||||
|
|
|
@ -176,7 +176,6 @@ bool VertexShaderManager::UseVertexDepthRange()
|
||||||
return fabs(xfmem.viewport.zRange) > 16777215.0f || fabs(xfmem.viewport.farZ) > 16777215.0f;
|
return fabs(xfmem.viewport.zRange) > 16777215.0f || fabs(xfmem.viewport.farZ) > 16777215.0f;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
// Syncs the shader constant buffers with xfmem
|
// Syncs the shader constant buffers with xfmem
|
||||||
// TODO: A cleaner way to control the matrices without making a mess in the parameters field
|
// TODO: A cleaner way to control the matrices without making a mess in the parameters field
|
||||||
void VertexShaderManager::SetConstants(const std::vector<std::string>& textures)
|
void VertexShaderManager::SetConstants(const std::vector<std::string>& textures)
|
||||||
|
|
|
@ -49,8 +49,6 @@ public:
|
||||||
VertexShaderConstants constants{};
|
VertexShaderConstants constants{};
|
||||||
bool dirty = false;
|
bool dirty = false;
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
private:
|
private:
|
||||||
alignas(16) std::array<float, 16> m_projection_matrix;
|
alignas(16) std::array<float, 16> m_projection_matrix;
|
||||||
|
|
||||||
|
|
|
@ -355,8 +355,5 @@ void CheckForConfigChanges()
|
||||||
// TODO: Move everything else to the ConfigChanged event
|
// TODO: Move everything else to the ConfigChanged event
|
||||||
}
|
}
|
||||||
|
|
||||||
static EventHook s_check_config_event = AfterFrameEvent::Register(
|
static EventHook s_check_config_event =
|
||||||
[] {
|
AfterFrameEvent::Register([] { CheckForConfigChanges(); }, "CheckForConfigChanges");
|
||||||
CheckForConfigChanges();
|
|
||||||
},
|
|
||||||
"CheckForConfigChanges");
|
|
||||||
|
|
|
@ -15,10 +15,12 @@ WidescreenManager::WidescreenManager()
|
||||||
{
|
{
|
||||||
Update();
|
Update();
|
||||||
|
|
||||||
m_config_changed = ConfigChangedEvent::Register([this](u32 bits) {
|
m_config_changed = ConfigChangedEvent::Register(
|
||||||
|
[this](u32 bits) {
|
||||||
if (bits & (CONFIG_CHANGE_BIT_ASPECT_RATIO))
|
if (bits & (CONFIG_CHANGE_BIT_ASPECT_RATIO))
|
||||||
Update();
|
Update();
|
||||||
}, "Widescreen");
|
},
|
||||||
|
"Widescreen");
|
||||||
|
|
||||||
// VertexManager doesn't maintain statistics in Wii mode.
|
// VertexManager doesn't maintain statistics in Wii mode.
|
||||||
if (!SConfig::GetInstance().bWii)
|
if (!SConfig::GetInstance().bWii)
|
||||||
|
@ -28,7 +30,6 @@ WidescreenManager::WidescreenManager()
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
void WidescreenManager::Update()
|
void WidescreenManager::Update()
|
||||||
{
|
{
|
||||||
if (SConfig::GetInstance().bWii)
|
if (SConfig::GetInstance().bWii)
|
||||||
|
|
|
@ -5,7 +5,6 @@
|
||||||
|
|
||||||
#include <memory>
|
#include <memory>
|
||||||
|
|
||||||
|
|
||||||
#include "VideoCommon/VideoConfig.h"
|
#include "VideoCommon/VideoConfig.h"
|
||||||
#include "VideoCommon/VideoEvents.h"
|
#include "VideoCommon/VideoEvents.h"
|
||||||
|
|
||||||
|
@ -20,6 +19,7 @@ public:
|
||||||
bool IsGameWidescreen() const { return m_is_game_widescreen; }
|
bool IsGameWidescreen() const { return m_is_game_widescreen; }
|
||||||
|
|
||||||
void DoState(PointerWrap& p);
|
void DoState(PointerWrap& p);
|
||||||
|
|
||||||
private:
|
private:
|
||||||
void Update();
|
void Update();
|
||||||
void UpdateWidescreenHeuristic();
|
void UpdateWidescreenHeuristic();
|
||||||
|
|
Loading…
Reference in New Issue