[Mesa-dev] [PATCH 2/2] glsl: fix variadic macro for MSVC
Kenneth Graunke
kenneth at whitecape.org
Mon Sep 9 16:31:59 PDT 2013
On 09/09/2013 04:03 PM, Brian Paul wrote:
> MSVC doesn't accept the rest... syntax.
> ---
> src/glsl/builtin_functions.cpp | 4 ++--
> 1 file 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 *
I always forget about this. Sorry, Brian.
Both patches are:
Reviewed-by: Kenneth Graunke <kenneth at whitecape.org>
More information about the mesa-dev
mailing list