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

emulator: opengl: minor fix and reformatting

Browse Source 
This patches fixes a minor invalid usage of delete (instead of delete[])
and reformats the source code a little to make it more obvious.

Change-Id: If853d12e74549abcc6682430c837b0f14da81fdc
This commit is contained in:
David 'Digit' Turner
2011-10-19 17:54:20 +02:00
parent 207118ad6d
commit 0e205e6d6e
3 changed files with 13 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -25,18 +25,21 @@ public:
} }
~FixedBuffer() { ~FixedBuffer() {
delete m_buffer; delete [] m_buffer;
m_bufferLen = 0; m_bufferLen = 0;
} }
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];
if (m_buffer == NULL) m_bufferLen = 0; if (m_buffer == NULL)
m_bufferLen = 0;
return m_buffer; return m_buffer;
} }

2
tools/emulator/opengl/system/OpenglSystemCommon/HostConnection.cpp
View File

@@ -69,6 +69,7 @@ HostConnection *HostConnection::get()
} }
if (stream->connect() < 0) { if (stream->connect() < 0) {
LOGE("Failed to connect to host (QemuPipeStream)!!!\n"); LOGE("Failed to connect to host (QemuPipeStream)!!!\n");
delete stream;
delete con; delete con;
return NULL; return NULL;
} }
@@ -85,6 +86,7 @@ HostConnection *HostConnection::get()
if (stream->connect("10.0.2.2", STREAM_PORT_NUM) < 0) { if (stream->connect("10.0.2.2", STREAM_PORT_NUM) < 0) {
LOGE("Failed to connect to host (TcpStream)!!!\n"); LOGE("Failed to connect to host (TcpStream)!!!\n");
delete stream;
delete con; delete con;
return NULL; return NULL;
} }

6
tools/emulator/opengl/system/egl/egl.cpp
View File

@@ -146,8 +146,10 @@ EGLContext_t::EGLContext_t(EGLDisplay dpy, EGLConfig config, EGLContext_t* share
flags = 0; flags = 0;
version = 1; version = 1;
clientState = new GLClientState(); clientState = new GLClientState();
if (shareCtx) sharedGroup = shareCtx->getSharedGroup(); if (shareCtx)
else sharedGroup = GLSharedGroupPtr(new GLSharedGroup()); sharedGroup = shareCtx->getSharedGroup();
else
sharedGroup = GLSharedGroupPtr(new GLSharedGroup());
}; };
EGLContext_t::~EGLContext_t() EGLContext_t::~EGLContext_t()