From 868e690e9ccfa722dd7d4188d07bc0587ec86087 Mon Sep 17 00:00:00 2001
From: Jonathan Glines <jglines@nvidia.com>
Date: Mon, 2 Jun 2025 12:32:53 -0700
Subject: [PATCH] Fix incompatibilities with Nsight PerfSDK OpenGL and Vulkan
 headers

---
 .../PerfSDK/redist/NvPerfUtility/include/NvPerfOpenGL.h     | 6 +++---
 .../PerfSDK/redist/NvPerfUtility/include/NvPerfVulkan.h     | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/renderdoc/driver/ihv/nv/official/PerfSDK/redist/NvPerfUtility/include/NvPerfOpenGL.h b/renderdoc/driver/ihv/nv/official/PerfSDK/redist/NvPerfUtility/include/NvPerfOpenGL.h
index e99e75b3d..39140ba84 100644
--- a/renderdoc/driver/ihv/nv/official/PerfSDK/redist/NvPerfUtility/include/NvPerfOpenGL.h
+++ b/renderdoc/driver/ihv/nv/official/PerfSDK/redist/NvPerfUtility/include/NvPerfOpenGL.h
@@ -20,7 +20,7 @@
 #include "NvPerfDeviceProperties.h"
 #include "nvperf_opengl_host.h"
 #include "nvperf_opengl_target.h"
-#include "GL/gl.h"
+//#include "GL/gl.h"
 #include <string.h>
 namespace nv { namespace perf {
 
@@ -28,7 +28,7 @@ namespace nv { namespace perf {
     //
     inline std::string OpenGLGetDeviceName()
     {
-        const GLubyte* pRenderer = glGetString(GL_RENDERER);
+        const GLubyte* pRenderer = glGetString(eGL_RENDERER);
         if (!pRenderer)
         {
             return "";
@@ -39,7 +39,7 @@ namespace nv { namespace perf {
 
     inline bool OpenGLIsNvidiaDevice()
     {
-        const GLubyte* pVendor = glGetString(GL_VENDOR);
+        const GLubyte* pVendor = glGetString(eGL_VENDOR);
         if (!pVendor)
         {
             return false;
diff --git a/renderdoc/driver/ihv/nv/official/PerfSDK/redist/NvPerfUtility/include/NvPerfVulkan.h b/renderdoc/driver/ihv/nv/official/PerfSDK/redist/NvPerfUtility/include/NvPerfVulkan.h
index f4a9e4581..47b4c2d00 100644
--- a/renderdoc/driver/ihv/nv/official/PerfSDK/redist/NvPerfUtility/include/NvPerfVulkan.h
+++ b/renderdoc/driver/ihv/nv/official/PerfSDK/redist/NvPerfUtility/include/NvPerfVulkan.h
@@ -16,7 +16,7 @@
 
 #pragma once
 
-#include <vulkan/vulkan.h>
+#include "driver/vulkan/official/vulkan_core.h"
 #include "NvPerfInit.h"
 #include "NvPerfDeviceProperties.h"
 #include "NvPerfPeriodicSamplerGpu.h"