From 688feeafe19c699c0bb4e390340ce0f2067a13b8 Mon Sep 17 00:00:00 2001
From: Rye Mutt <rye@alchemyviewer.org>
Date: Fri, 3 Feb 2023 19:27:24 -0500
Subject: [PATCH] Fix ATI meminfo reporting the kilobyte and not megabyte value
---
indra/llrender/llimagegl.cpp | 2 +-
indra/newview/llviewertexture.cpp | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/indra/llrender/llimagegl.cpp b/indra/llrender/llimagegl.cpp
index 24cbf0a468e..feb4ed844d9 100644
--- a/indra/llrender/llimagegl.cpp
+++ b/indra/llrender/llimagegl.cpp
@@ -1715,7 +1715,7 @@ void LLImageGLThread::updateClass()
{
S32 meminfo[4];
glGetIntegerv(GL_TEXTURE_FREE_MEMORY_ATI, meminfo);
- LLImageGLThread::sFreeVRAMMegabytes = meminfo[0];
+ LLImageGLThread::sFreeVRAMMegabytes = meminfo[0] / 1024;
}
else if (gGLManager.mHasNVXMemInfo)
diff --git a/indra/newview/llviewertexture.cpp b/indra/newview/llviewertexture.cpp
index e9593ec8f21..64e22841e45 100644
--- a/indra/newview/llviewertexture.cpp
+++ b/indra/newview/llviewertexture.cpp
@@ -536,7 +536,7 @@ void LLViewerTexture::getGPUMemoryForTextures(S32Megabytes &gpu, S32Megabytes &p
timer.reset();
{
- gpu_res = (S32Megabytes) LLImageGLThread::getFreeVRAMMegabytes();
+ gpu_res = S32Megabytes(LLImageGLThread::getFreeVRAMMegabytes());
//check main memory, only works for windows.
LLMemory::updateMemoryInfo();
--
GitLab