am 9b19d582: am 4f66a14d: Merge "EmuGL: handle NULL data in glBufferData" into ics-mr1

* commit '9b19d582d94a343437aacf962b8b95b83361bc10': EmuGL: handle NULL data in glBufferData
2012-01-11 17:13:42 -08:00
parent c784588597 9b19d582d9
commit 900f5e8793
1 changed files with 3 additions and 1 deletions
--- a/tools/emulator/opengl/host/libs/Translator/GLcommon/GLESbuffer.cpp
+++ b/tools/emulator/opengl/host/libs/Translator/GLcommon/GLESbuffer.cpp
@@ -25,7 +25,9 @@ bool  GLESbuffer::setBuffer(GLuint size,GLuint usage,const GLvoid* data) {
    }
    m_data = new unsigned char[size];
    if(m_data) {
+        if(data) {
            memcpy(m_data,data,size);
+        }
        m_conversionManager.clear();
        m_conversionManager.addRange(Range(0,m_size));
        return true;