diff options
author | Michael Meeks <michael.meeks@collabora.com> | 2017-10-18 15:24:44 +0100 |
---|---|---|
committer | Aron Budea <aron.budea@collabora.com> | 2017-11-02 23:03:25 +0100 |
commit | a674d73119d4caa5f08a1a2798e2417dee859ed1 (patch) | |
tree | 4d4ab4bee103caf1249a3423d0d32336605484dc | |
parent | 2c5875485dd53c9e6d509ffa474212fadb8cefed (diff) |
tdf#113225 - reset framebuffer count when resetting OpenGLContext
Otherwise we can fail to allocate a new one when we need it post reset.
http://crashreport.libreoffice.org/stats/crash_details/e4f26191-15d5-441a-868f-9ada21ef4424
Change-Id: Icc5ec6c51338e18a0a1bc890f56670e8fe9c73ea
Reviewed-on: https://gerrit.libreoffice.org/43508
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Michael Meeks <michael.meeks@collabora.com>
(cherry picked from commit 856d734ee1665b6aa7304847c3a923af09066016)
Reviewed-on: https://gerrit.libreoffice.org/43550
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
(cherry picked from commit 2e19422859f685ccd391b89467d8c88a46311222)
Reviewed-on: https://gerrit.libreoffice.org/44067
Reviewed-by: Christian Lohmaier <lohmaier+LibreOffice@googlemail.com>
Reviewed-by: Aron Budea <aron.budea@collabora.com>
Tested-by: Aron Budea <aron.budea@collabora.com>
-rw-r--r-- | vcl/source/opengl/OpenGLContext.cxx | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/vcl/source/opengl/OpenGLContext.cxx b/vcl/source/opengl/OpenGLContext.cxx index 7f856e0d7ca3..bae5069055e4 100644 --- a/vcl/source/opengl/OpenGLContext.cxx +++ b/vcl/source/opengl/OpenGLContext.cxx @@ -412,6 +412,7 @@ void OpenGLContext::reset() delete pFramebuffer; pFramebuffer = pPrevFramebuffer; } + mnFramebufferCount = 0; mpFirstFramebuffer = nullptr; mpLastFramebuffer = nullptr; } |