diff options
| author | Miguel Costa <miguel.costa@qt.io> | 2018-06-26 16:56:45 +0200 |
|---|---|---|
| committer | Andre de la Rocha <andre.rocha@qt.io> | 2018-10-13 21:36:35 +0000 |
| commit | 0a7aebadfbb3534284546aa3ca8612314c08f136 (patch) | |
| tree | e94ee33ae3bb9b96fc3047c6455d47ac4920bfbf /src/3rdparty/angle/src/libANGLE/Error.inl | |
| parent | 656e89f875ad2008ca16cc673b687a22daa294c9 (diff) | |
Update ANGLE to chromium/3280
Change-Id: I0802c0d7486f772d361f87a544d6c5af937f4ca1
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
Diffstat (limited to 'src/3rdparty/angle/src/libANGLE/Error.inl')
| -rw-r--r-- | src/3rdparty/angle/src/libANGLE/Error.inl | 32 |
1 files changed, 31 insertions, 1 deletions
diff --git a/src/3rdparty/angle/src/libANGLE/Error.inl b/src/3rdparty/angle/src/libANGLE/Error.inl index 900fc5fd03..4632830ce0 100644 --- a/src/3rdparty/angle/src/libANGLE/Error.inl +++ b/src/3rdparty/angle/src/libANGLE/Error.inl @@ -37,6 +37,21 @@ Error::Error(Error &&other) { } +// automatic error type conversion +Error::Error(egl::Error &&eglErr) + : mCode(GL_INVALID_OPERATION), + mID(0), + mMessage(std::move(eglErr.mMessage)) +{ +} + +Error::Error(egl::Error eglErr) + : mCode(GL_INVALID_OPERATION), + mID(0), + mMessage(std::move(eglErr.mMessage)) +{ +} + Error &Error::operator=(const Error &other) { mCode = other.mCode; @@ -82,7 +97,7 @@ bool Error::isError() const return (mCode != GL_NO_ERROR); } -} +} // namespace gl namespace egl { @@ -111,6 +126,21 @@ Error::Error(Error &&other) { } +// automatic error type conversion +Error::Error(gl::Error &&glErr) + : mCode(EGL_BAD_ACCESS), + mID(0), + mMessage(std::move(glErr.mMessage)) +{ +} + +Error::Error(gl::Error glErr) + : mCode(EGL_BAD_ACCESS), + mID(0), + mMessage(std::move(glErr.mMessage)) +{ +} + Error &Error::operator=(const Error &other) { mCode = other.mCode; |