D3D11/D3D12: fixed initialization of ext libs (regression)

NVIDIAGameWorks · Jan 16, 2025 · 84ed92d · 84ed92d
1 parent 6070c04
commit 84ed92d
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 8 deletions.
diff --git a/Source/D3D11/DeviceD3D11.hpp b/Source/D3D11/DeviceD3D11.hpp
@@ -470,7 +470,7 @@ void DeviceD3D11::InitializeAmdExt(AGSContext* agsContext, bool isImported) {
 
     // Verify
     const void** functionArray = (const void**)&m_AmdExt;
-    const size_t functionArraySize = sizeof(m_AmdExt) / sizeof(void*);
+    const size_t functionArraySize = 12;
     size_t i = 0;
     for (; i < functionArraySize && functionArray[i] != nullptr; i++)
         ;

diff --git a/Source/D3D11/SharedD3D11.h b/Source/D3D11/SharedD3D11.h
@@ -193,8 +193,7 @@ struct SamplePositionsState {
 #    include "nvapi/nvapi.h"
 
 struct AmdExt {
-    Library* library;
-    AGSContext* context;
+    // Funcs first
     AGS_INITIALIZE Initialize;
     AGS_DEINITIALIZE Deinitialize;
     AGS_DRIVEREXTENSIONSDX11_CREATEDEVICE CreateDeviceD3D11;
@@ -207,6 +206,8 @@ struct AmdExt {
     AGS_DRIVEREXTENSIONSDX11_MULTIDRAWINSTANCEDINDIRECTCOUNTINDIRECT DrawIndirectCount;
     AGS_DRIVEREXTENSIONSDX11_MULTIDRAWINDEXEDINSTANCEDINDIRECTCOUNTINDIRECT DrawIndexedIndirectCount;
     AGS_DRIVEREXTENSIONSDX11_SETVIEWBROADCASTMASKS SetViewBroadcastMasks;
+    Library* library;
+    AGSContext* context;
     bool isWrapped;
 
     ~AmdExt() {

diff --git a/Source/D3D12/DeviceD3D12.hpp b/Source/D3D12/DeviceD3D12.hpp
@@ -613,7 +613,7 @@ void DeviceD3D12::InitializeAmdExt(AGSContext* agsContext, bool isImported) {
 
     // Verify
     const void** functionArray = (const void**)&m_AmdExt;
-    const size_t functionArraySize = sizeof(m_AmdExt) / sizeof(void*);
+    const size_t functionArraySize = 4;
     size_t i = 0;
     for (; i < functionArraySize && functionArray[i] != nullptr; i++)
         ;
@@ -659,7 +659,7 @@ void DeviceD3D12::InitializePixExt() {
 
     // Verify
     const void** functionArray = (const void**)&m_Pix;
-    const size_t functionArraySize = sizeof(m_Pix) / sizeof(void*);
+    const size_t functionArraySize = 6;
     size_t i = 0;
     for (; i < functionArraySize && functionArray[i] != nullptr; i++)
         ;

diff --git a/Source/D3D12/SharedD3D12.h b/Source/D3D12/SharedD3D12.h
@@ -91,12 +91,13 @@ D3D12_SHADING_RATE_COMBINER GetShadingRateCombiner(ShadingRateCombiner shadingRa
 #    include "nvapi/nvapi.h"
 
 struct AmdExt {
-    Library* library;
-    AGSContext* context;
+    // Funcs first
     AGS_INITIALIZE Initialize;
     AGS_DEINITIALIZE Deinitialize;
     AGS_DRIVEREXTENSIONSDX12_CREATEDEVICE CreateDeviceD3D12;
     AGS_DRIVEREXTENSIONSDX12_DESTROYDEVICE DestroyDeviceD3D12;
+    Library* library;
+    AGSContext* context;
     bool isWrapped;
 
     ~AmdExt() {
@@ -126,13 +127,14 @@ typedef HRESULT(WINAPI* PIX_ENDEVENTONCOMMANDQUEUE)(ID3D12CommandQueue* commandQ
 typedef HRESULT(WINAPI* PIX_SETMARKERONCOMMANDQUEUE)(ID3D12CommandQueue* commandQueue, UINT64 color, _In_ PCSTR formatString);
 
 struct PixExt {
-    Library* library;
+    // Funcs first
     PIX_BEGINEVENTONCOMMANDLIST BeginEventOnCommandList;
     PIX_ENDEVENTONCOMMANDLIST EndEventOnCommandList;
     PIX_SETMARKERONCOMMANDLIST SetMarkerOnCommandList;
     PIX_BEGINEVENTONCOMMANDQUEUE BeginEventOnCommandQueue;
     PIX_ENDEVENTONCOMMANDQUEUE EndEventOnCommandQueue;
     PIX_SETMARKERONCOMMANDQUEUE SetMarkerOnCommandQueue;
+    Library* library;
 
     ~PixExt() {
         if (library)