Merge pull request #8517 from stenzek/fix-vulkan-d3d12

Fix Vulkan and D3D12 video backends crashing on boot
dolphin-emu · Dec 9, 2019 · 6f27409 · 6f27409
2 parents a21fb96 + e05bc33
commit 6f27409
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 0 deletions.
diff --git a/Source/Core/VideoBackends/D3D12/VertexManager.cpp b/Source/Core/VideoBackends/D3D12/VertexManager.cpp
@@ -31,6 +31,9 @@ VertexManager::~VertexManager() = default;
 
 bool VertexManager::Initialize()
 {
+  if (!VertexManagerBase::Initialize())
+    return false;
+
   if (!m_vertex_stream_buffer.AllocateBuffer(VERTEX_STREAM_BUFFER_SIZE) ||
       !m_index_stream_buffer.AllocateBuffer(INDEX_STREAM_BUFFER_SIZE) ||
       !m_uniform_stream_buffer.AllocateBuffer(UNIFORM_STREAM_BUFFER_SIZE) ||

diff --git a/Source/Core/VideoBackends/Vulkan/VertexManager.cpp b/Source/Core/VideoBackends/Vulkan/VertexManager.cpp
@@ -59,6 +59,9 @@ VertexManager::~VertexManager()
 
 bool VertexManager::Initialize()
 {
+  if (!VertexManagerBase::Initialize())
+    return false;
+
   m_vertex_stream_buffer =
       StreamBuffer::Create(VK_BUFFER_USAGE_VERTEX_BUFFER_BIT, VERTEX_STREAM_BUFFER_SIZE);
   m_index_stream_buffer =