summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTomaž Vajngerl <tomaz.vajngerl@collabora.co.uk>2016-05-10 20:01:29 +0900
committerTomaž Vajngerl <quikee@gmail.com>2016-05-10 11:03:50 +0000
commit0214aa8ce427905477602dbf1d55278c4959fcac (patch)
tree835fb72cf0608cba643e57d7800f87d42ed65366
parent3336a0ef240fe218a1ee3cc4d939a97317d69ebd (diff)
opengl: Check if texture is valid before asking for Id
Change-Id: I6482ca005df385d79bcd55f3b1db3559021ab371 Reviewed-on: https://gerrit.libreoffice.org/24835 Reviewed-by: Tomaž Vajngerl <quikee@gmail.com> Tested-by: Tomaž Vajngerl <quikee@gmail.com>
-rw-r--r--vcl/inc/opengl/AccumulatedTextures.hxx4
1 files changed, 2 insertions, 2 deletions
diff --git a/vcl/inc/opengl/AccumulatedTextures.hxx b/vcl/inc/opengl/AccumulatedTextures.hxx
index bc40c48f3ab0..882a69476db5 100644
--- a/vcl/inc/opengl/AccumulatedTextures.hxx
+++ b/vcl/inc/opengl/AccumulatedTextures.hxx
@@ -90,11 +90,11 @@ public:
bool insert(OpenGLTexture& rTexture, const SalColor& aColor, const SalTwoRect& r2Rect)
{
- GLuint nTextureId = rTexture.Id();
-
if (!rTexture)
return false;
+ GLuint nTextureId = rTexture.Id();
+
if (maEntries.find(nTextureId) == maEntries.end())
{
OpenGLTexture aWholeTexture(rTexture.GetWholeTexture());