Merge "EmuGL: handle NULL data in glBufferData" into ics-mr1

2012-01-11 17:10:35 -08:00
parent a318515c0d 5bad48a65e
commit 4f66a14d53
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) {
-        memcpy(m_data,data,size);
+        if(data) {
+            memcpy(m_data,data,size);
+        }
        m_conversionManager.clear();
        m_conversionManager.addRange(Range(0,m_size));
        return true;