diff options
| author |  Rodrigo Locatti | 2019-11-13 02:16:22 -0300 |
|---|---|---|
| committer |  GitHub | 2019-11-13 02:16:22 -0300 |
| commit | cf770a68a528cdb7f3a5483f6d17eeb924e37b7e (patch) | |
| tree | 6406933e26e9fbe255a04b4c0810d21b05815494 /externals | |
| parent | Update CONTRIBUTING.md (diff) | |
| parent | video_core: Enable sign conversion warnings (diff) | |
| download | yuzu-cf770a68a528cdb7f3a5483f6d17eeb924e37b7e.tar.gz yuzu-cf770a68a528cdb7f3a5483f6d17eeb924e37b7e.tar.xz yuzu-cf770a68a528cdb7f3a5483f6d17eeb924e37b7e.zip | |
Merge pull request #3084 from ReinUsesLisp/cast-warnings
video_core: Treat implicit conversions as errors
Diffstat (limited to 'externals')
| -rw-r--r-- | externals/microprofile/microprofile.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/externals/microprofile/microprofile.h b/externals/microprofile/microprofile.h index 384863ccc..cdb312b87 100644 --- a/externals/microprofile/microprofile.h +++ b/externals/microprofile/microprofile.h | |||
| @@ -814,7 +814,7 @@ struct MicroProfile | |||
| 814 | 814 | ||
| 815 | inline int MicroProfileLogType(MicroProfileLogEntry Index) | 815 | inline int MicroProfileLogType(MicroProfileLogEntry Index) |
| 816 | { | 816 | { |
| 817 | return ((MP_LOG_BEGIN_MASK & Index)>>62) & 0x3; | 817 | return (int)(((MP_LOG_BEGIN_MASK & Index)>>62) & 0x3ULL); |
| 818 | } | 818 | } |
| 819 | 819 | ||
| 820 | inline uint64_t MicroProfileLogTimerIndex(MicroProfileLogEntry Index) | 820 | inline uint64_t MicroProfileLogTimerIndex(MicroProfileLogEntry Index) |
| @@ -861,12 +861,12 @@ T MicroProfileMax(T a, T b) | |||
| 861 | 861 | ||
| 862 | inline int64_t MicroProfileMsToTick(float fMs, int64_t nTicksPerSecond) | 862 | inline int64_t MicroProfileMsToTick(float fMs, int64_t nTicksPerSecond) |
| 863 | { | 863 | { |
| 864 | return (int64_t)(fMs*0.001f*nTicksPerSecond); | 864 | return (int64_t)(fMs*0.001f*(float)nTicksPerSecond); |
| 865 | } | 865 | } |
| 866 | 866 | ||
| 867 | inline float MicroProfileTickToMsMultiplier(int64_t nTicksPerSecond) | 867 | inline float MicroProfileTickToMsMultiplier(int64_t nTicksPerSecond) |
| 868 | { | 868 | { |
| 869 | return 1000.f / nTicksPerSecond; | 869 | return 1000.f / (float)nTicksPerSecond; |
| 870 | } | 870 | } |
| 871 | 871 | ||
| 872 | inline uint16_t MicroProfileGetGroupIndex(MicroProfileToken t) | 872 | inline uint16_t MicroProfileGetGroupIndex(MicroProfileToken t) |