[PATCH] kernel32: Treat Vulkan environment variables as special variables.

[Józef Kucia]

We do not want to inherit Vulkan environment variables from the Unix
environment, e.g. VK_ICD_FILENAMES confuses Windows Vulkan loader.

Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com>
---
 dlls/kernel32/process.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/dlls/kernel32/process.c b/dlls/kernel32/process.c
index 0a3fd70b3862..b883087fd7a1 100644
--- a/dlls/kernel32/process.c
+++ b/dlls/kernel32/process.c
@@ -136,7 +136,8 @@ static inline BOOL is_special_env_var( const char *var )
             !strncmp( var, "HOME=", sizeof("HOME=")-1 ) ||
             !strncmp( var, "TEMP=", sizeof("TEMP=")-1 ) ||
             !strncmp( var, "TMP=", sizeof("TMP=")-1 ) ||
-            !strncmp( var, "QT_", sizeof("QT_")-1 ));
+            !strncmp( var, "QT_", sizeof("QT_")-1 ) ||
+            !strncmp( var, "VK_", sizeof("VK_")-1 ));
 }
 
 
-- 
2.16.1

[Henri Verbeet]

On 1 March 2018 at 19:34, Józef Kucia <jkucia(a)codeweavers.com> wrote:
> We do not want to inherit Vulkan environment variables from the Unix
> environment, e.g. VK_ICD_FILENAMES confuses Windows Vulkan loader.

What about e.g. VK_INSTANCE_LAYERS?

[Józef Kucia]

On Fri, Mar 2, 2018 at 8:32 AM, Henri Verbeet <hverbeet(a)gmail.com> wrote:
> On 1 March 2018 at 19:34, Józef Kucia <jkucia(a)codeweavers.com> wrote:
> > We do not want to inherit Vulkan environment variables from the Unix
> > environment, e.g. VK_ICD_FILENAMES confuses Windows Vulkan loader.
>
> What about e.g. VK_INSTANCE_LAYERS?

I think we don't want to inherit VK_INSTANCE_LAYERS to Win32
environment. It could potentially lead to loading Vulkan validation
layers twice. VK_INSTANCE_LAYERS should work just fine with Linux
Vulkan loader with the patch.