Mesa (master): glsl: fix variadic macro for MSVC
Brian Paul
brianp at kemper.freedesktop.org
Mon Sep 9 23:53:07 UTC 2013
Module: Mesa
Branch: master
Commit: 395b9410860371a64d6b5f2d50679f29eb41729e
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=395b9410860371a64d6b5f2d50679f29eb41729e
Author: Brian Paul <brianp at vmware.com>
Date: Mon Sep 9 17:02:52 2013 -0600
glsl: fix variadic macro for MSVC
MSVC doesn't accept the rest... syntax.
Reviewed-by: Kenneth Graunke <kenneth at whitecape.org>
---
src/glsl/builtin_functions.cpp | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/glsl/builtin_functions.cpp b/src/glsl/builtin_functions.cpp
index eca41aa..5d8f171 100644
--- a/src/glsl/builtin_functions.cpp
+++ b/src/glsl/builtin_functions.cpp
@@ -1935,9 +1935,9 @@ builtin_builder::new_sig(const glsl_type *return_type,
return sig;
}
-#define MAKE_SIG(return_type, avail, rest...) \
+#define MAKE_SIG(return_type, avail, ...) \
ir_function_signature *sig = \
- new_sig(return_type, avail, rest); \
+ new_sig(return_type, avail, __VA_ARGS__); \
ir_factory body(&sig->body, mem_ctx);
ir_function_signature *
More information about the mesa-commit
mailing list