OpenHarmony/third_party_mesa3d
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

glsl: Use DETECT_CC_GCC_VERSION in glsl/builtin_functions.cpp

Browse Source 
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 <luoyonggang@gmail.com>
Reviewed-by: Erik Faye-Lund <erik.faye-lund@collabora.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/19771>
This commit is contained in:
Yonggang Luo
2022-11-13 10:41:59 +08:00
committed by Marge Bot
parent 71a0a386b5
commit ad0d39efed
1 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/compiler/glsl/builtin_functions.cpp
View File

@@ -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 * 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" #warning "disabling optimizations for this file to work around compiler bug"
#pragma GCC optimize("O1") #pragma GCC optimize("O1")
#endif #endif