From 1db2947c86a1d04de5a59ee8d9f20aae572b40c8 Mon Sep 17 00:00:00 2001 From: baldurk Date: Wed, 15 Apr 2020 21:29:19 +0100 Subject: [PATCH] Drop constexpr to work around gcc 5 compiler bug --- renderdoc/maths/matrix.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/renderdoc/maths/matrix.h b/renderdoc/maths/matrix.h index 9a406303a..54902a503 100644 --- a/renderdoc/maths/matrix.h +++ b/renderdoc/maths/matrix.h @@ -82,7 +82,7 @@ private: Matrix4f(const float *d) { memcpy(f, d, sizeof(Matrix4f)); } friend class Quatf; - constexpr inline size_t matIdx(const size_t x, const size_t y) const { return x + y * 4; } + inline size_t matIdx(const size_t x, const size_t y) const { return x + y * 4; } float f[16]; }; @@ -99,7 +99,7 @@ public: const float *Data() const { return &f[0]; } void SetFrom(float data[9]) { memcpy(f, data, sizeof(Matrix3f)); } private: - constexpr inline size_t matIdx(const size_t x, const size_t y) const { return x + y * 3; } + inline size_t matIdx(const size_t x, const size_t y) const { return x + y * 3; } float f[9]; }; @@ -123,6 +123,6 @@ public: const float *Data() const { return &f[0]; } void SetFrom(float data[4]) { memcpy(f, data, sizeof(Matrix2f)); } private: - constexpr inline size_t matIdx(const size_t x, const size_t y) const { return x + y * 2; } + inline size_t matIdx(const size_t x, const size_t y) const { return x + y * 2; } float f[4]; };