mirror of
https://gitlab.freedesktop.org/mesa/mesa.git
synced 2026-03-12 13:20:33 +01:00
clc: reorder headers to fix compilation errors due to UNUSED
Cc: mesa-stable
Acked-by: Alyssa Rosenzweig <alyssa.rosenzweig@intel.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/39374>
(cherry picked from commit 7f9a7ed553)
This commit is contained in:
parent
4a3a3a7d84
commit
c6f8d2ef92
2 changed files with 7 additions and 3 deletions
|
|
@ -1824,7 +1824,7 @@
|
|||
"description": "clc: reorder headers to fix compilation errors due to UNUSED",
|
||||
"nominated": true,
|
||||
"nomination_type": 1,
|
||||
"resolution": 0,
|
||||
"resolution": 1,
|
||||
"main_sha": null,
|
||||
"because_sha": null,
|
||||
"notes": null
|
||||
|
|
|
|||
|
|
@ -28,8 +28,6 @@
|
|||
#include <sstream>
|
||||
#include <mutex>
|
||||
|
||||
#include "util/ralloc.h"
|
||||
#include "util/set.h"
|
||||
#include <llvm/ADT/ArrayRef.h>
|
||||
#include <llvm/IR/DiagnosticPrinter.h>
|
||||
#include <llvm/IR/DiagnosticInfo.h>
|
||||
|
|
@ -68,7 +66,13 @@
|
|||
#include <llvm/Support/VirtualFileSystem.h>
|
||||
#endif
|
||||
|
||||
/* We have to include our own headers after LLVM/clang as they seem to use
|
||||
* `UNUSED` within enum definitions:
|
||||
* https://github.com/llvm/llvm-project/blob/ea443eeb2ab8ed49ffb783c2025fed6629a36f10/clang/include/clang/Basic/OffloadArch.h#L19
|
||||
*/
|
||||
#include "util/macros.h"
|
||||
#include "util/ralloc.h"
|
||||
#include "util/set.h"
|
||||
#include "util/u_dl.h"
|
||||
#include "glsl_types.h"
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue