mirror of
https://github.com/baldurk/renderdoc.git
synced 2026-05-04 09:00:44 +00:00
Fix incompatibilities with Nsight PerfSDK OpenGL and Vulkan headers
This commit is contained in:
committed by
Baldur Karlsson
parent
cefbc9dcf4
commit
868e690e9c
+3
-3
@@ -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;
|
||||
|
||||
+1
-1
@@ -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"
|
||||
|
||||
Reference in New Issue
Block a user