From 3ff437ddbe2c865ee5d45f9e2a9362dcddbc13ec Mon Sep 17 00:00:00 2001
From: Philip Rebohle <philip.rebohle@tu-dortmund.de>
Date: Wed, 11 Apr 2018 00:26:42 +0200
Subject: [PATCH] [dxbc] Re-enable Nvidia workarounds if __GL_NextGenCompiler
 is '0'

Fixes potential regressions when using the old SPIR-V compiler.
---
 src/dxbc/dxbc_options.cpp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/dxbc/dxbc_options.cpp b/src/dxbc/dxbc_options.cpp
index a7c208ee..c66596cd 100644
--- a/src/dxbc/dxbc_options.cpp
+++ b/src/dxbc/dxbc_options.cpp
@@ -10,7 +10,8 @@ namespace dxvk {
     const DxvkGpuVendor vendor = static_cast<DxvkGpuVendor>(devProps.vendorID);
     
     if (vendor == DxvkGpuVendor::Nvidia
-     && devProps.driverVersion <= VK_MAKE_VERSION(396, 18, 0)) {
+     && (devProps.driverVersion < VK_MAKE_VERSION(396, 18, 0)
+      || getEnvVar(L"__GL_NextGenCompiler") != "0")) {
       // Older versions of the driver expect the
       // coordinate vector to have an extra component
       this->addExtraDrefCoordComponent = true;