VideoCommon: add graphics mod action to set texture filtering or wrap…

… modes on an individual target
dolphin-emu · Oct 30, 2022 · ce9dabf · ce9dabf
1 parent 297ebb8
commit ce9dabf
Show file tree

Hide file tree

Showing 5 changed files with 160 additions and 0 deletions.
diff --git a/Source/Core/DolphinLib.props b/Source/Core/DolphinLib.props
@@ -651,6 +651,7 @@
     <ClInclude Include="VideoCommon\GraphicsModSystem\Runtime\Actions\PrintAction.h" />
     <ClInclude Include="VideoCommon\GraphicsModSystem\Runtime\Actions\ScaleAction.h" />
     <ClInclude Include="VideoCommon\GraphicsModSystem\Runtime\Actions\SkipAction.h" />
+    <ClInclude Include="VideoCommon\GraphicsModSystem\Runtime\Actions\TexturePropertiesAction.h" />
     <ClInclude Include="VideoCommon\GraphicsModSystem\Runtime\FBInfo.h" />
     <ClInclude Include="VideoCommon\GraphicsModSystem\Runtime\GraphicsModAction.h" />
     <ClInclude Include="VideoCommon\GraphicsModSystem\Runtime\GraphicsModActionData.h" />
@@ -1254,6 +1255,7 @@
     <ClCompile Include="VideoCommon\GraphicsModSystem\Runtime\Actions\PrintAction.cpp" />
     <ClCompile Include="VideoCommon\GraphicsModSystem\Runtime\Actions\ScaleAction.cpp" />
     <ClCompile Include="VideoCommon\GraphicsModSystem\Runtime\Actions\SkipAction.cpp" />
+    <ClCompile Include="VideoCommon\GraphicsModSystem\Runtime\Actions\TexturePropertiesAction.cpp" />
     <ClCompile Include="VideoCommon\GraphicsModSystem\Runtime\FBInfo.cpp" />
     <ClCompile Include="VideoCommon\GraphicsModSystem\Runtime\GraphicsModActionFactory.cpp" />
     <ClCompile Include="VideoCommon\GraphicsModSystem\Runtime\GraphicsModManager.cpp" />

