piwalker/dolphin
1
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2024-11-14 13:27:45 -07:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge a7a5b662c0 into 2c92e5b5b3

Browse Source
This commit is contained in:
Tygyh 2024-11-14 09:22:29 +01:00 committed by GitHub
commit 46588b253d
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
7 changed files with 2 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Source/Core/Core/ActionReplay.cpp
View File

@ -314,8 +314,6 @@ static void VLogInfo(std::string_view format, fmt::format_args args)
return;
const bool use_internal_log = s_use_internal_log.load(std::memory_order_relaxed);
if (Common::Log::MAX_LOGLEVEL < Common::Log::LogLevel::LINFO && !use_internal_log)
return;
std::string text = fmt::vformat(format, args);
INFO_LOG_FMT(ACTIONREPLAY, "{}", text);

2
Source/Core/Core/PowerPC/GDBStub.cpp
View File

@ -574,7 +574,6 @@ static void ReadRegister()
break;
default:
return SendReply("E01");
break;
}
}
@ -798,7 +797,6 @@ static void WriteRegister()
break;
default:
return SendReply("E01");
break;
}
}

3
Source/Core/VideoBackends/D3D/DXShader.cpp
View File

@ -72,7 +72,6 @@ std::unique_ptr<DXShader> DXShader::CreateFromBytecode(ShaderStage stage, Binary
return std::make_unique<DXShader>(ShaderStage::Geometry, std::move(bytecode), gs.Get(), name);
}
break;
case ShaderStage::Pixel:
{
@ -84,7 +83,6 @@ std::unique_ptr<DXShader> DXShader::CreateFromBytecode(ShaderStage stage, Binary
return std::make_unique<DXShader>(ShaderStage::Pixel, std::move(bytecode), ps.Get(), name);
}
break;
case ShaderStage::Compute:
{
@ -96,7 +94,6 @@ std::unique_ptr<DXShader> DXShader::CreateFromBytecode(ShaderStage stage, Binary
return std::make_unique<DXShader>(ShaderStage::Compute, std::move(bytecode), cs.Get(), name);
}
break;
default:
break;

5
Source/Core/VideoCommon/Assets/DirectFilesystemAssetLibrary.cpp
View File

@ -455,7 +455,8 @@ bool DirectFilesystemAssetLibrary::LoadMips(const std::filesystem::path& asset_p
Common::ToLower(&extension_lower);
// Load additional mip levels
for (u32 mip_level = static_cast<u32>(data->m_levels.size());; mip_level++)
for (u32 initial_mip_level = static_cast<u32>(data->m_levels.size()), mip_level =
initial_mip_level; mip_level < initial_mip_level + 100; mip_level++)
{
const auto mip_level_filename = filename + fmt::format("_mip{}", mip_level);
@ -488,8 +489,6 @@ bool DirectFilesystemAssetLibrary::LoadMips(const std::filesystem::path& asset_p
data->m_levels.push_back(std::move(level));
}
return true;
}
DirectFilesystemAssetLibrary::AssetMap

2
Source/Core/VideoCommon/Assets/MeshAsset.cpp
View File

@ -72,7 +72,6 @@ bool GLTFComponentTypeToAttributeFormat(int component_type, AttributeFormat* for
{
return false;
}
break;
case TINYGLTF_COMPONENT_TYPE_FLOAT:
{
format->type = ComponentFormat::Float;
@ -101,7 +100,6 @@ bool GLTFComponentTypeToAttributeFormat(int component_type, AttributeFormat* for
{
return false;
}
break;
case TINYGLTF_COMPONENT_TYPE_UNSIGNED_SHORT:
{
format->type = ComponentFormat::UShort;

1
Source/Core/VideoCommon/BPStructs.cpp
View File

@ -198,7 +198,6 @@ static void BPWritten(PixelShaderManager& pixel_shader_manager, XFStateManager&
WARN_LOG_FMT(VIDEO, "GXSetDrawDone ??? (value {:#04X})", bp.newvalue & 0xFFFF);
return;
}
return;
case BPMEM_PE_TOKEN_ID: // Pixel Engine Token ID
{
INCSTAT(g_stats.this_frame.num_token);

3
Source/Core/VideoCommon/XFStructs.cpp
View File

@ -338,7 +338,6 @@ std::pair<std::string, std::string> GetXFRegInfo(u32 address, u32 value)
case XFMEM_SETNUMCHAN:
return std::make_pair(RegName(XFMEM_SETNUMCHAN),
fmt::format("Number of color channels: {}", value & 3));
break;
case XFMEM_SETCHAN0_AMBCOLOR:
return std::make_pair(RegName(XFMEM_SETCHAN0_AMBCOLOR),
@ -396,7 +395,6 @@ std::pair<std::string, std::string> GetXFRegInfo(u32 address, u32 value)
case XFMEM_SETVIEWPORT + 5:
return std::make_pair(RegName(XFMEM_SETVIEWPORT + 5),
fmt::format("Viewport far z: {}", std::bit_cast<float>(value)));
break;
case XFMEM_SETPROJECTION:
return std::make_pair(RegName(XFMEM_SETPROJECTION + 0),
@ -464,7 +462,6 @@ std::pair<std::string, std::string> GetXFRegInfo(u32 address, u32 value)
return std::make_pair(
fmt::format("Possible Normal Mtx XF reg?: {:x}={:x}", address, value),
"Maybe these are for Normals? xfmem.texcoords[0].nrmmtxinfo.hex = data; break; ??");
break;
case 0x1013:
case 0x1014: