Module: Mesa Branch: master Commit: b9e94ad8060348faf40ba30722148b5c7e865a1c URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=b9e94ad8060348faf40ba30722148b5c7e865a1c
Author: Jason Ekstrand <[email protected]> Date: Tue Feb 9 18:24:37 2016 -0800 glsl/types: Expose glsl_struct_field and glsl_function_param to C Reviewed-by: Jordan Justen <[email protected]> --- src/compiler/glsl_types.h | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/src/compiler/glsl_types.h b/src/compiler/glsl_types.h index b0ef031..2f612d8 100644 --- a/src/compiler/glsl_types.h +++ b/src/compiler/glsl_types.h @@ -820,6 +820,10 @@ private: /*@}*/ }; +#undef DECL_TYPE +#undef STRUCT_TYPE +#endif /* __cplusplus */ + struct glsl_struct_field { const struct glsl_type *type; const char *name; @@ -877,6 +881,7 @@ struct glsl_struct_field { unsigned image_volatile:1; unsigned image_restrict:1; +#ifdef __cplusplus glsl_struct_field(const struct glsl_type *_type, const char *_name) : type(_type), name(_name), location(-1), interpolation(0), centroid(0), sample(0), matrix_layout(GLSL_MATRIX_LAYOUT_INHERITED), patch(0), @@ -890,6 +895,7 @@ struct glsl_struct_field { { /* empty */ } +#endif }; struct glsl_function_param { @@ -905,8 +911,4 @@ glsl_align(unsigned int a, unsigned int align) return (a + align - 1) / align * align; } -#undef DECL_TYPE -#undef STRUCT_TYPE -#endif /* __cplusplus */ - #endif /* GLSL_TYPES_H */ _______________________________________________ mesa-commit mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/mesa-commit
