From 6aec92840fc29c731649761540329b7ce9a939d6 Mon Sep 17 00:00:00 2001
From: baldurk <baldurk@baldurk.org>
Date: Mon, 20 Apr 2020 13:24:28 +0100
Subject: [PATCH] Integrate RGA 2.3.1 and add support for Navi 14

---
 renderdoc/driver/ihv/amd/amd_isa_devices.cpp                   | 1 +
 renderdoc/driver/ihv/amd/amd_isa_devices.h                     | 2 +-
 renderdoc/driver/ihv/amd/official/RGA/Common/AsicReg/devices.h | 3 ++-
 3 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/renderdoc/driver/ihv/amd/amd_isa_devices.cpp b/renderdoc/driver/ihv/amd/amd_isa_devices.cpp
index 5c94c4e23..25c25c475 100644
--- a/renderdoc/driver/ihv/amd/amd_isa_devices.cpp
+++ b/renderdoc/driver/ihv/amd/amd_isa_devices.cpp
@@ -57,6 +57,7 @@ const GCNISA::asic GCNISA::asicInfo[] = {
     {"GCN (Vega 20)", "906", FAMILY_AI, AI_VEGA20_P_A0, "gfx906"},
     // Navi
     {"RDNA (Navi 10)", "1010", FAMILY_NV, NV_NAVI10_P_A0, "gfx1010"},
+    {"RDNA (Navi 14)", "1012", FAMILY_NV, NV_NAVI14_M_A0, "gfx1012"},
 };
 
 RDCCOMPILE_ASSERT(ARRAY_COUNT(GCNISA::asicInfo) == GCNISA::asicCount, "Mismatched array count");
diff --git a/renderdoc/driver/ihv/amd/amd_isa_devices.h b/renderdoc/driver/ihv/amd/amd_isa_devices.h
index d900e9838..41fa5c6b4 100644
--- a/renderdoc/driver/ihv/amd/amd_isa_devices.h
+++ b/renderdoc/driver/ihv/amd/amd_isa_devices.h
@@ -35,7 +35,7 @@ struct asic
   const char *targetName;
 };
 
-const int asicCount = 25;
+const int asicCount = 26;
 extern const asic asicInfo[];
 
 };    // namespace GCNISA
diff --git a/renderdoc/driver/ihv/amd/official/RGA/Common/AsicReg/devices.h b/renderdoc/driver/ihv/amd/official/RGA/Common/AsicReg/devices.h
index c1cc770f5..392dd0346 100644
--- a/renderdoc/driver/ihv/amd/official/RGA/Common/AsicReg/devices.h
+++ b/renderdoc/driver/ihv/amd/official/RGA/Common/AsicReg/devices.h
@@ -108,7 +108,8 @@ enum {
 };
 
 enum {
-    NV_NAVI10_P_A0 = 1
+    NV_NAVI10_P_A0 = 1,
+    NV_NAVI14_M_A0 = 20
 };
 
 enum {