diff --git a/Source/Core/VideoCommon/CMakeLists.txt b/Source/Core/VideoCommon/CMakeLists.txt
@@ -58,6 +58,8 @@ add_library(videocommon
   GraphicsModSystem/Runtime/Actions/ScaleAction.h
   GraphicsModSystem/Runtime/Actions/SkipAction.cpp
   GraphicsModSystem/Runtime/Actions/SkipAction.h
+  GraphicsModSystem/Runtime/Actions/TexturePropertiesAction.cpp
+  GraphicsModSystem/Runtime/Actions/TexturePropertiesAction.h
   GraphicsModSystem/Runtime/FBInfo.cpp
   GraphicsModSystem/Runtime/FBInfo.h
   GraphicsModSystem/Runtime/GraphicsModAction.h

diff --git a/Source/Core/VideoCommon/GraphicsModSystem/Runtime/Actions/TexturePropertiesAction.cpp b/Source/Core/VideoCommon/GraphicsModSystem/Runtime/Actions/TexturePropertiesAction.cpp
@@ -0,0 +1,122 @@
+// Copyright 2022 Dolphin Emulator Project
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#include "VideoCommon/GraphicsModSystem/Runtime/Actions/TexturePropertiesAction.h"
+
+#include <string>
+
+#include "common/StringUtil.h"
+
+std::unique_ptr<TexturePropertiesAction>
+TexturePropertiesAction::Create(const picojson::value& json_data)
+{
+  auto parse_filter = [](const std::string& str) -> std::optional<FilterMode> {
+    std::string lower(str);
+    Common::ToLower(&lower);
+    if (lower == "linear")
+      return FilterMode::Linear;
+    if (lower == "near")
+      return FilterMode::Near;
+
+    return std::nullopt;
+  };
+
+  auto parse_wrap_mode = [](const std::string& str) -> std::optional<WrapMode> {
+    std::string lower(str);
+    Common::ToLower(&lower);
+    if (lower == "clamp")
+      return WrapMode::Clamp;
+    if (lower == "repeat")
+      return WrapMode::Repeat;
+    if (lower == "mirror")
+      return WrapMode::Mirror;
+
+    return std::nullopt;
+  };
+
+  std::optional<FilterMode> min_filter;
+  const auto& min_filter_json = json_data.get("min_filter");
+  if (min_filter_json.is<std::string>())
+  {
+    min_filter = parse_filter(min_filter_json.to_str());
+  }
+
+  std::optional<FilterMode> mag_filter;
+  const auto& mag_filter_json = json_data.get("mag_filter");
+  if (mag_filter_json.is<std::string>())
+  {
+    mag_filter = parse_filter(mag_filter_json.to_str());
+  }
+
+  std::optional<FilterMode> mipmap_filter;
+  const auto& mipmap_filter_json = json_data.get("mipmap_filter");
+  if (mipmap_filter_json.is<std::string>())
+  {
+    mipmap_filter = parse_filter(mipmap_filter_json.to_str());
+  }
+
+  std::optional<WrapMode> wrap_u;
+  const auto& wrap_u_json = json_data.get("wrap_u");
+  if (wrap_u_json.is<std::string>())
+  {
+    wrap_u = parse_wrap_mode(wrap_u_json.to_str());
+  }
+
+  std::optional<WrapMode> wrap_v;
+  const auto& wrap_v_json = json_data.get("wrap_v");
+  if (wrap_v_json.is<std::string>())
+  {
+    wrap_v = parse_wrap_mode(wrap_v_json.to_str());
+  }
+
+  return std::make_unique<TexturePropertiesAction>(std::move(min_filter), std::move(mag_filter),
+                                                   std::move(mipmap_filter), std::move(wrap_u),
+                                                   std::move(wrap_v));
+}
+
+TexturePropertiesAction::TexturePropertiesAction(std::optional<FilterMode> min_filter,
+                                                 std::optional<FilterMode> mag_filter,
+                                                 std::optional<FilterMode> mipmap_filter,
+                                                 std::optional<WrapMode> wrap_u,
+                                                 std::optional<WrapMode> wrap_v)
+    : m_min_filter(std::move(min_filter)), m_mag_filter(std::move(mag_filter)),
+      m_mipmap_filter(std::move(mipmap_filter)), m_wrap_u(std::move(wrap_u)),
+      m_wrap_v(std::move(wrap_v))
+{
+}
+
+void TexturePropertiesAction::OnTextureLoad(GraphicsModActionData::TextureLoad* texture_load)
+{
+  if (!texture_load) [[unlikely]]
+    return;
+
+  if (!texture_load->min_filter) [[unlikely]]
+    return;
+
+  if (!texture_load->mag_filter) [[unlikely]]
+    return;
+
+  if (!texture_load->mipmap_filter) [[unlikely]]
+    return;
+
+  if (!texture_load->wrap_u) [[unlikely]]
+    return;
+
+  if (!texture_load->wrap_v) [[unlikely]]
+    return;
+
+  if (m_min_filter)
+    *texture_load->min_filter = m_min_filter;
+
+  if (m_mag_filter)
+    *texture_load->mag_filter = m_mag_filter;
+
+  if (m_mipmap_filter)
+    *texture_load->mipmap_filter = m_mipmap_filter;
+
+  if (m_wrap_u)
+    *texture_load->wrap_u = m_wrap_u;
+
+  if (m_wrap_v)
+    *texture_load->wrap_v = m_wrap_v;
+}
diff --git a/Source/Core/VideoCommon/GraphicsModSystem/Runtime/Actions/TexturePropertiesAction.h b/Source/Core/VideoCommon/GraphicsModSystem/Runtime/Actions/TexturePropertiesAction.h
@@ -0,0 +1,29 @@
+// Copyright 2022 Dolphin Emulator Project
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#pragma once
+
+#include <optional>
+
+#include <picojson.h>
+
+#include "VideoCommon/GraphicsModSystem/Runtime/GraphicsModAction.h"
+#include "VideoCommon/RenderState.h"
+
+class TexturePropertiesAction final : public GraphicsModAction
+{
+public:
+  static std::unique_ptr<TexturePropertiesAction> Create(const picojson::value& json_data);
+  explicit TexturePropertiesAction(std::optional<FilterMode> min_filter,
+                                   std::optional<FilterMode> mag_filter,
+                                   std::optional<FilterMode> mipmap_filter,
+                                   std::optional<WrapMode> wrap_u, std::optional<WrapMode> wrap_v);
+  void OnTextureLoad(GraphicsModActionData::TextureLoad*) override;
+
+private:
+  std::optional<FilterMode> m_min_filter;
+  std::optional<FilterMode> m_mag_filter;
+  std::optional<FilterMode> m_mipmap_filter;
+  std::optional<WrapMode> m_wrap_u;
+  std::optional<WrapMode> m_wrap_v;
+};
diff --git a/Source/Core/VideoCommon/GraphicsModSystem/Runtime/GraphicsModActionFactory.cpp b/Source/Core/VideoCommon/GraphicsModSystem/Runtime/GraphicsModActionFactory.cpp
@@ -7,6 +7,7 @@
 #include "VideoCommon/GraphicsModSystem/Runtime/Actions/PrintAction.h"
 #include "VideoCommon/GraphicsModSystem/Runtime/Actions/ScaleAction.h"
 #include "VideoCommon/GraphicsModSystem/Runtime/Actions/SkipAction.h"
+#include "VideoCommon/GraphicsModSystem/Runtime/Actions/TexturePropertiesAction.h"
 
 namespace GraphicsModActionFactory
 {
@@ -28,6 +29,10 @@ std::unique_ptr<GraphicsModAction> Create(std::string_view name, const picojson:
   {
     return ScaleAction::Create(json_data);
   }
+  else if (name == "set_texture_properties")
+  {
+    return TexturePropertiesAction::Create(json_data);
+  }
 
   return nullptr;
 }