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

am aafffde7: Merge "emulator: opengl: minor fix and reformatting"

Browse Source 
* commit 'aafffde798e2b299cc083992be62089051c4ecaa':
  emulator: opengl: minor fix and reformatting
This commit is contained in:
David 'Digit' Turner
2011-10-19 10:16:22 -07:00
committed by Android Git Automerger
parent 4f694defb5 aafffde798
commit fc09b3073e
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() {
delete m_buffer;
delete [] m_buffer;
m_bufferLen = 0;
}
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_buffer = new unsigned char[m_bufferLen];
if (m_buffer == NULL) m_bufferLen = 0;
if (m_buffer == NULL)
m_bufferLen = 0;
return m_buffer;
}

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

@@ -69,6 +69,7 @@ HostConnection *HostConnection::get()
}
if (stream->connect() < 0) {
LOGE("Failed to connect to host (QemuPipeStream)!!!\n");
delete stream;
delete con;
return NULL;
}
@@ -85,6 +86,7 @@ HostConnection *HostConnection::get()
if (stream->connect("10.0.2.2", STREAM_PORT_NUM) < 0) {
LOGE("Failed to connect to host (TcpStream)!!!\n");
delete stream;
delete con;
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;
version = 1;
clientState = new GLClientState();
if (shareCtx) sharedGroup = shareCtx->getSharedGroup();
else sharedGroup = GLSharedGroupPtr(new GLSharedGroup());
if (shareCtx)
sharedGroup = shareCtx->getSharedGroup();
else
sharedGroup = GLSharedGroupPtr(new GLSharedGroup());
};
EGLContext_t::~EGLContext_t()