citra-emu
/
citra-nightly
Archived
1
0
Fork 0
Code

Merge pull request #4161 from FearlessTobi/port-1139 

Port #1139 from yuzu: "bit_field: Convert ToBool() into explicit operator bool"
This commit is contained in:
Merry 2018-09-02 09:53:50 +01:00 committed by GitHub
parent 85e0553a1f 488694d01f
commit b130dd6842
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 8 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/audio_core/hle/source.cpp
View File

@ -119,8 +119,8 @@ void Source::ParseConfig(SourceConfiguration::Configuration& config,
if (config.filters_enabled_dirty) { if (config.filters_enabled_dirty) {
config.filters_enabled_dirty.Assign(0); config.filters_enabled_dirty.Assign(0);
state.filters.Enable(config.simple_filter_enabled.ToBool(), state.filters.Enable(static_cast<bool>(config.simple_filter_enabled),
config.biquad_filter_enabled.ToBool()); static_cast<bool>(config.biquad_filter_enabled));
LOG_TRACE(Audio_DSP, "source_id={} enable_simple={} enable_biquad={}", source_id, LOG_TRACE(Audio_DSP, "source_id={} enable_simple={} enable_biquad={}", source_id,
config.simple_filter_enabled.Value(), config.biquad_filter_enabled.Value()); config.simple_filter_enabled.Value(), config.biquad_filter_enabled.Value());
} }
@ -173,8 +173,8 @@ void Source::ParseConfig(SourceConfiguration::Configuration& config,
config.length, config.length,
static_cast<u8>(config.adpcm_ps), static_cast<u8>(config.adpcm_ps),
{config.adpcm_yn[0], config.adpcm_yn[1]}, {config.adpcm_yn[0], config.adpcm_yn[1]},
config.adpcm_dirty.ToBool(), static_cast<bool>(config.adpcm_dirty),
config.is_looping.ToBool(), static_cast<bool>(config.is_looping),
config.buffer_id, config.buffer_id,
state.mono_or_stereo, state.mono_or_stereo,
state.format, state.format,

3
src/common/bit_field.h
View File

@ -178,8 +178,7 @@ public:
return ExtractValue(storage); return ExtractValue(storage);
} }
// TODO: we may want to change this to explicit operator bool() if it's bug-free in VS2015 constexpr explicit operator bool() const {
FORCE_INLINE bool ToBool() const {
return Value() != 0; return Value() != 0;
} }

6
src/video_core/regs_texturing.h
View File

@ -181,9 +181,9 @@ struct TexturingRegs {
}; };
const std::array<FullTextureConfig, 3> GetTextures() const { const std::array<FullTextureConfig, 3> GetTextures() const {
return {{ return {{
{main_config.texture0_enable.ToBool(), texture0, texture0_format}, {static_cast<bool>(main_config.texture0_enable), texture0, texture0_format},
{main_config.texture1_enable.ToBool(), texture1, texture1_format}, {static_cast<bool>(main_config.texture1_enable), texture1, texture1_format},
{main_config.texture2_enable.ToBool(), texture2, texture2_format}, {static_cast<bool>(main_config.texture2_enable), texture2, texture2_format},
}}; }};
} }