From: Jason Ekstrand <jason.ekstrand@intel.com>
Date: Sat, 16 May 2015 05:17:05 +0000 (-0700)
Subject: vk/glsl_helpers: Fix GLSL_VK_SHADER with respect to commas
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=eb1952592ebd72c0be70b0ddf781021bbadb3692;p=mesa.git

vk/glsl_helpers: Fix GLSL_VK_SHADER with respect to commas

Previously, the GLSL_VK_SHADER macro didn't work if the shader contained
commas outside of parentheses due to the way the C preprocessor works.
This commit fixes this by making it variadic again and doing it correctly
this time.
---

diff --git a/src/vulkan/glsl_helpers.h b/src/vulkan/glsl_helpers.h
index 76b0cbebcf4..3c72523586f 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, source) ({                        \
+#define GLSL_VK_SHADER(device, stage, ...) ({                           \
    VkShader __shader;                                                   \
-   const char __src[] = "#version 330\n" #source;                       \
+   const char __src[] = "#version 330\n" #__VA_ARGS__;                  \
    VkShaderCreateInfo __shader_create_info = {                          \
       .sType = VK_STRUCTURE_TYPE_SHADER_CREATE_INFO,                    \
       .codeSize = sizeof(__src),                                        \