Mesa (master): mesa: Move gl_frag_depth_layout from mtypes.h to shader_enums.h

[Jason Ekstrand]

Module: Mesa
Branch: master
Commit: 16619477bc800d32b5bf2f38dd544960cf66c284
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=16619477bc800d32b5bf2f38dd544960cf66c284

Author: Jason Ekstrand <jason.ekstrand at intel.com>
Date:   Thu Oct  8 15:59:56 2015 -0700

mesa: Move gl_frag_depth_layout from mtypes.h to shader_enums.h

Reviewed-by: Topi Pohjolainen <topi.pohjolainen at intel.com>

---

 src/glsl/nir/shader_enums.h |   17 +++++++++++++++++
 src/mesa/main/mtypes.h      |   18 ------------------
 2 files changed, 17 insertions(+), 18 deletions(-)

diff --git a/src/glsl/nir/shader_enums.h b/src/glsl/nir/shader_enums.h
index 77638ba..d1cf7ca 100644
--- a/src/glsl/nir/shader_enums.h
+++ b/src/glsl/nir/shader_enums.h
@@ -480,4 +480,21 @@ const char * gl_frag_result_name(gl_frag_result result);
 
 #define FRAG_RESULT_MAX		(FRAG_RESULT_DATA0 + MAX_DRAW_BUFFERS)
 
+/**
+ * \brief Layout qualifiers for gl_FragDepth.
+ *
+ * Extension AMD_conservative_depth allows gl_FragDepth to be redeclared with
+ * a layout qualifier.
+ *
+ * \see enum ir_depth_layout
+ */
+enum gl_frag_depth_layout
+{
+   FRAG_DEPTH_LAYOUT_NONE, /**< No layout is specified. */
+   FRAG_DEPTH_LAYOUT_ANY,
+   FRAG_DEPTH_LAYOUT_GREATER,
+   FRAG_DEPTH_LAYOUT_LESS,
+   FRAG_DEPTH_LAYOUT_UNCHANGED
+};
+
 #endif /* SHADER_ENUMS_H */
diff --git a/src/mesa/main/mtypes.h b/src/mesa/main/mtypes.h
index e9d8ea4..9ca6dea 100644
--- a/src/mesa/main/mtypes.h
+++ b/src/mesa/main/mtypes.h
@@ -1859,24 +1859,6 @@ typedef enum
 
 
 /**
- * \brief Layout qualifiers for gl_FragDepth.
- *
- * Extension AMD_conservative_depth allows gl_FragDepth to be redeclared with
- * a layout qualifier.
- *
- * \see enum ir_depth_layout
- */
-enum gl_frag_depth_layout
-{
-   FRAG_DEPTH_LAYOUT_NONE, /**< No layout is specified. */
-   FRAG_DEPTH_LAYOUT_ANY,
-   FRAG_DEPTH_LAYOUT_GREATER,
-   FRAG_DEPTH_LAYOUT_LESS,
-   FRAG_DEPTH_LAYOUT_UNCHANGED
-};
-
-
-/**
  * Base class for any kind of program object
  */
 struct gl_program