Avoid copy of PixelUnpackState in Texture::setImage.

The ternary operator determines that the common type is the value type, causing a copy of PixelUnpackState. If PixelUnpackState::pixelBuffer is non-null then there is an assertion failure in the destructor on any call to Texture::setImage. See:http://stackoverflow.com/a/30088030 BUG=angleproject:1149 Change-Id: I9654e65956339d6b6966ad65a98cf37ad4e00452 Reviewed-on: https://chromium-review.googlesource.com/297084Reviewed-by: Jamie Madill <jmadill@chromium.org> Reviewed-by: Corentin Wallez <cwallez@chromium.org> Tested-by: Geoff Lang <geofflang@chromium.org>

Avoid copy of PixelUnpackState in Texture::setImage.
f826e1a3 · Geoff Lang · be184c7d · f826e1a3
Commit f826e1a3 authored Sep 02, 2015 by Geoff Lang
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 2 deletions

Texture.cpp src/libANGLE/Texture.cpp +2 -2

No files found.
--- a/src/libANGLE/Texture.cpp
+++ b/src/libANGLE/Texture.cpp
@@ -211,8 +211,8 @@ Error Texture::setImage(Context *context,
        context->syncRendererState(context->getState().unpackStateBitMask());
    }

-    const PixelUnpackState &unpack =
-        context ? context->getState().getUnpackState() : PixelUnpackState();
+    const PixelUnpackState defaultUnpack;
+    const PixelUnpackState &unpack = context ? context->getState().getUnpackState() : defaultUnpack;
    Error error = mTexture->setImage(target, level, internalFormat, size, format, type, unpack, pixels);
    if (error.isError())
    {