From a8b4e690cfcb9fe805f76e14c834f3a8338b29cd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marek=20Ol=C5=A1=C3=A1k?= <marek.olsak@amd.com>
Date: Fri, 25 Sep 2020 21:06:16 -0400
Subject: [PATCH] driconf: force the vendor string to NVIDIA to fix viewperf
 energy tests

Reviewed-by: Pierre-Eric Pelloux-Prayer <pierre-eric.pelloux-prayer@amd.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/7031>
---
 src/util/00-mesa-defaults.conf | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/util/00-mesa-defaults.conf b/src/util/00-mesa-defaults.conf
index 2cd9233411d..8fec2089dda 100644
--- a/src/util/00-mesa-defaults.conf
+++ b/src/util/00-mesa-defaults.conf
@@ -287,6 +287,10 @@ TODO: document the other workarounds.
             <option name="allow_glsl_extension_directive_midshader" value="true" />
             <option name="allow_glsl_120_subset_in_110" value="true" />
             <option name="force_gl_names_reuse" value="true" />
+            <!-- This makes it use GL_NVX_gpu_memory_info to query memory info
+                 instead of non-existent GLX_AMD_gpu_association. Yes, it checks
+                 the vendor string, not the extension list. -->
+            <option name="force_gl_vendor" value="NVIDIA Corporation" />
         </application>
 
         <!-- The GL thread allowlist is below, workarounds are above.