From: Kristian Høgsberg <kristian.h.kristensen@intel.com>
Date: Fri, 15 May 2015 23:15:04 +0000 (-0700)
Subject: vk: Fix GLSL_VK_SHADER macro
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=0cfc49377589081b495d4b3c112e341c9371637b;p=mesa.git

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.
---

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),                                        \