diff options
| author | marha <marha@users.sourceforge.net> | 2011-11-09 17:05:56 +0100 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2011-11-09 17:05:56 +0100 |
| commit | 72d7f8d5af476f12dc75eab4fa9d59364cbec190 (patch) | |
| tree | 1efac13a52811bfd28ae51538b15f87cbfaf8939 /mesalib/src/glsl/glsl_types.h | |
| parent | a3d796bcc7de83fd88b42e09c6a82a8df4f9b836 (diff) | |
| parent | a8e5f06fe01732fbd643bc435dd3b8eaa602defe (diff) | |
| download | vcxsrv-72d7f8d5af476f12dc75eab4fa9d59364cbec190.tar.gz vcxsrv-72d7f8d5af476f12dc75eab4fa9d59364cbec190.tar.bz2 vcxsrv-72d7f8d5af476f12dc75eab4fa9d59364cbec190.zip | |
Merge remote-tracking branch 'origin/released'
Conflicts:
mesalib/src/mapi/glapi/glapi.h
Diffstat (limited to 'mesalib/src/glsl/glsl_types.h')
| -rw-r--r-- | mesalib/src/glsl/glsl_types.h | 19 |
1 files changed, 13 insertions, 6 deletions
diff --git a/mesalib/src/glsl/glsl_types.h b/mesalib/src/glsl/glsl_types.h index 56b8efe7b..4ac90118b 100644 --- a/mesalib/src/glsl/glsl_types.h +++ b/mesalib/src/glsl/glsl_types.h @@ -29,21 +29,23 @@ #include <string.h> #include <assert.h> +#ifdef __cplusplus extern "C" { -#include "GL/gl.h" -} - -#include "ralloc.h" +#endif struct _mesa_glsl_parse_state; struct glsl_symbol_table; -extern "C" void +extern void _mesa_glsl_initialize_types(struct _mesa_glsl_parse_state *state); -extern "C" void +extern void _mesa_glsl_release_types(void); +#ifdef __cplusplus +} +#endif + enum glsl_base_type { GLSL_TYPE_UINT = 0, GLSL_TYPE_INT, @@ -66,6 +68,9 @@ enum glsl_sampler_dim { GLSL_SAMPLER_DIM_EXTERNAL }; +#ifdef __cplusplus +#include "GL/gl.h" +#include "ralloc.h" struct glsl_type { GLenum gl_type; @@ -530,4 +535,6 @@ struct glsl_struct_field { const char *name; }; +#endif /* __cplusplus */ + #endif /* GLSL_TYPES_H */ |