mirror of
https://github.com/dolphin-emu/dolphin.git
synced 2025-01-09 15:49:25 +01:00
Merge pull request #7839 from ShFil119/impr/redundant
Remove redundant initialization
This commit is contained in:
commit
99a4ca8de7
@ -15,9 +15,7 @@ namespace
|
|||||||
const size_t BUFFER_SAMPLES = 512; // ~10 ms - needs to be at least 240 for surround
|
const size_t BUFFER_SAMPLES = 512; // ~10 ms - needs to be at least 240 for surround
|
||||||
}
|
}
|
||||||
|
|
||||||
PulseAudio::PulseAudio() : m_thread(), m_run_thread()
|
PulseAudio::PulseAudio() = default;
|
||||||
{
|
|
||||||
}
|
|
||||||
|
|
||||||
bool PulseAudio::Init()
|
bool PulseAudio::Init()
|
||||||
{
|
{
|
||||||
|
@ -118,8 +118,8 @@ static const char* regnames[32] = {"r0", "sp", "rtoc", "r3", "r4", "r5", "r
|
|||||||
// Initialize static class variables.
|
// Initialize static class variables.
|
||||||
u32* GekkoDisassembler::m_instr = nullptr;
|
u32* GekkoDisassembler::m_instr = nullptr;
|
||||||
u32* GekkoDisassembler::m_iaddr = nullptr;
|
u32* GekkoDisassembler::m_iaddr = nullptr;
|
||||||
std::string GekkoDisassembler::m_opcode = "";
|
std::string GekkoDisassembler::m_opcode;
|
||||||
std::string GekkoDisassembler::m_operands = "";
|
std::string GekkoDisassembler::m_operands;
|
||||||
unsigned char GekkoDisassembler::m_type = 0;
|
unsigned char GekkoDisassembler::m_type = 0;
|
||||||
unsigned char GekkoDisassembler::m_flags = PPCF_ILLEGAL;
|
unsigned char GekkoDisassembler::m_flags = PPCF_ILLEGAL;
|
||||||
unsigned short GekkoDisassembler::m_sreg = 0;
|
unsigned short GekkoDisassembler::m_sreg = 0;
|
||||||
|
@ -25,7 +25,7 @@ u32 Profiler::s_max_length = 0;
|
|||||||
u64 Profiler::s_frame_time;
|
u64 Profiler::s_frame_time;
|
||||||
u64 Profiler::s_usecs_frame;
|
u64 Profiler::s_usecs_frame;
|
||||||
|
|
||||||
std::string Profiler::s_lazy_result = "";
|
std::string Profiler::s_lazy_result;
|
||||||
int Profiler::s_lazy_delay = 0;
|
int Profiler::s_lazy_delay = 0;
|
||||||
|
|
||||||
Profiler::Profiler(const std::string& name)
|
Profiler::Profiler(const std::string& name)
|
||||||
|
@ -147,7 +147,7 @@ void PrintDataBuffer(LogTypes::LOG_TYPE type, const u8* data, size_t size, const
|
|||||||
GENERIC_LOG(type, LogTypes::LDEBUG, "%s", title.c_str());
|
GENERIC_LOG(type, LogTypes::LDEBUG, "%s", title.c_str());
|
||||||
for (u32 j = 0; j < size;)
|
for (u32 j = 0; j < size;)
|
||||||
{
|
{
|
||||||
std::string hex_line = "";
|
std::string hex_line;
|
||||||
for (int i = 0; i < 16; i++)
|
for (int i = 0; i < 16; i++)
|
||||||
{
|
{
|
||||||
hex_line += StringFromFormat("%02x ", data[j++]);
|
hex_line += StringFromFormat("%02x ", data[j++]);
|
||||||
|
@ -106,7 +106,7 @@ void WiimoteScannerLinux::FindWiimotes(std::vector<Wiimote*>& found_wiimotes, Wi
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
WiimoteLinux::WiimoteLinux(bdaddr_t bdaddr) : Wiimote(), m_bdaddr(bdaddr)
|
WiimoteLinux::WiimoteLinux(bdaddr_t bdaddr) : m_bdaddr(bdaddr)
|
||||||
{
|
{
|
||||||
m_really_disconnect = true;
|
m_really_disconnect = true;
|
||||||
|
|
||||||
|
@ -52,6 +52,8 @@ std::mutex g_wiimotes_mutex;
|
|||||||
std::unique_ptr<Wiimote> g_wiimotes[MAX_BBMOTES];
|
std::unique_ptr<Wiimote> g_wiimotes[MAX_BBMOTES];
|
||||||
WiimoteScanner g_wiimote_scanner;
|
WiimoteScanner g_wiimote_scanner;
|
||||||
|
|
||||||
|
Wiimote::Wiimote() = default;
|
||||||
|
|
||||||
void Wiimote::Shutdown()
|
void Wiimote::Shutdown()
|
||||||
{
|
{
|
||||||
std::lock_guard<std::mutex> lk(s_known_ids_mutex);
|
std::lock_guard<std::mutex> lk(s_known_ids_mutex);
|
||||||
|
@ -1,4 +1,4 @@
|
|||||||
// Copyright 2008 Dolphin Emulator Project
|
// Copyright 2008 Dolphin Emulator Project
|
||||||
// Licensed under GPLv2+
|
// Licensed under GPLv2+
|
||||||
// Refer to the license.txt file included.
|
// Refer to the license.txt file included.
|
||||||
|
|
||||||
@ -113,10 +113,10 @@ public:
|
|||||||
int GetIndex() const;
|
int GetIndex() const;
|
||||||
|
|
||||||
protected:
|
protected:
|
||||||
Wiimote() = default;
|
Wiimote();
|
||||||
|
|
||||||
int m_index = 0;
|
int m_index = 0;
|
||||||
Report m_last_input_report = {};
|
Report m_last_input_report;
|
||||||
u16 m_channel = 0;
|
u16 m_channel = 0;
|
||||||
|
|
||||||
// If true, the Wiimote will be really disconnected when it is disconnected by Dolphin.
|
// If true, the Wiimote will be really disconnected when it is disconnected by Dolphin.
|
||||||
|
@ -92,8 +92,8 @@ static bool s_bSaveConfig = false, s_bNetPlay = false;
|
|||||||
static bool s_bClearSave = false;
|
static bool s_bClearSave = false;
|
||||||
static bool s_bDiscChange = false;
|
static bool s_bDiscChange = false;
|
||||||
static bool s_bReset = false;
|
static bool s_bReset = false;
|
||||||
static std::string s_author = "";
|
static std::string s_author;
|
||||||
static std::string s_discChange = "";
|
static std::string s_discChange;
|
||||||
static std::array<u8, 16> s_MD5;
|
static std::array<u8, 16> s_MD5;
|
||||||
static u8 s_bongos, s_memcards;
|
static u8 s_bongos, s_memcards;
|
||||||
static std::array<u8, 20> s_revision;
|
static std::array<u8, 20> s_revision;
|
||||||
|
@ -116,13 +116,13 @@ static int startTrace = 0;
|
|||||||
|
|
||||||
static void Trace(UGeckoInstruction& inst)
|
static void Trace(UGeckoInstruction& inst)
|
||||||
{
|
{
|
||||||
std::string regs = "";
|
std::string regs;
|
||||||
for (int i = 0; i < 32; i++)
|
for (int i = 0; i < 32; i++)
|
||||||
{
|
{
|
||||||
regs += StringFromFormat("r%02d: %08x ", i, PowerPC::ppcState.gpr[i]);
|
regs += StringFromFormat("r%02d: %08x ", i, PowerPC::ppcState.gpr[i]);
|
||||||
}
|
}
|
||||||
|
|
||||||
std::string fregs = "";
|
std::string fregs;
|
||||||
for (int i = 0; i < 32; i++)
|
for (int i = 0; i < 32; i++)
|
||||||
{
|
{
|
||||||
const auto& ps = PowerPC::ppcState.ps[i];
|
const auto& ps = PowerPC::ppcState.ps[i];
|
||||||
|
@ -83,7 +83,7 @@ std::string HostDisassemblerLLVM::DisassembleHostBlock(const u8* code_start, con
|
|||||||
{
|
{
|
||||||
// If we are on an architecture that has a fixed instruction size
|
// If we are on an architecture that has a fixed instruction size
|
||||||
// We can continue onward past this bad instruction.
|
// We can continue onward past this bad instruction.
|
||||||
std::string inst_str = "";
|
std::string inst_str;
|
||||||
for (int i = 0; i < m_instruction_size; ++i)
|
for (int i = 0; i < m_instruction_size; ++i)
|
||||||
inst_str += StringFromFormat("%02x", disasmPtr[i]);
|
inst_str += StringFromFormat("%02x", disasmPtr[i]);
|
||||||
|
|
||||||
@ -94,7 +94,7 @@ std::string HostDisassemblerLLVM::DisassembleHostBlock(const u8* code_start, con
|
|||||||
{
|
{
|
||||||
// We can't continue if we are on an architecture that has flexible instruction sizes
|
// We can't continue if we are on an architecture that has flexible instruction sizes
|
||||||
// Dump the rest of the block instead
|
// Dump the rest of the block instead
|
||||||
std::string code_block = "";
|
std::string code_block;
|
||||||
for (int i = 0; (disasmPtr + i) < end; ++i)
|
for (int i = 0; (disasmPtr + i) < end; ++i)
|
||||||
code_block += StringFromFormat("%02x", disasmPtr[i]);
|
code_block += StringFromFormat("%02x", disasmPtr[i]);
|
||||||
|
|
||||||
|
@ -194,7 +194,7 @@ void SetUserDirectory(const std::string& custom_path)
|
|||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
std::string user_path = "";
|
std::string user_path;
|
||||||
#ifdef _WIN32
|
#ifdef _WIN32
|
||||||
// Detect where the User directory is. There are five different cases
|
// Detect where the User directory is. There are five different cases
|
||||||
// (on top of the command line flag, which overrides all this):
|
// (on top of the command line flag, which overrides all this):
|
||||||
|
@ -63,7 +63,7 @@ std::unique_ptr<AbstractShader> Renderer::CreateShaderFromBinary(ShaderStage sta
|
|||||||
class NullPipeline final : public AbstractPipeline
|
class NullPipeline final : public AbstractPipeline
|
||||||
{
|
{
|
||||||
public:
|
public:
|
||||||
NullPipeline() : AbstractPipeline() {}
|
NullPipeline() = default;
|
||||||
~NullPipeline() override = default;
|
~NullPipeline() override = default;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
@ -51,7 +51,7 @@ static int num_failures = 0;
|
|||||||
static GLuint CurrentProgram = 0;
|
static GLuint CurrentProgram = 0;
|
||||||
ProgramShaderCache::PipelineProgramMap ProgramShaderCache::s_pipeline_programs;
|
ProgramShaderCache::PipelineProgramMap ProgramShaderCache::s_pipeline_programs;
|
||||||
std::mutex ProgramShaderCache::s_pipeline_program_lock;
|
std::mutex ProgramShaderCache::s_pipeline_program_lock;
|
||||||
static std::string s_glsl_header = "";
|
static std::string s_glsl_header;
|
||||||
static std::atomic<u64> s_shader_counter{0};
|
static std::atomic<u64> s_shader_counter{0};
|
||||||
static thread_local bool s_is_shared_context = false;
|
static thread_local bool s_is_shared_context = false;
|
||||||
|
|
||||||
@ -663,7 +663,7 @@ void ProgramShaderCache::CreateHeader()
|
|||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
|
||||||
std::string earlyz_string = "";
|
std::string earlyz_string;
|
||||||
if (g_ActiveConfig.backend_info.bSupportsEarlyZ)
|
if (g_ActiveConfig.backend_info.bSupportsEarlyZ)
|
||||||
{
|
{
|
||||||
if (g_ogl_config.bSupportsImageLoadStore)
|
if (g_ogl_config.bSupportsImageLoadStore)
|
||||||
|
@ -82,7 +82,7 @@ std::unique_ptr<AbstractShader> SWRenderer::CreateShaderFromBinary(ShaderStage s
|
|||||||
class SWPipeline final : public AbstractPipeline
|
class SWPipeline final : public AbstractPipeline
|
||||||
{
|
{
|
||||||
public:
|
public:
|
||||||
SWPipeline() : AbstractPipeline() {}
|
SWPipeline() = default;
|
||||||
~SWPipeline() override = default;
|
~SWPipeline() override = default;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
@ -275,7 +275,7 @@ void PostProcessingConfiguration::SaveOptionsConfiguration()
|
|||||||
break;
|
break;
|
||||||
case ConfigurationOption::OptionType::OPTION_INTEGER:
|
case ConfigurationOption::OptionType::OPTION_INTEGER:
|
||||||
{
|
{
|
||||||
std::string value = "";
|
std::string value;
|
||||||
for (size_t i = 0; i < it.second.m_integer_values.size(); ++i)
|
for (size_t i = 0; i < it.second.m_integer_values.size(); ++i)
|
||||||
value += StringFromFormat("%d%s", it.second.m_integer_values[i],
|
value += StringFromFormat("%d%s", it.second.m_integer_values[i],
|
||||||
i == (it.second.m_integer_values.size() - 1) ? "" : ", ");
|
i == (it.second.m_integer_values.size() - 1) ? "" : ", ");
|
||||||
|
@ -1128,7 +1128,7 @@ TextureCacheBase::GetTexture(u32 address, u32 width, u32 height, const TextureFo
|
|||||||
entry->memory_stride = entry->BytesPerRow();
|
entry->memory_stride = entry->BytesPerRow();
|
||||||
entry->SetNotCopy();
|
entry->SetNotCopy();
|
||||||
|
|
||||||
std::string basename = "";
|
std::string basename;
|
||||||
if (g_ActiveConfig.bDumpTextures && !hires_tex)
|
if (g_ActiveConfig.bDumpTextures && !hires_tex)
|
||||||
{
|
{
|
||||||
basename = HiresTexture::GenBaseName(src_data, texture_size, &texMem[tlutaddr], palette_size,
|
basename = HiresTexture::GenBaseName(src_data, texture_size, &texMem[tlutaddr], palette_size,
|
||||||
|
@ -44,7 +44,7 @@ TEST(StringUtil, StringEndsWith)
|
|||||||
TEST(StringUtil, StringPopBackIf)
|
TEST(StringUtil, StringPopBackIf)
|
||||||
{
|
{
|
||||||
std::string abc = "abc";
|
std::string abc = "abc";
|
||||||
std::string empty = "";
|
std::string empty;
|
||||||
|
|
||||||
StringPopBackIf(&abc, 'a');
|
StringPopBackIf(&abc, 'a');
|
||||||
StringPopBackIf(&empty, 'a');
|
StringPopBackIf(&empty, 'a');
|
||||||
|
Loading…
x
Reference in New Issue
Block a user