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

compiler: use 4 instead ATOMIC_COUNTER_SIZE in glsl_types.h to avoid #include "mesa/main/config.h"

Browse Source 
Signed-off-by: Yonggang Luo <luoyonggang@gmail.com>
Reviewed-by: Faith Ekstrand <faith.ekstrand@collabora.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/24824>
This commit is contained in:
Yonggang Luo
2023-08-06 13:03:00 +08:00
committed by Marge Bot
parent 26a23a7c1f
commit 01ddb18427
2 changed files with 2 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/compiler/glsl/glsl_parser_extras.h
View File

@@ -32,6 +32,7 @@
#include <stdlib.h> #include <stdlib.h>
#include "glsl_symbol_table.h" #include "glsl_symbol_table.h"
#include "mesa/main/config.h"
#include "mesa/main/menums.h" /* for gl_api */ #include "mesa/main/menums.h" /* for gl_api */
/* THIS is a macro defined somewhere deep in the Windows MSVC header files. /* THIS is a macro defined somewhere deep in the Windows MSVC header files.

6
src/compiler/glsl_types.h
View File

@@ -36,10 +36,6 @@
#include "util/macros.h" #include "util/macros.h"
#include "util/simple_mtx.h" #include "util/simple_mtx.h"
#ifdef __cplusplus
#include "mesa/main/config.h"
#endif
struct glsl_type; struct glsl_type;
#ifdef __cplusplus #ifdef __cplusplus
@@ -1066,7 +1062,7 @@ public:
unsigned atomic_size() const unsigned atomic_size() const
{ {
if (is_atomic_uint()) if (is_atomic_uint())
return ATOMIC_COUNTER_SIZE; return 4; /* ATOMIC_COUNTER_SIZE */
else if (is_array()) else if (is_array())
return length * fields.array->atomic_size(); return length * fields.array->atomic_size();
else else