and bonus points for adding a gl_frag_depth_layout_name() ;-)
On Fri, Oct 9, 2015 at 5:04 AM, Michael Schellenberger Costa <mschellenbergerco...@googlemail.com> wrote: > Hi, > > as this conflicts directly with Robs patch > http://lists.freedesktop.org/archives/mesa-dev/2015-October/096670.html > you might want to update it > > Michael > > Am 09.10.2015 um 02:22 schrieb Jason Ekstrand: >> --- src/glsl/shader_enums.h | 17 +++++++++++++++++ >> src/mesa/main/mtypes.h | 18 ------------------ 2 files changed, 17 >> insertions(+), 18 deletions(-) >> >> diff --git a/src/glsl/shader_enums.h b/src/glsl/shader_enums.h >> index 2a5d2c5..1c2f5dc 100644 --- a/src/glsl/shader_enums.h +++ >> b/src/glsl/shader_enums.h @@ -473,4 +473,21 @@ typedef enum >> >> const char * gl_frag_result_name(gl_frag_result result); >> >> +/** + * \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 288d757..6a2f323 100644 --- >> a/src/mesa/main/mtypes.h +++ b/src/mesa/main/mtypes.h @@ -1866,24 >> +1866,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 >> > > _______________________________________________ > mesa-dev mailing list > mesa-dev@lists.freedesktop.org > http://lists.freedesktop.org/mailman/listinfo/mesa-dev _______________________________________________ mesa-dev mailing list mesa-dev@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/mesa-dev
