summaryrefslogtreecommitdiffstats
path: root/externals
diff options
context:
space:
mode:
authorAndrix44 <katisx1@citromail.hu>2018-01-15 00:08:03 +0100
committerAndrix44 <katisx1@citromail.hu>2018-01-15 00:08:03 +0100
commitb20dfb357b0ad9964fe9507c6e17a68d8ef66ebc (patch)
tree7f241abbd399ffdb149654cfe974bc0456bc2ae7 /externals
parentMerge pull request #7 from JayFoxRox/remove-surface-viewer (diff)
downloadyuzu-b20dfb357b0ad9964fe9507c6e17a68d8ef66ebc.tar
yuzu-b20dfb357b0ad9964fe9507c6e17a68d8ef66ebc.tar.gz
yuzu-b20dfb357b0ad9964fe9507c6e17a68d8ef66ebc.tar.bz2
yuzu-b20dfb357b0ad9964fe9507c6e17a68d8ef66ebc.tar.lz
yuzu-b20dfb357b0ad9964fe9507c6e17a68d8ef66ebc.tar.xz
yuzu-b20dfb357b0ad9964fe9507c6e17a68d8ef66ebc.tar.zst
yuzu-b20dfb357b0ad9964fe9507c6e17a68d8ef66ebc.zip
Diffstat (limited to 'externals')
-rw-r--r--externals/microprofile/microprofileui.h8
1 files changed, 4 insertions, 4 deletions
diff --git a/externals/microprofile/microprofileui.h b/externals/microprofile/microprofileui.h
index 09223b33f..7670fec5d 100644
--- a/externals/microprofile/microprofileui.h
+++ b/externals/microprofile/microprofileui.h
@@ -1853,7 +1853,7 @@ void MicroProfileDrawBarView(uint32_t nScreenWidth, uint32_t nScreenHeight)
{
if(nMetaIndex < MICROPROFILE_META_MAX && S.MetaCounters[nMetaIndex].pName)
{
- uint32_t nStrWidth = strlen(S.MetaCounters[nMetaIndex].pName);
+ uint32_t nStrWidth = static_cast<uint32_t>(strlen(S.MetaCounters[nMetaIndex].pName));
if(S.nBars & MP_DRAW_TIMERS)
nWidth += 6 + (1+MICROPROFILE_TEXT_WIDTH) * (nStrWidth);
if(S.nBars & MP_DRAW_AVERAGE)
@@ -1907,7 +1907,7 @@ void MicroProfileDrawBarView(uint32_t nScreenWidth, uint32_t nScreenHeight)
{
if(0 != (S.nBars & (MP_DRAW_META_FIRST<<i)) && S.MetaCounters[i].pName)
{
- uint32_t nBufferSize = strlen(S.MetaCounters[i].pName) + 32;
+ uint32_t nBufferSize = static_cast<uint32_t>(strlen(S.MetaCounters[i].pName) + 32);
char* buffer = (char*)alloca(nBufferSize);
if(S.nBars & MP_DRAW_TIMERS)
nX += MicroProfileDrawBarMetaCount(nX, nY, &S.MetaCounters[i].nCounters[0], S.MetaCounters[i].pName, nTotalHeight) + 1;
@@ -2599,7 +2599,7 @@ void MicroProfileDrawCustom(uint32_t nWidth, uint32_t nHeight)
nOffsetY = nOffsetYBase;
float* pMs = pCustom->nFlags & MICROPROFILE_CUSTOM_BAR_SOURCE_MAX ? pTimeMax : pTimeAvg;
const char* pString = pCustom->nFlags & MICROPROFILE_CUSTOM_BAR_SOURCE_MAX ? "Max" : "Avg";
- MicroProfileDrawText(nMaxOffsetX, nOffsetY, (uint32_t)-1, pString, strlen(pString));
+ MicroProfileDrawText(nMaxOffsetX, nOffsetY, (uint32_t)-1, pString, static_cast<uint32_t>(strlen(pString)));
int nSize = snprintf(Buffer, sizeof(Buffer)-1, "%6.2fms", fReference);
MicroProfileDrawText(nReducedWidth - (1+nSize) * (MICROPROFILE_TEXT_WIDTH+1), nOffsetY, (uint32_t)-1, Buffer, nSize);
for(uint32_t i = 0; i < nCount; ++i)
@@ -2613,7 +2613,7 @@ void MicroProfileDrawCustom(uint32_t nWidth, uint32_t nHeight)
{
nOffsetY += 2*(1+MICROPROFILE_TEXT_HEIGHT);
const char* pString = pCustom->nFlags & MICROPROFILE_CUSTOM_STACK_SOURCE_MAX ? "Max" : "Avg";
- MicroProfileDrawText(MICROPROFILE_CUSTOM_PADDING, nOffsetY, (uint32_t)-1, pString, strlen(pString));
+ MicroProfileDrawText(MICROPROFILE_CUSTOM_PADDING, nOffsetY, (uint32_t)-1, pString, static_cast<uint32_t>(strlen(pString)));
int nSize = snprintf(Buffer, sizeof(Buffer)-1, "%6.2fms", fReference);
MicroProfileDrawText(nReducedWidth - (1+nSize) * (MICROPROFILE_TEXT_WIDTH+1), nOffsetY, (uint32_t)-1, Buffer, nSize);
nOffsetY += (1+MICROPROFILE_TEXT_HEIGHT);