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

emulator GLESv2: fixed (#16) NenaMark crashes on exit

Browse Source 
The GL2Encoder::m_compressedTextureFormats  member wasn't initialized, so the d'tor
would sometimes crash trying to delete it. Also init m_num_compressedTextureFormats.

Change-Id: Iae423c16a84a4e454e0e1167f7478f9e2f6183c0
This commit is contained in:
Stas Gurtovoy
2011-06-20 16:15:47 +03:00
committed by Guy Zadickario
parent 62d074d9f8
commit 118af85051
2 changed files with 5 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
tools/emulator/opengl/system/GLESv1_enc/GLEncoder.cpp
View File

@@ -453,6 +453,7 @@ GLEncoder::GLEncoder(IOStream *stream) : gl_encoder_context_t(stream)
{ {
m_initialized = false; m_initialized = false;
m_state = NULL; m_state = NULL;
m_num_compressedTextureFormats = 0;
m_compressedTextureFormats = NULL; m_compressedTextureFormats = NULL;
// overrides; // overrides;
m_glFlush_enc = set_glFlush(s_glFlush); m_glFlush_enc = set_glFlush(s_glFlush);

4
tools/emulator/opengl/system/GLESv2_enc/GL2Encoder.cpp
View File

@@ -9,7 +9,11 @@ static GLubyte *gExtensionsString= (GLubyte *) ""; // no extensions at this poin
GL2Encoder::GL2Encoder(IOStream *stream) : gl2_encoder_context_t(stream) GL2Encoder::GL2Encoder(IOStream *stream) : gl2_encoder_context_t(stream)
{ {
m_initialized = false;
m_state = NULL; m_state = NULL;
m_num_compressedTextureFormats = 0;
m_compressedTextureFormats = NULL;
//overrides
m_glFlush_enc = set_glFlush(s_glFlush); m_glFlush_enc = set_glFlush(s_glFlush);
m_glPixelStorei_enc = set_glPixelStorei(s_glPixelStorei); m_glPixelStorei_enc = set_glPixelStorei(s_glPixelStorei);
m_glGetString_enc = set_glGetString(s_glGetString); m_glGetString_enc = set_glGetString(s_glGetString);