[dxvk] Use array_of helper for devExtensionListdxvk-array-of

This will be getting some ifdefs in the future to support native, so lets calculate the size automagically.

1 files changed, 5 insertions, 3 deletions

diff --git a/src/dxvk/dxvk_adapter.cpp b/src/dxvk/dxvk_adapter.cpp
index cf694c0b..c4e1207f 100644
--- a/src/dxvk/dxvk_adapter.cpp
+++ b/src/dxvk/dxvk_adapter.cpp
@@ -5,6 +5,8 @@
 #include "dxvk_device.h"
 #include "dxvk_instance.h"
 
+#include "../util/util_array.h"
+
 namespace dxvk {
   
   DxvkAdapter::DxvkAdapter(
@@ -285,7 +287,7 @@ namespace dxvk {
           DxvkDeviceFeatures  enabledFeatures) {
     DxvkDeviceExtensions devExtensions;
 
-    std::array<DxvkExt*, 22> devExtensionList = {{
+    auto devExtensionList = array_of<DxvkExt*>(
       &devExtensions.amdMemoryOverallocationBehaviour,
       &devExtensions.amdShaderFragmentMask,
       &devExtensions.extAttachmentFeedbackLoopLayout,
@@ -307,8 +309,8 @@ namespace dxvk {
       &devExtensions.khrPipelineLibrary,
       &devExtensions.khrSwapchain,
       &devExtensions.nvxBinaryImport,
-      &devExtensions.nvxImageViewHandle,
-    }};
+      &devExtensions.nvxImageViewHandle
+    );
 
     // Only enable Cuda interop extensions in 64-bit builds in
     // order to avoid potential driver or address space issues.