summaryrefslogtreecommitdiffstats
path: root/src/compiler/nir/glsl_to_nir.cpp
diff options
context:
space:
mode:
authorJose Fonseca <[email protected]>2016-05-09 14:35:58 -0700
committerJose Fonseca <[email protected]>2016-05-10 03:29:24 -0700
commit94e8653a3bb9044847451b8a202da07d51adcc3a (patch)
tree18a5a603f282a92e86fecdcd3fd5365bda19b27f /src/compiler/nir/glsl_to_nir.cpp
parent4c9006f95796e67cf2cac98795627c31b15b0371 (diff)
Revert "nir: Try to warn when C99 extensions are used in nir headers."
This reverts commit 99474dc29b0f45413d0e538d7321da9ad4c9f6f5. -Wpedantic is too verbose, even when applied to just a few includes. We'll just have to deal with the issues as they come. Reviewed-by: Brian Paul <[email protected]>
Diffstat (limited to 'src/compiler/nir/glsl_to_nir.cpp')
-rw-r--r--src/compiler/nir/glsl_to_nir.cpp23
1 files changed, 1 insertions, 22 deletions
diff --git a/src/compiler/nir/glsl_to_nir.cpp b/src/compiler/nir/glsl_to_nir.cpp
index c8954ceeeb1..e3fa623ba04 100644
--- a/src/compiler/nir/glsl_to_nir.cpp
+++ b/src/compiler/nir/glsl_to_nir.cpp
@@ -25,30 +25,9 @@
*
*/
-#include "nir.h"
-
-/*
- * Have GCC/Clang warn when NIR headers use C99 extensions that are not
- * supported in C++, as they are not portable. In particular MSVC does not
- * support C99 structure field initializers.
- */
-#if defined(__GNUC__)
-# pragma GCC diagnostic push
-# if defined(__clang__)
-# pragma GCC diagnostic warning "-Wc99-extensions"
-# else
-# pragma GCC diagnostic warning "-Wpedantic"
-# endif
-#endif
-
+#include "glsl_to_nir.h"
#include "nir_control_flow.h"
#include "nir_builder.h"
-
-#if defined(__GNUC__)
-# pragma GCC diagnostic pop
-#endif
-
-#include "glsl_to_nir.h"
#include "compiler/glsl/ir_visitor.h"
#include "compiler/glsl/ir_hierarchical_visitor.h"
#include "compiler/glsl/ir.h"