Merge c678d9fa71 into 04f71e5e6d

Merge pull request #14211 from cscd98/enumerate-radios
mingw: fix usage of std::invocable with EnumerateRadios
2025-12-16 04:09:39 +00:00 · 2025-12-14 22:33:48 +00:00 · 2025-12-12 17:21:51 -06:00 · 2025-12-12 09:33:10 +00:00 · 2025-12-10 02:42:12 -05:00 · 2025-12-08 23:19:10 +01:00
3 changed files with 19 additions and 8 deletions
--- a/Source/Core/Core/HW/WiimoteReal/IOWin.cpp
+++ b/Source/Core/Core/HW/WiimoteReal/IOWin.cpp
@ -158,7 +158,7 @@ static std::optional<std::string> GetParentDeviceDescription(const WCHAR* hid_if
  return std::nullopt;
 }

-void EnumerateRadios(std::invocable<EnumerationControl(HANDLE)> auto&& enumeration_callback)
+void EnumerateRadios(std::invocable<HANDLE> auto&& enumeration_callback)
 {
  constexpr BLUETOOTH_FIND_RADIO_PARAMS radio_params{
      .dwSize = sizeof(radio_params),
--- a/Source/Core/Core/PowerPC/Jit64/Jit_LoadStore.cpp
+++ b/Source/Core/Core/PowerPC/Jit64/Jit_LoadStore.cpp
@ -568,12 +568,19 @@ void Jit64::stX(UGeckoInstruction inst)
  {
    RCX64Reg Ra = gpr.Bind(a, update ? RCMode::ReadWrite : RCMode::Read);
    RCOpArg reg_value;
-    if (!gpr.IsImm(s) && WriteClobbersRegValue(accessSize, /* swap */ true))
+    if (WriteClobbersRegValue(accessSize, /* swap */ true))
    {
-      RCOpArg Rs = gpr.Use(s, RCMode::Read);
-      RegCache::Realize(Rs);
-      reg_value = RCOpArg::R(RSCRATCH2);
-      MOV(32, reg_value, Rs);
+      if (gpr.IsImm(s))
+      {
+        reg_value = RCOpArg::Imm32(gpr.Imm32(s));
+      }
+      else
+      {
+        RCOpArg Rs = gpr.Use(s, RCMode::Read);
+        RegCache::Realize(Rs);
+        reg_value = RCOpArg::R(RSCRATCH2);
+        MOV(32, reg_value, Rs);
+      }
    }
    else
    {
@ -624,7 +631,9 @@ void Jit64::stXx(UGeckoInstruction inst)

  RCOpArg Ra = update ? gpr.Bind(a, RCMode::ReadWrite) : gpr.Use(a, RCMode::Read);
  RCOpArg Rb = gpr.Use(b, RCMode::Read);
-  RCOpArg Rs = does_clobber ? gpr.Use(s, RCMode::Read) : gpr.BindOrImm(s, RCMode::Read);
+  RCOpArg Rs = does_clobber ?
+                   (gpr.IsImm(s) ? RCOpArg::Imm32(gpr.Imm32(s)) : gpr.Use(s, RCMode::Read)) :
+                   gpr.BindOrImm(s, RCMode::Read);
  RegCache::Realize(Ra, Rb, Rs);

  MOV_sum(32, RSCRATCH2, Ra, Rb);
--- a/Source/Core/VideoCommon/TextureInfo.cpp
+++ b/Source/Core/VideoCommon/TextureInfo.cpp
@ -159,7 +159,9 @@ TextureInfo::NameDetails TextureInfo::CalculateTextureName() const
      const u32 texture_byte = m_ptr[i];

      min = std::min(min, texture_byte);
-      max = std::max(max, texture_byte);
+      // The value 255 can be used as a transparency flag if the tlut is smaller than 255.
+      if (texture_byte != 255 || max == 254)
+        max = std::max(max, texture_byte);
    }
    break;
  case 16384 * 2:
Author	SHA1	Message	Date
Venomalia	375b3198ac	Merge `c678d9fa71` into `04f71e5e6d`	2025-12-14 22:33:48 +00:00
Jordan Woyak	04f71e5e6d	Merge pull request #14211 from cscd98/enumerate-radios mingw: fix usage of std::invocable with EnumerateRadios	2025-12-12 17:21:51 -06:00
Craig Carnell	eded73fe8b	mingw: fix use of std::invocable with EnumerateRadios	2025-12-12 09:33:10 +00:00
JMC47	75bc9a474e	Merge pull request #14197 from JosJuice/jit64-store-clobber-imm Jit64: Explicitly get imm for clobbered stores	2025-12-10 02:42:12 -05:00
JosJuice	fca27c375a	Jit64: Explicitly get imm for clobbered stores If we're on an x64 CPU that doesn't have the MOVBE extension, trying to SwapAndStore a host register results in that register's value getting clobbered with the swapped value. Jit64::stX and Jit64::stXx detect this case, and if necessary, emit a MOV to a register that's fine to clobber. This logic was broken by the merge of PR 12134. Jit64::stX and Jit64::stXx were assuming that if RegCache::IsImm returns true for a guest register, calling RegCache::Use or RegCache::BindOrImm for that guest register would result in an immediate. However, PR 12134 made it possible for a guest register to have both a host register and an immediate in the register cache at the same time. When this happens, RegCache::IsImm returns true, yet RegCache::Use and RegCache::BindForImm return an RCOpArg whose Location returns a host register. (To make it extra confusing, RCOpArg::IsImm calls RegCache::IsImm if the RCOpArg came from RegCache, so RCOpArg::IsImm returns true!) To fix this, in cases where Jit64::stX and Jit64::stXx explicitly need an immediate to avoid having to emit an extra MOV, let's call RegCache::Imm32 so that we're certain that we're getting an immediate. This fixes an issue on older x64 CPUs that manifested as e.g. completely broken graphics in Spyro: Enter the Dragonfly.	2025-12-08 23:19:10 +01:00
Venomalia	c678d9fa71	C8 Texture-Tlut-Hash remains constant when the transparency flag is used.	2023-10-05 22:15:51 +02:00