Browse Source

Fixed issue #1303.

Branimir Karadžić 8 years ago
parent
commit
c62a111e5e

+ 1 - 1
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"

+ 1 - 1
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_

+ 2 - 2
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)