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

* commit '4f66a14d5311ee94d5a498c8e0049f6b95d4d0d6':
  EmuGL: handle NULL data in glBufferData
This commit is contained in:
Jesse Hall
2012-01-11 17:12:09 -08:00
committed by Android Git Automerger

View File

@@ -25,7 +25,9 @@ bool GLESbuffer::setBuffer(GLuint size,GLuint usage,const GLvoid* data) {
} }
m_data = new unsigned char[size]; m_data = new unsigned char[size];
if(m_data) { if(m_data) {
memcpy(m_data,data,size); if(data) {
memcpy(m_data,data,size);
}
m_conversionManager.clear(); m_conversionManager.clear();
m_conversionManager.addRange(Range(0,m_size)); m_conversionManager.addRange(Range(0,m_size));
return true; return true;