diff options
author | Deepanshu Gupta <deepanshu@google.com> | 2013-06-17 17:39:36 -0700 |
---|---|---|
committer | Deepanshu Gupta <deepanshu@google.com> | 2013-06-21 10:56:51 -0700 |
commit | 43c42cfd5f7b2a7e47bffeb9a4e148dd35a88f59 (patch) | |
tree | 1ae62d3d0800a5d5c2299a5fb88e0f7dc840a698 /emulator | |
parent | cd7f7686245951574700b85985e3470141a7e2ad (diff) | |
download | sdk-43c42cfd5f7b2a7e47bffeb9a4e148dd35a88f59.zip sdk-43c42cfd5f7b2a7e47bffeb9a4e148dd35a88f59.tar.gz sdk-43c42cfd5f7b2a7e47bffeb9a4e148dd35a88f59.tar.bz2 |
Fix a crash which occured with some graphic libraries.
Fix a small bug that caused the emulator to crash when used with some
graphic libraries.
Change-Id: Ifb7e0b11a8302d0538632dac467d187dfcdfda47
Diffstat (limited to 'emulator')
-rw-r--r-- | emulator/opengl/host/libs/libOpenglRender/ColorBuffer.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/emulator/opengl/host/libs/libOpenglRender/ColorBuffer.cpp b/emulator/opengl/host/libs/libOpenglRender/ColorBuffer.cpp index c970337..07727b2 100644 --- a/emulator/opengl/host/libs/libOpenglRender/ColorBuffer.cpp +++ b/emulator/opengl/host/libs/libOpenglRender/ColorBuffer.cpp @@ -188,16 +188,16 @@ bool ColorBuffer::blitFromCurrentReadBuffer() s_gl2.glGenTextures(1,&tmpTex); s_gl2.glBindTexture(GL_TEXTURE_2D, tmpTex); s_gl2.glEGLImageTargetTexture2DOES(GL_TEXTURE_2D, m_blitEGLImage); - s_gl2.glCopyTexImage2D(GL_TEXTURE_2D, 0, m_internalFormat, - 0, 0, m_width, m_height, 0); + s_gl2.glCopyTexSubImage2D(GL_TEXTURE_2D, 0, 0, 0, 0, 0, + m_width, m_height); } else { s_gl.glGetIntegerv(GL_TEXTURE_BINDING_2D, &currTexBind); s_gl.glGenTextures(1,&tmpTex); s_gl.glBindTexture(GL_TEXTURE_2D, tmpTex); s_gl.glEGLImageTargetTexture2DOES(GL_TEXTURE_2D, m_blitEGLImage); - s_gl.glCopyTexImage2D(GL_TEXTURE_2D, 0, m_internalFormat, - 0, 0, m_width, m_height, 0); + s_gl.glCopyTexSubImage2D(GL_TEXTURE_2D, 0, 0, 0, 0, 0, + m_width, m_height); } |