edg-l/ddnet
1
0
Fork 0
mirror of https://github.com/ddnet/ddnet.git synced 2024-09-19 17:14:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #8658 from Robyt3/Client-Image-Non-Rgba-Leak

Browse source 
Fix memory leak of non-RGBA image data, clear all image info
This commit is contained in:
Dennis Felsing 2024-07-27 22:12:42 +00:00 committed by GitHub
parent 6911944c57 fb832b482c
commit 1d92b5acd6
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
4 changed files with 15 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
src/engine/client/graphics_threaded.cpp
View file

@ -474,7 +474,9 @@ IGraphics::CTextureHandle CGraphics_Threaded::LoadTextureRawMove(CImageInfo &Ima
if(Image.m_Format != CImageInfo::FORMAT_RGBA) if(Image.m_Format != CImageInfo::FORMAT_RGBA)
{ {
// Moving not possible, texture needs to be converted // Moving not possible, texture needs to be converted
return LoadTextureRaw(Image, Flags, pTexName); IGraphics::CTextureHandle TextureHandle = LoadTextureRaw(Image, Flags, pTexName);
Image.Free();
return TextureHandle;
} }
LoadTextureAddWarning(Image.m_Width, Image.m_Height, Flags, pTexName, m_vWarnings); LoadTextureAddWarning(Image.m_Width, Image.m_Height, Flags, pTexName, m_vWarnings);
@ -486,6 +488,7 @@ IGraphics::CTextureHandle CGraphics_Threaded::LoadTextureRawMove(CImageInfo &Ima
CCommandBuffer::SCommand_Texture_Create Cmd = LoadTextureCreateCommand(TextureHandle.Id(), Image.m_Width, Image.m_Height, Flags); CCommandBuffer::SCommand_Texture_Create Cmd = LoadTextureCreateCommand(TextureHandle.Id(), Image.m_Width, Image.m_Height, Flags);
Cmd.m_pData = Image.m_pData; Cmd.m_pData = Image.m_pData;
Image.m_pData = nullptr; Image.m_pData = nullptr;
Image.Free();
AddCmd(Cmd); AddCmd(Cmd);
return TextureHandle; return TextureHandle;

1
src/game/client/components/menus_browser.cpp
View file

@ -2001,7 +2001,6 @@ void CMenus::LoadCommunityIconFinish(const char *pCommunityId, CImageInfo &Info,
pData[i * Step + 2] = v; pData[i * Step + 2] = v;
} }
CommunityIcon.m_GreyTexture = Graphics()->LoadTextureRawMove(Info, 0, pCommunityId); CommunityIcon.m_GreyTexture = Graphics()->LoadTextureRawMove(Info, 0, pCommunityId);
Info.m_pData = nullptr;
auto ExistingIcon = std::find_if(m_vCommunityIcons.begin(), m_vCommunityIcons.end(), [pCommunityId](const SCommunityIcon &Element) { auto ExistingIcon = std::find_if(m_vCommunityIcons.begin(), m_vCommunityIcons.end(), [pCommunityId](const SCommunityIcon &Element) {
return str_comp(Element.m_aCommunityId, pCommunityId) == 0; return str_comp(Element.m_aCommunityId, pCommunityId) == 0;

16
src/game/editor/editor.cpp
View file

@ -5140,11 +5140,13 @@ void CEditor::RenderFileDialog()
{ {
char aBuffer[IO_MAX_PATH_LENGTH]; char aBuffer[IO_MAX_PATH_LENGTH];
str_format(aBuffer, sizeof(aBuffer), "%s/%s", m_pFileDialogPath, m_vpFilteredFileList[m_FilesSelectedIndex]->m_aFilename); str_format(aBuffer, sizeof(aBuffer), "%s/%s", m_pFileDialogPath, m_vpFilteredFileList[m_FilesSelectedIndex]->m_aFilename);
if(Graphics()->LoadPng(m_FilePreviewImageInfo, aBuffer, m_vpFilteredFileList[m_FilesSelectedIndex]->m_StorageType)) CImageInfo PreviewImageInfo;
if(Graphics()->LoadPng(PreviewImageInfo, aBuffer, m_vpFilteredFileList[m_FilesSelectedIndex]->m_StorageType))
{ {
Graphics()->UnloadTexture(&m_FilePreviewImage); Graphics()->UnloadTexture(&m_FilePreviewImage);
m_FilePreviewImage = Graphics()->LoadTextureRawMove(m_FilePreviewImageInfo, 0, aBuffer); m_FilePreviewImageWidth = PreviewImageInfo.m_Width;
m_FilePreviewImageInfo.m_pData = nullptr; m_FilePreviewImageHeight = PreviewImageInfo.m_Height;
m_FilePreviewImage = Graphics()->LoadTextureRawMove(PreviewImageInfo, 0, aBuffer);
m_FilePreviewState = PREVIEW_LOADED; m_FilePreviewState = PREVIEW_LOADED;
} }
else else
@ -5167,11 +5169,11 @@ void CEditor::RenderFileDialog()
Preview.Margin(10.0f, &Preview); Preview.Margin(10.0f, &Preview);
if(m_FilePreviewState == PREVIEW_LOADED) if(m_FilePreviewState == PREVIEW_LOADED)
{ {
int w = m_FilePreviewImageInfo.m_Width; int w = m_FilePreviewImageWidth;
int h = m_FilePreviewImageInfo.m_Height; int h = m_FilePreviewImageHeight;
if(m_FilePreviewImageInfo.m_Width > Preview.w) if(m_FilePreviewImageWidth > Preview.w)
{ {
h = m_FilePreviewImageInfo.m_Height * Preview.w / m_FilePreviewImageInfo.m_Width; h = m_FilePreviewImageHeight * Preview.w / m_FilePreviewImageWidth;
w = Preview.w; w = Preview.w;
} }
if(h > Preview.h) if(h > Preview.h)

3
src/game/editor/editor.h
View file

@ -610,7 +610,8 @@ public:
IGraphics::CTextureHandle m_FilePreviewImage; IGraphics::CTextureHandle m_FilePreviewImage;
int m_FilePreviewSound; int m_FilePreviewSound;
EPreviewState m_FilePreviewState; EPreviewState m_FilePreviewState;
CImageInfo m_FilePreviewImageInfo; int m_FilePreviewImageWidth;
int m_FilePreviewImageHeight;
bool m_FileDialogOpening; bool m_FileDialogOpening;
int m_ToolbarPreviewSound; int m_ToolbarPreviewSound;