projects
/
mesa.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
053778c
)
glsl/types: Expose the function_param and struct_field structs to C
author
Jason Ekstrand
<jason.ekstrand@intel.com>
Wed, 29 Apr 2015 21:48:12 +0000
(14:48 -0700)
committer
Jason Ekstrand
<jason.ekstrand@intel.com>
Sat, 16 May 2015 18:16:32 +0000
(11:16 -0700)
Previously, they were hidden behind a #ifdef __cplusplus so C wouldn't find
them. This commit simpliy moves the ifdef.
src/glsl/glsl_types.h
patch
|
blob
|
history
diff --git
a/src/glsl/glsl_types.h
b/src/glsl/glsl_types.h
index 4d726c6bcf9e45730788aa7fb28b5c99f9c39bcb..2d4718572afd498dd1fdad9404baee0617894147 100644
(file)
--- a/
src/glsl/glsl_types.h
+++ b/
src/glsl/glsl_types.h
@@
-742,6
+742,10
@@
private:
/*@}*/
};
+#undef DECL_TYPE
+#undef STRUCT_TYPE
+#endif /* __cplusplus */
+
struct glsl_struct_field {
const struct glsl_type *type;
const char *name;
@@
-798,8
+802,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 */