From 0cfc49377589081b495d4b3c112e341c9371637b Mon Sep 17 00:00:00 2001 From: =?utf8?q?Kristian=20H=C3=B8gsberg?= Date: Fri, 15 May 2015 16:15:04 -0700 Subject: [PATCH] vk: Fix GLSL_VK_SHADER macro Stringify doesn't work with __ARGV__. The last macro argument swallows up excess arguments and as such we can just stringify that. --- src/vulkan/glsl_helpers.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/vulkan/glsl_helpers.h b/src/vulkan/glsl_helpers.h index 5288be56a20..76b0cbebcf4 100644 --- a/src/vulkan/glsl_helpers.h +++ b/src/vulkan/glsl_helpers.h @@ -23,9 +23,9 @@ #pragma once -#define GLSL_VK_SHADER(device, stage, ...) ({ \ +#define GLSL_VK_SHADER(device, stage, source) ({ \ VkShader __shader; \ - const char __src[] = "#version 330\n" STRINGIFY((__ARGV__)); \ + const char __src[] = "#version 330\n" #source; \ VkShaderCreateInfo __shader_create_info = { \ .sType = VK_STRUCTURE_TYPE_SHADER_CREATE_INFO, \ .codeSize = sizeof(__src), \ -- 2.30.2