diff options
| author | Oliver Wolff <oliver.wolff@qt.io> | 2017-06-07 10:07:43 +0200 |
|---|---|---|
| committer | Oliver Wolff <oliver.wolff@qt.io> | 2017-06-13 06:55:27 +0000 |
| commit | 3e1a7251b4c1878b7be79ab2ea6eed3421d16a9d (patch) | |
| tree | ae707c9808ba1d6f67adeab438bcc301981f8fc2 /src/3rdparty/angle/src/libANGLE/formatutils.h | |
| parent | 9a73b7ac96453963693d69ebd71691636d90a154 (diff) | |
ANGLE: Fix crash with ltcg on Visual Studio 2015 Update 3
Release builds of applications that used Qt configured with "link time
code generation" crashed (memory access violation), when calling
GetInternalFormatInfo in Context::initCaps.
It looks like this is a compiler problem that can be avoided by not
using a reference for the return value.
Task-number: QTBUG-55718
Change-Id: Ic1fb95d7b518a49859f41c819e860864387a8d3c
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
Diffstat (limited to 'src/3rdparty/angle/src/libANGLE/formatutils.h')
| -rw-r--r-- | src/3rdparty/angle/src/libANGLE/formatutils.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/3rdparty/angle/src/libANGLE/formatutils.h b/src/3rdparty/angle/src/libANGLE/formatutils.h index 6863e4ddc4..2165e6badd 100644 --- a/src/3rdparty/angle/src/libANGLE/formatutils.h +++ b/src/3rdparty/angle/src/libANGLE/formatutils.h @@ -79,7 +79,7 @@ struct InternalFormat GLint skipRows, GLint skipPixels) const; }; -const InternalFormat &GetInternalFormatInfo(GLenum internalFormat); +const InternalFormat GetInternalFormatInfo(GLenum internalFormat); GLenum GetSizedInternalFormat(GLenum internalFormat, GLenum type); |