Patch pix3.h for Windows on ARM
This commit is contained in:
@@ -2,6 +2,20 @@
|
|||||||
|
|
||||||
#if GRAPHICS_API_DIRECTX12
|
#if GRAPHICS_API_DIRECTX12
|
||||||
|
|
||||||
|
#include "Engine/Graphics/Config.h"
|
||||||
|
#if USE_PIX && GPU_ALLOW_PROFILE_EVENTS
|
||||||
|
// Include these header files before pix3
|
||||||
|
#define WIN32_LEAN_AND_MEAN
|
||||||
|
#define NOMINMAX
|
||||||
|
#define NOGDI
|
||||||
|
#define NODRAWTEXT
|
||||||
|
//#define NOCTLMGR
|
||||||
|
#define NOFLATSBAPIS
|
||||||
|
#include <Windows.h>
|
||||||
|
#include <d3d12.h>
|
||||||
|
#include <ThirdParty/WinPixEventRuntime/pix3.h>
|
||||||
|
#endif
|
||||||
|
|
||||||
#include "GPUContextDX12.h"
|
#include "GPUContextDX12.h"
|
||||||
#include "Engine/Core/Log.h"
|
#include "Engine/Core/Log.h"
|
||||||
#include "Engine/Core/Math/Viewport.h"
|
#include "Engine/Core/Math/Viewport.h"
|
||||||
@@ -22,9 +36,6 @@
|
|||||||
#include "Engine/Profiler/RenderStats.h"
|
#include "Engine/Profiler/RenderStats.h"
|
||||||
#include "Engine/Graphics/Shaders/GPUShader.h"
|
#include "Engine/Graphics/Shaders/GPUShader.h"
|
||||||
#include "Engine/Threading/Threading.h"
|
#include "Engine/Threading/Threading.h"
|
||||||
#if USE_PIX && GPU_ALLOW_PROFILE_EVENTS
|
|
||||||
#include <pix3.h>
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#define DX12_ENABLE_RESOURCE_BARRIERS_BATCHING 1
|
#define DX12_ENABLE_RESOURCE_BARRIERS_BATCHING 1
|
||||||
#define DX12_ENABLE_RESOURCE_BARRIERS_DEBUGGING 0
|
#define DX12_ENABLE_RESOURCE_BARRIERS_DEBUGGING 0
|
||||||
|
|||||||
2
Source/ThirdParty/WinPixEventRuntime/pix3.h
vendored
2
Source/ThirdParty/WinPixEventRuntime/pix3.h
vendored
@@ -18,7 +18,7 @@
|
|||||||
#endif
|
#endif
|
||||||
|
|
||||||
#if !defined(USE_PIX_SUPPORTED_ARCHITECTURE)
|
#if !defined(USE_PIX_SUPPORTED_ARCHITECTURE)
|
||||||
#if defined(_M_X64) || defined(USE_PIX_ON_ALL_ARCHITECTURES) || defined(_M_ARM64)
|
#if defined(_M_X64) || defined(USE_PIX_ON_ALL_ARCHITECTURES) || defined(_M_ARM64) || defined(_M_ARM64EC)
|
||||||
#define USE_PIX_SUPPORTED_ARCHITECTURE
|
#define USE_PIX_SUPPORTED_ARCHITECTURE
|
||||||
#endif
|
#endif
|
||||||
#endif
|
#endif
|
||||||
|
|||||||
Reference in New Issue
Block a user