From c62a111e5ed1a678843cd87828759713b148555a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Branimir=20Karad=C5=BEi=C4=87?= Date: Mon, 1 Jan 2018 13:02:16 -0800 Subject: [PATCH] Fixed issue #1303. --- 3rdparty/dxsdk/include/PIXEventsGenerated.h | 2 +- 3rdparty/dxsdk/include/pix3_win.h | 2 +- src/renderer_d3d12.cpp | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/3rdparty/dxsdk/include/PIXEventsGenerated.h b/3rdparty/dxsdk/include/PIXEventsGenerated.h index e9fab2b63..e963c4855 100644 --- a/3rdparty/dxsdk/include/PIXEventsGenerated.h +++ b/3rdparty/dxsdk/include/PIXEventsGenerated.h @@ -5,7 +5,7 @@ #define _PIXEventsGenerated_H_ #ifndef _PIX3_H_ -#error Don't include this file directly - use pix3.h +#error "Don't include this file directly - use pix3.h" #endif #include "PIXEventsCommon.h" diff --git a/3rdparty/dxsdk/include/pix3_win.h b/3rdparty/dxsdk/include/pix3_win.h index b3d4d4cb0..2b3dcd5b9 100644 --- a/3rdparty/dxsdk/include/pix3_win.h +++ b/3rdparty/dxsdk/include/pix3_win.h @@ -11,7 +11,7 @@ #pragma once #ifndef _PIX3_H_ -#error Don't include this file directly - use pix3.h +#error "Don't include this file directly - use pix3.h" #endif #ifndef _PIX3_WIN_H_ diff --git a/src/renderer_d3d12.cpp b/src/renderer_d3d12.cpp index 7d9276ff8..84fc445c7 100644 --- a/src/renderer_d3d12.cpp +++ b/src/renderer_d3d12.cpp @@ -577,11 +577,11 @@ namespace bgfx { namespace d3d12 } #if BGFX_CONFIG_DEBUG_PIX && BX_PLATFORM_WINDOWS - static PIXEventsThreadInfo temp; + static PIXEventsThreadInfo s_pixEventsThreadInfo; PIXEventsThreadInfo* WINAPI stubPIXGetThreadInfo() { - return &temp; + return &s_pixEventsThreadInfo; } uint64_t WINAPI stubPIXEventsReplaceBlock(bool _getEarliestTime)