LineageOS/android_development
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge "opengles emulator: GLES memory leaks"

Browse Source
This commit is contained in:
David Turner
2011-08-10 01:09:48 -07:00
committed by Android Code Review
parent 5bc21905be 5018365268
commit 6bb9511365
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
tools/emulator/opengl/host/libs/libOpenglRender/FBConfig.cpp
View File

@@ -261,7 +261,7 @@ int FBConfig::chooseConfig(FrameBuffer *fb, EGLint * attribs, uint32_t * configs
s_egl.eglChooseConfig(dpy, newAttribs, matchedConfigs, nConfigs, &nConfigs); s_egl.eglChooseConfig(dpy, newAttribs, matchedConfigs, nConfigs, &nConfigs);
delete newAttribs; delete[] newAttribs;
// //
// From all matchedConfigs we need only config_size FBConfigs, so we intersect both lists compating the CONFIG_ID attribute // From all matchedConfigs we need only config_size FBConfigs, so we intersect both lists compating the CONFIG_ID attribute
@@ -284,7 +284,7 @@ int FBConfig::chooseConfig(FrameBuffer *fb, EGLint * attribs, uint32_t * configs
} }
} }
delete matchedConfigs; delete[] matchedConfigs;
return nVerifiedCfgs; return nVerifiedCfgs;
} }
@@ -308,6 +308,6 @@ FBConfig::FBConfig(EGLDisplay p_eglDpy, EGLConfig p_eglCfg)
FBConfig::~FBConfig() FBConfig::~FBConfig()
{ {
if (m_attribValues) { if (m_attribValues) {
delete m_attribValues; delete[] m_attribValues;
} }
} }

2
tools/emulator/opengl/shared/OpenglCodecCommon/FixedBuffer.h
View File

@@ -32,7 +32,7 @@ public:
void * alloc(size_t size) { void * alloc(size_t size) {
if (m_bufferLen >= size) return (void *)(m_buffer); if (m_bufferLen >= size) return (void *)(m_buffer);
if (m_buffer != NULL) delete m_buffer; if (m_buffer != NULL) delete[] m_buffer;
m_bufferLen = size; m_bufferLen = size;
m_buffer = new unsigned char[m_bufferLen]; m_buffer = new unsigned char[m_bufferLen];