diff options
| author | David Turner <digit@android.com> | 2014-05-21 10:01:31 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2014-05-21 10:01:31 +0000 |
| commit | f492ee5d0bbcedd3536ba691ba91b845f8be3779 (patch) | |
| tree | f8f2141c9d1de18f6bc0f28211095ff3477882ca /emulator/opengl/host/libs | |
| parent | b98201d37a287ef318efc087b719bb65fa3924f0 (diff) | |
| parent | 66ff42468f7dc836f73cc9507bdf8d6f21e17d7f (diff) | |
| download | sdk-f492ee5d0bbcedd3536ba691ba91b845f8be3779.zip sdk-f492ee5d0bbcedd3536ba691ba91b845f8be3779.tar.gz sdk-f492ee5d0bbcedd3536ba691ba91b845f8be3779.tar.bz2 | |
Merge "emulator/opengl: A few debugging, stability improvements to emugl" into idea133
Auto-merge: 66ff424
* commit '66ff42468f7dc836f73cc9507bdf8d6f21e17d7f':
emulator/opengl: A few debugging, stability improvements to emugl
Diffstat (limited to 'emulator/opengl/host/libs')
| -rw-r--r-- | emulator/opengl/host/libs/Translator/GLES_CM/GLEScmImp.cpp | 2 | ||||
| -rw-r--r-- | emulator/opengl/host/libs/libOpenglRender/ColorBuffer.cpp | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/emulator/opengl/host/libs/Translator/GLES_CM/GLEScmImp.cpp b/emulator/opengl/host/libs/Translator/GLES_CM/GLEScmImp.cpp index 3443f59..dd74750 100644 --- a/emulator/opengl/host/libs/Translator/GLES_CM/GLEScmImp.cpp +++ b/emulator/opengl/host/libs/Translator/GLES_CM/GLEScmImp.cpp @@ -2227,7 +2227,7 @@ void glDrawTexOES (T x, T y, T z, T width, T height) { int numClipPlanes; - GLint viewport[4]; + GLint viewport[4] = {}; z = (z>1 ? 1 : (z<0 ? 0 : z)); T vertices[4*3] = { diff --git a/emulator/opengl/host/libs/libOpenglRender/ColorBuffer.cpp b/emulator/opengl/host/libs/libOpenglRender/ColorBuffer.cpp index f4280e1..532ffe7 100644 --- a/emulator/opengl/host/libs/libOpenglRender/ColorBuffer.cpp +++ b/emulator/opengl/host/libs/libOpenglRender/ColorBuffer.cpp @@ -204,7 +204,7 @@ bool ColorBuffer::blitFromCurrentReadBuffer() // save current viewport and match it to the current // colorbuffer size // - GLint vport[4]; + GLint vport[4] = {}; s_gl.glGetIntegerv(GL_VIEWPORT, vport); s_gl.glViewport(0, 0, m_width, m_height); |