piwalker/dolphin
1
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-07-23 06:09:50 -06:00
Code Issues Packages Projects Releases Wiki Activity

VideoCommon: add structures to graphics mods to allow for future adding or removing parameters with less code overhead

Browse Source
This commit is contained in:
iwubcode
2022-07-02 14:49:51 -05:00
parent 6cf99195c6
commit bc360584a3
16 changed files with 145 additions and 81 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
Source/Core/VideoCommon/GraphicsModSystem/Runtime/Actions/MoveAction.cpp
View File

@ -30,18 +30,26 @@ MoveAction::MoveAction(Common::Vec3 position_offset) : m_position_offset(positio
{
}
void MoveAction::OnProjection(Common::Matrix44* matrix)
void MoveAction::OnProjection(GraphicsModActionData::Projection* projection)
{
if (!matrix)
if (!projection) [[unlikely]]
return;
*matrix *= Common::Matrix44::Translate(m_position_offset);
}
void MoveAction::OnProjectionAndTexture(Common::Matrix44* matrix)
{
if (!matrix)
if (!projection->matrix) [[unlikely]]
return;
*matrix *= Common::Matrix44::Translate(m_position_offset);
auto& matrix = *projection->matrix;
matrix = matrix * Common::Matrix44::Translate(m_position_offset);
}
void MoveAction::OnProjectionAndTexture(GraphicsModActionData::Projection* projection)
{
if (!projection) [[unlikely]]
return;
if (!projection->matrix) [[unlikely]]
return;
auto& matrix = *projection->matrix;
matrix = matrix * Common::Matrix44::Translate(m_position_offset);
}

4
Source/Core/VideoCommon/GraphicsModSystem/Runtime/Actions/MoveAction.h
View File

@ -14,8 +14,8 @@ class MoveAction final : public GraphicsModAction
public:
static std::unique_ptr<MoveAction> Create(const picojson::value& json_data);
explicit MoveAction(Common::Vec3 position_offset);
void OnProjection(Common::Matrix44* matrix) override;
void OnProjectionAndTexture(Common::Matrix44* matrix) override;
void OnProjection(GraphicsModActionData::Projection* projection) override;
void OnProjectionAndTexture(GraphicsModActionData::Projection* projection) override;
private:
Common::Vec3 m_position_offset;

21
Source/Core/VideoCommon/GraphicsModSystem/Runtime/Actions/PrintAction.cpp
View File

@ -5,27 +5,32 @@
#include "Common/Logging/Log.h"
void PrintAction::OnDrawStarted(bool*)
void PrintAction::OnDrawStarted(GraphicsModActionData::DrawStarted*)
{
INFO_LOG_FMT(VIDEO, "OnDrawStarted Called");
}
void PrintAction::OnEFB(bool*, u32 texture_width, u32 texture_height, u32* scaled_width,
u32* scaled_height)
void PrintAction::OnEFB(GraphicsModActionData::EFB* efb)
{
if (!scaled_width || !scaled_height)
if (!efb) [[unlikely]]
return;
INFO_LOG_FMT(VIDEO, "OnEFB Called. Original [{}, {}], Scaled [{}, {}]", texture_width,
texture_height, *scaled_width, *scaled_height);
if (!efb->scaled_width) [[unlikely]]
return;
if (!efb->scaled_height) [[unlikely]]
return;
INFO_LOG_FMT(VIDEO, "OnEFB Called. Original [{}, {}], Scaled [{}, {}]", efb->texture_width,
efb->texture_height, *efb->scaled_width, *efb->scaled_height);
}
void PrintAction::OnProjection(Common::Matrix44*)
void PrintAction::OnProjection(GraphicsModActionData::Projection*)
{
INFO_LOG_FMT(VIDEO, "OnProjection Called");
}
void PrintAction::OnProjectionAndTexture(Common::Matrix44*)
void PrintAction::OnProjectionAndTexture(GraphicsModActionData::Projection*)
{
INFO_LOG_FMT(VIDEO, "OnProjectionAndTexture Called");
}

9
Source/Core/VideoCommon/GraphicsModSystem/Runtime/Actions/PrintAction.h
View File

@ -8,10 +8,9 @@
class PrintAction final : public GraphicsModAction
{
public:
void OnDrawStarted(bool* skip) override;
void OnEFB(bool* skip, u32 texture_width, u32 texture_height, u32* scaled_width,
u32* scaled_height) override;
void OnProjection(Common::Matrix44* matrix) override;
void OnProjectionAndTexture(Common::Matrix44* matrix) override;
void OnDrawStarted(GraphicsModActionData::DrawStarted*) override;
void OnEFB(GraphicsModActionData::EFB*) override;
void OnProjection(GraphicsModActionData::Projection*) override;
void OnProjectionAndTexture(GraphicsModActionData::Projection*) override;
void OnTextureLoad() override;
};

56
Source/Core/VideoCommon/GraphicsModSystem/Runtime/Actions/ScaleAction.cpp
View File

@ -30,30 +30,46 @@ ScaleAction::ScaleAction(Common::Vec3 scale) : m_scale(scale)
{
}
void ScaleAction::OnEFB(bool*, u32 texture_width, u32 texture_height, u32* scaled_width,
u32* scaled_height)
void ScaleAction::OnEFB(GraphicsModActionData::EFB* efb)
{
if (scaled_width && m_scale.x > 0)
*scaled_width = texture_width * m_scale.x;
if (scaled_height && m_scale.y > 0)
*scaled_height = texture_height * m_scale.y;
}
void ScaleAction::OnProjection(Common::Matrix44* matrix)
{
if (!matrix)
if (!efb) [[unlikely]]
return;
auto& the_matrix = *matrix;
the_matrix.data[0] = the_matrix.data[0] * m_scale.x;
the_matrix.data[5] = the_matrix.data[5] * m_scale.y;
if (!efb->scaled_width) [[unlikely]]
return;
if (!efb->scaled_height) [[unlikely]]
return;
if (m_scale.x > 0)
*efb->scaled_width = efb->texture_width * m_scale.x;
if (m_scale.y > 0)
*efb->scaled_height = efb->texture_height * m_scale.y;
}
void ScaleAction::OnProjectionAndTexture(Common::Matrix44* matrix)
void ScaleAction::OnProjection(GraphicsModActionData::Projection* projection)
{
if (!matrix)
if (!projection) [[unlikely]]
return;
auto& the_matrix = *matrix;
the_matrix.data[0] = the_matrix.data[0] * m_scale.x;
the_matrix.data[5] = the_matrix.data[5] * m_scale.y;
if (!projection->matrix) [[unlikely]]
return;
auto& matrix = *projection->matrix;
matrix.data[0] = matrix.data[0] * m_scale.x;
matrix.data[5] = matrix.data[5] * m_scale.y;
}
void ScaleAction::OnProjectionAndTexture(GraphicsModActionData::Projection* projection)
{
if (!projection) [[unlikely]]
return;
if (!projection->matrix) [[unlikely]]
return;
auto& matrix = *projection->matrix;
matrix.data[0] = matrix.data[0] * m_scale.x;
matrix.data[5] = matrix.data[5] * m_scale.y;
}

7
Source/Core/VideoCommon/GraphicsModSystem/Runtime/Actions/ScaleAction.h
View File

@ -14,10 +14,9 @@ class ScaleAction final : public GraphicsModAction
public:
static std::unique_ptr<ScaleAction> Create(const picojson::value& json_data);
explicit ScaleAction(Common::Vec3 scale);
void OnEFB(bool* skip, u32 texture_width, u32 texture_height, u32* scaled_width,
u32* scaled_height) override;
void OnProjection(Common::Matrix44* matrix) override;
void OnProjectionAndTexture(Common::Matrix44* matrix) override;
void OnEFB(GraphicsModActionData::EFB*) override;
void OnProjection(GraphicsModActionData::Projection*) override;
void OnProjectionAndTexture(GraphicsModActionData::Projection*) override;
private:
Common::Vec3 m_scale;

24
Source/Core/VideoCommon/GraphicsModSystem/Runtime/Actions/SkipAction.cpp
View File

@ -3,18 +3,24 @@
#include "VideoCommon/GraphicsModSystem/Runtime/Actions/SkipAction.h"
void SkipAction::OnDrawStarted(bool* skip)
void SkipAction::OnDrawStarted(GraphicsModActionData::DrawStarted* draw_started)
{
if (!skip)
if (!draw_started) [[unlikely]]
return;
*skip = true;
}
void SkipAction::OnEFB(bool* skip, u32, u32, u32*, u32*)
{
if (!skip)
if (!draw_started->skip) [[unlikely]]
return;
*skip = true;
*draw_started->skip = true;
}
void SkipAction::OnEFB(GraphicsModActionData::EFB* efb)
{
if (!efb) [[unlikely]]
return;
if (!efb->skip) [[unlikely]]
return;
*efb->skip = true;
}

5
Source/Core/VideoCommon/GraphicsModSystem/Runtime/Actions/SkipAction.h
View File

@ -8,7 +8,6 @@
class SkipAction final : public GraphicsModAction
{
public:
void OnDrawStarted(bool* skip) override;
void OnEFB(bool* skip, u32 texture_width, u32 texture_height, u32* scaled_width,
u32* scaled_height) override;
void OnDrawStarted(GraphicsModActionData::DrawStarted*) override;
void OnEFB(GraphicsModActionData::EFB*) override;
};