ShuriZma
/
dolphin
mirror of https://github.com/dolphin-emu/dolphin.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #6230 from leoetlino/warning-fixes 

Small warning fixes
This commit is contained in:
Markus Wick 2017-12-02 22:16:21 +01:00 committed by GitHub
parent d71f4168e9 d95177526f
commit 4c48cc6757
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Source/Core/VideoBackends/Software/TextureEncoder.cpp
View File

@ -1441,6 +1441,8 @@ void EncodeEfbCopy(u8* dst, const EFBCopyParams& params, u32 native_width, u32 b
case PEControl::Z24: case PEControl::Z24:
EncodeZ24halfscale(dst, src, params.copy_format); EncodeZ24halfscale(dst, src, params.copy_format);
break; break;
default:
break;
} }
} }
else else
@ -1459,6 +1461,8 @@ void EncodeEfbCopy(u8* dst, const EFBCopyParams& params, u32 native_width, u32 b
case PEControl::Z24: case PEControl::Z24:
EncodeZ24(dst, src, params.copy_format); EncodeZ24(dst, src, params.copy_format);
break; break;
default:
break;
} }
} }
} }

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

@ -1017,7 +1017,7 @@ void GetBPRegInfo(const u8* data, std::string* name, std::string* desc)
(copy.clamp0 && copy.clamp1) ? "Top and Bottom" : (copy.clamp0) ? (copy.clamp0 && copy.clamp1) ? "Top and Bottom" : (copy.clamp0) ?
"Top only" : "Top only" :
(copy.clamp1) ? "Bottom only" : "None", (copy.clamp1) ? "Bottom only" : "None",
no_yes[copy.yuv], copy.tp_realFormat(), no_yes[copy.yuv], static_cast<int>(copy.tp_realFormat()),
(copy.gamma == 0) ? "1.0" : (copy.gamma == 1) ? (copy.gamma == 0) ? "1.0" : (copy.gamma == 1) ?
"1.7" : "1.7" :
(copy.gamma == 2) ? "2.2" : "Invalid value 0x3?", (copy.gamma == 2) ? "2.2" : "Invalid value 0x3?",

2
Source/Core/VideoCommon/HiresTextures.cpp
View File

@ -284,7 +284,7 @@ std::string HiresTexture::GenBaseName(const u8* texture, size_t texture_size, co
std::string basename = s_format_prefix + StringFromFormat("%dx%d%s_%016" PRIx64, width, height, std::string basename = s_format_prefix + StringFromFormat("%dx%d%s_%016" PRIx64, width, height,
has_mipmaps ? "_m" : "", tex_hash); has_mipmaps ? "_m" : "", tex_hash);
std::string tlutname = tlut_size ? StringFromFormat("_%016" PRIx64, tlut_hash) : ""; std::string tlutname = tlut_size ? StringFromFormat("_%016" PRIx64, tlut_hash) : "";
std::string formatname = StringFromFormat("_%d", format); std::string formatname = StringFromFormat("_%d", static_cast<int>(format));
std::string fullname = basename + tlutname + formatname; std::string fullname = basename + tlutname + formatname;
for (int level = 0; level < 10 && convert; level++) for (int level = 0; level < 10 && convert; level++)