summaryrefslogtreecommitdiffstats
path: root/externals/microprofile/microprofile.h
diff options
context:
space:
mode:
authorReinUsesLisp <reinuseslisp@airmail.cc>2019-11-08 23:32:52 +0100
committerReinUsesLisp <reinuseslisp@airmail.cc>2019-11-08 23:48:42 +0100
commitfa0d65fc7b789193d1c8b078f446d3c497e5458b (patch)
tree3d261c5f8e5a6a3d7055f06fea467141da64bf9f /externals/microprofile/microprofile.h
parentMerge pull request #3057 from ReinUsesLisp/buffer-sub-data (diff)
downloadyuzu-fa0d65fc7b789193d1c8b078f446d3c497e5458b.tar
yuzu-fa0d65fc7b789193d1c8b078f446d3c497e5458b.tar.gz
yuzu-fa0d65fc7b789193d1c8b078f446d3c497e5458b.tar.bz2
yuzu-fa0d65fc7b789193d1c8b078f446d3c497e5458b.tar.lz
yuzu-fa0d65fc7b789193d1c8b078f446d3c497e5458b.tar.xz
yuzu-fa0d65fc7b789193d1c8b078f446d3c497e5458b.tar.zst
yuzu-fa0d65fc7b789193d1c8b078f446d3c497e5458b.zip
Diffstat (limited to '')
-rw-r--r--externals/microprofile/microprofile.h6
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
inline int MicroProfileLogType(MicroProfileLogEntry Index)
{
- return ((MP_LOG_BEGIN_MASK & Index)>>62) & 0x3;
+ return (int)(((MP_LOG_BEGIN_MASK & Index)>>62) & 0x3ULL);
}
inline uint64_t MicroProfileLogTimerIndex(MicroProfileLogEntry Index)
@@ -861,12 +861,12 @@ T MicroProfileMax(T a, T b)
inline int64_t MicroProfileMsToTick(float fMs, int64_t nTicksPerSecond)
{
- return (int64_t)(fMs*0.001f*nTicksPerSecond);
+ return (int64_t)(fMs*0.001f*(float)nTicksPerSecond);
}
inline float MicroProfileTickToMsMultiplier(int64_t nTicksPerSecond)
{
- return 1000.f / nTicksPerSecond;
+ return 1000.f / (float)nTicksPerSecond;
}
inline uint16_t MicroProfileGetGroupIndex(MicroProfileToken t)