AlexIndustrial/mesa
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

glsl: Use the C99 variadic macro syntax.

Browse Source 
MSVC does not support the old GCC syntax.

See also
http://gcc.gnu.org/onlinedocs/gcc/Variadic-Macros.html
This commit is contained in:
José Fonseca
2013-06-27 07:41:36 +01:00
parent bcd6f3b23c
commit 15085b477b
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/glsl/builtin_types.cpp
+2 -2
View File
@@ -42,8 +42,8 @@
* convenience pointers (glsl_type::foo_type).
* @{
*/
#define DECL_TYPE(NAME, REST...) \
const glsl_type glsl_type::_##NAME##_type = glsl_type(REST, #NAME); \
#define DECL_TYPE(NAME, ...) \
const glsl_type glsl_type::_##NAME##_type = glsl_type(__VA_ARGS__, #NAME); \
const glsl_type *const glsl_type::NAME##_type = &glsl_type::_##NAME##_type;
#define STRUCT_TYPE(NAME) \
src/glsl/glsl_types.h
+2 -2
View File
@@ -158,7 +158,7 @@ struct glsl_type {
*/
/*@{*/
#undef DECL_TYPE
#define DECL_TYPE(NAME, REST...) \
#define DECL_TYPE(NAME, ...) \
static const glsl_type *const NAME##_type;
#undef STRUCT_TYPE
#define STRUCT_TYPE(NAME) \
@@ -534,7 +534,7 @@ private:
*/
/*@{*/
#undef DECL_TYPE
#define DECL_TYPE(NAME, REST...) static const glsl_type _##NAME##_type;
#define DECL_TYPE(NAME, ...) static const glsl_type _##NAME##_type;
#undef STRUCT_TYPE
#define STRUCT_TYPE(NAME) static const glsl_type _struct_##NAME##_type;
#include "builtin_type_macros.h"