Module: Mesa Branch: main Commit: ad0d39efed503b8144dd2db72f467dc22b508ab7 URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=ad0d39efed503b8144dd2db72f467dc22b508ab7
Author: Yonggang Luo <[email protected]> Date: Sun Nov 13 10:41:59 2022 +0800 glsl: Use DETECT_CC_GCC_VERSION in glsl/builtin_functions.cpp The expression "(__GNUC__ * 100) + __GNUC_MINOR" is invalid because __GNUC_MINOR is not defined by the compiler This can not fixes the previous version because DETECT_CC_GCC_VERSION is not available in previous released version Signed-off-by: Yonggang Luo <[email protected]> Reviewed-by: Erik Faye-Lund <[email protected]> Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/19771> --- src/compiler/glsl/builtin_functions.cpp | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/compiler/glsl/builtin_functions.cpp b/src/compiler/glsl/builtin_functions.cpp index 0fed4794527..e07ac611718 100644 --- a/src/compiler/glsl/builtin_functions.cpp +++ b/src/compiler/glsl/builtin_functions.cpp @@ -67,7 +67,9 @@ * MinGW 7.3.0 (in Ubuntu 18.04) does not have this bug. Assume versions before 7.3.x are buggy */ -#if defined(__MINGW32__) && ((__GNUC__ * 100) + __GNUC_MINOR < 703) +#include "util/detect_cc.h" + +#if defined(__MINGW32__) && (DETECT_CC_GCC_VERSION < 703) #warning "disabling optimizations for this file to work around compiler bug" #pragma GCC optimize("O1") #endif
