Merge pull request #6230 from leoetlino/warning-fixes

Small warning fixes
dolphin-emu · Dec 2, 2017 · 4c48cc6 · 4c48cc6
2 parents d71f416 + d951775
commit 4c48cc6
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 2 deletions.
diff --git a/Source/Core/VideoBackends/Software/TextureEncoder.cpp b/Source/Core/VideoBackends/Software/TextureEncoder.cpp
@@ -1441,6 +1441,8 @@ void EncodeEfbCopy(u8* dst, const EFBCopyParams& params, u32 native_width, u32 b
     case PEControl::Z24:
       EncodeZ24halfscale(dst, src, params.copy_format);
       break;
+    default:
+      break;
     }
   }
   else
@@ -1459,6 +1461,8 @@ void EncodeEfbCopy(u8* dst, const EFBCopyParams& params, u32 native_width, u32 b
     case PEControl::Z24:
       EncodeZ24(dst, src, params.copy_format);
       break;
+    default:
+      break;
     }
   }
 }

diff --git a/Source/Core/VideoCommon/BPStructs.cpp b/Source/Core/VideoCommon/BPStructs.cpp
@@ -1017,7 +1017,7 @@ void GetBPRegInfo(const u8* data, std::string* name, std::string* desc)
                              (copy.clamp0 && copy.clamp1) ? "Top and Bottom" : (copy.clamp0) ?
                                                             "Top only" :
                                                             (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) ?
                                                  "1.7" :
                                                  (copy.gamma == 2) ? "2.2" : "Invalid value 0x3?",

diff --git a/Source/Core/VideoCommon/HiresTextures.cpp b/Source/Core/VideoCommon/HiresTextures.cpp
@@ -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,
                                                               has_mipmaps ? "_m" : "", tex_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;
 
     for (int level = 0; level < 10 && convert; level++)