From 85edbce3cae203a655217d3a539345a5f1027064 Mon Sep 17 00:00:00 2001 From: Connor McLaughlin Date: Sat, 20 Jun 2020 03:33:42 +1000 Subject: [PATCH] Qt: Use FrontendCommon D3D11 host display wrapper --- src/duckstation-qt/CMakeLists.txt | 1 - src/duckstation-qt/d3d11hostdisplay.cpp | 441 ++++-------------------- src/duckstation-qt/d3d11hostdisplay.h | 52 +-- 3 files changed, 79 insertions(+), 415 deletions(-) diff --git a/src/duckstation-qt/CMakeLists.txt b/src/duckstation-qt/CMakeLists.txt index dfa086cd5..a00ef65cb 100644 --- a/src/duckstation-qt/CMakeLists.txt +++ b/src/duckstation-qt/CMakeLists.txt @@ -70,7 +70,6 @@ if(WIN32) d3d11hostdisplay.cpp d3d11hostdisplay.h ) - target_link_libraries(duckstation-qt PRIVATE d3d11.lib dxgi.lib) # We want a Windows subsystem application not console. set_target_properties(duckstation-qt PROPERTIES diff --git a/src/duckstation-qt/d3d11hostdisplay.cpp b/src/duckstation-qt/d3d11hostdisplay.cpp index 1e5ad79be..73325c640 100644 --- a/src/duckstation-qt/d3d11hostdisplay.cpp +++ b/src/duckstation-qt/d3d11hostdisplay.cpp @@ -1,228 +1,50 @@ #include "d3d11hostdisplay.h" #include "common/assert.h" -#include "common/d3d11/shader_compiler.h" #include "common/log.h" -#include "frontend-common/display_ps.hlsl.h" -#include "frontend-common/display_vs.hlsl.h" +#include "imgui.h" #include "qtdisplaywidget.h" -#include -#include -#include -#include Log_SetChannel(D3D11HostDisplay); -class D3D11DisplayWidgetTexture : public HostDisplayTexture -{ -public: - template - using ComPtr = Microsoft::WRL::ComPtr; - - D3D11DisplayWidgetTexture(ComPtr texture, ComPtr srv, u32 width, - u32 height, bool dynamic) - : m_texture(std::move(texture)), m_srv(std::move(srv)), m_width(width), m_height(height), m_dynamic(dynamic) - { - } - ~D3D11DisplayWidgetTexture() override = default; - - void* GetHandle() const override { return m_srv.Get(); } - u32 GetWidth() const override { return m_width; } - u32 GetHeight() const override { return m_height; } - - ID3D11Texture2D* GetD3DTexture() const { return m_texture.Get(); } - ID3D11ShaderResourceView* GetD3DSRV() const { return m_srv.Get(); } - bool IsDynamic() const { return m_dynamic; } - - static std::unique_ptr Create(ID3D11Device* device, u32 width, u32 height, - const void* data, u32 data_stride, bool dynamic) - { - const CD3D11_TEXTURE2D_DESC desc(DXGI_FORMAT_R8G8B8A8_UNORM, width, height, 1, 1, D3D11_BIND_SHADER_RESOURCE, - dynamic ? D3D11_USAGE_DYNAMIC : D3D11_USAGE_DEFAULT, - dynamic ? D3D11_CPU_ACCESS_WRITE : 0, 1, 0, 0); - const D3D11_SUBRESOURCE_DATA srd{data, data_stride, data_stride * height}; - ComPtr texture; - HRESULT hr = device->CreateTexture2D(&desc, data ? &srd : nullptr, texture.GetAddressOf()); - if (FAILED(hr)) - return {}; - - const CD3D11_SHADER_RESOURCE_VIEW_DESC srv_desc(D3D11_SRV_DIMENSION_TEXTURE2D, DXGI_FORMAT_R8G8B8A8_UNORM, 0, 1, 0, - 1); - ComPtr srv; - hr = device->CreateShaderResourceView(texture.Get(), &srv_desc, srv.GetAddressOf()); - if (FAILED(hr)) - return {}; - - return std::make_unique(std::move(texture), std::move(srv), width, height, dynamic); - } - -private: - ComPtr m_texture; - ComPtr m_srv; - u32 m_width; - u32 m_height; - bool m_dynamic; -}; - D3D11HostDisplay::D3D11HostDisplay(QtHostInterface* host_interface) : QtHostDisplay(host_interface) {} D3D11HostDisplay::~D3D11HostDisplay() = default; HostDisplay::RenderAPI D3D11HostDisplay::GetRenderAPI() const { - return HostDisplay::RenderAPI::D3D11; + return m_interface.GetRenderAPI(); } void* D3D11HostDisplay::GetRenderDevice() const { - return m_device.Get(); + return m_interface.GetRenderDevice(); } void* D3D11HostDisplay::GetRenderContext() const { - return m_context.Get(); + return m_interface.GetRenderContext(); } std::unique_ptr D3D11HostDisplay::CreateTexture(u32 width, u32 height, const void* initial_data, u32 initial_data_stride, bool dynamic) { - return D3D11DisplayWidgetTexture::Create(m_device.Get(), width, height, initial_data, initial_data_stride, dynamic); + return m_interface.CreateTexture(width, height, initial_data, initial_data_stride, dynamic); } void D3D11HostDisplay::UpdateTexture(HostDisplayTexture* texture, u32 x, u32 y, u32 width, u32 height, const void* texture_data, u32 texture_data_stride) { - D3D11DisplayWidgetTexture* d3d11_texture = static_cast(texture); - if (!d3d11_texture->IsDynamic()) - { - const CD3D11_BOX dst_box(x, y, 0, x + width, y + height, 1); - m_context->UpdateSubresource(d3d11_texture->GetD3DTexture(), 0, &dst_box, texture_data, texture_data_stride, - texture_data_stride * height); - } - else - { - D3D11_MAPPED_SUBRESOURCE sr; - HRESULT hr = m_context->Map(d3d11_texture->GetD3DTexture(), 0, D3D11_MAP_WRITE_DISCARD, 0, &sr); - if (FAILED(hr)) - Panic("Failed to map dynamic host display texture"); - - char* dst_ptr = static_cast(sr.pData) + (y * sr.RowPitch) + (x * sizeof(u32)); - const char* src_ptr = static_cast(texture_data); - if (sr.RowPitch == texture_data_stride) - { - std::memcpy(dst_ptr, src_ptr, texture_data_stride * height); - } - else - { - for (u32 row = 0; row < height; row++) - { - std::memcpy(dst_ptr, src_ptr, width * sizeof(u32)); - src_ptr += texture_data_stride; - dst_ptr += sr.RowPitch; - } - } - - m_context->Unmap(d3d11_texture->GetD3DTexture(), 0); - } + m_interface.UpdateTexture(texture, x, y, width, height, texture_data, texture_data_stride); } bool D3D11HostDisplay::DownloadTexture(const void* texture_handle, u32 x, u32 y, u32 width, u32 height, void* out_data, u32 out_data_stride) { - ID3D11ShaderResourceView* srv = - const_cast(static_cast(texture_handle)); - ID3D11Resource* srv_resource; - D3D11_SHADER_RESOURCE_VIEW_DESC srv_desc; - srv->GetResource(&srv_resource); - srv->GetDesc(&srv_desc); - - if (!m_readback_staging_texture.EnsureSize(m_context.Get(), width, height, srv_desc.Format, false)) - return false; - - m_readback_staging_texture.CopyFromTexture(m_context.Get(), srv_resource, 0, x, y, 0, 0, width, height); - return m_readback_staging_texture.ReadPixels(m_context.Get(), 0, 0, width, height, out_data_stride / sizeof(u32), - static_cast(out_data)); + return m_interface.DownloadTexture(texture_handle, x, y, width, height, out_data, out_data_stride); } void D3D11HostDisplay::SetVSync(bool enabled) { - m_vsync = enabled; -} - -bool D3D11HostDisplay::hasDeviceContext() const -{ - return static_cast(m_device); -} - -bool D3D11HostDisplay::createDeviceContext(bool debug_device) -{ - UINT create_flags = 0; - if (debug_device) - create_flags |= D3D11_CREATE_DEVICE_DEBUG; - - HRESULT hr = D3D11CreateDevice(nullptr, D3D_DRIVER_TYPE_HARDWARE, nullptr, create_flags, nullptr, 0, - D3D11_SDK_VERSION, m_device.GetAddressOf(), nullptr, m_context.GetAddressOf()); - - if (FAILED(hr)) - { - Log_ErrorPrintf("Failed to create D3D device: 0x%08X", hr); - return false; - } - - if (debug_device && IsDebuggerPresent()) - { - ComPtr info; - hr = m_device.As(&info); - if (SUCCEEDED(hr)) - { - info->SetBreakOnSeverity(D3D11_MESSAGE_SEVERITY_ERROR, TRUE); - info->SetBreakOnSeverity(D3D11_MESSAGE_SEVERITY_WARNING, TRUE); - } - } - - // we need the specific factory for the device, otherwise MakeWindowAssociation() is flaky. - ComPtr dxgi_device; - ComPtr dxgi_adapter; - if (FAILED(m_device.As(&dxgi_device)) || FAILED(dxgi_device->GetParent(IID_PPV_ARGS(dxgi_adapter.GetAddressOf()))) || - FAILED(dxgi_adapter->GetParent(IID_PPV_ARGS(m_dxgi_factory.GetAddressOf())))) - { - Log_WarningPrint("Failed to get parent adapter/device/factory"); - return false; - } - - DXGI_ADAPTER_DESC adapter_desc; - if (SUCCEEDED(dxgi_adapter->GetDesc(&adapter_desc))) - { - char adapter_name_buffer[128]; - const int name_length = - WideCharToMultiByte(CP_UTF8, 0, adapter_desc.Description, static_cast(std::wcslen(adapter_desc.Description)), - adapter_name_buffer, countof(adapter_name_buffer), 0, nullptr); - if (name_length >= 0) - { - adapter_name_buffer[name_length] = 0; - Log_InfoPrintf("D3D Adapter: %s", adapter_name_buffer); - } - } - - m_allow_tearing_supported = false; - ComPtr dxgi_factory5; - hr = m_dxgi_factory.As(&dxgi_factory5); - if (SUCCEEDED(hr)) - { - BOOL allow_tearing_supported = false; - hr = dxgi_factory5->CheckFeatureSupport(DXGI_FEATURE_PRESENT_ALLOW_TEARING, &allow_tearing_supported, - sizeof(allow_tearing_supported)); - if (SUCCEEDED(hr)) - m_allow_tearing_supported = (allow_tearing_supported == TRUE); - } - - return createSwapChain(); -} - -void D3D11HostDisplay::destroyDeviceContext() -{ - QtHostDisplay::destroyDeviceContext(); - m_swap_chain.Reset(); - m_context.Reset(); - m_device.Reset(); + m_interface.SetVSync(enabled); } bool D3D11HostDisplay::shouldUseFlipModelSwapChain() const @@ -232,245 +54,118 @@ bool D3D11HostDisplay::shouldUseFlipModelSwapChain() const return m_widget->parent() == nullptr; } -bool D3D11HostDisplay::createSwapChain() +bool D3D11HostDisplay::hasDeviceContext() const { - m_using_flip_model_swap_chain = shouldUseFlipModelSwapChain(); - - const HWND window_hwnd = reinterpret_cast(m_widget->winId()); - RECT client_rc{}; - GetClientRect(window_hwnd, &client_rc); - m_window_width = client_rc.right - client_rc.left; - m_window_height = client_rc.bottom - client_rc.top; - - DXGI_SWAP_CHAIN_DESC swap_chain_desc = {}; - swap_chain_desc.BufferDesc.Width = m_window_width; - swap_chain_desc.BufferDesc.Height = m_window_height; - swap_chain_desc.BufferDesc.Format = DXGI_FORMAT_R8G8B8A8_UNORM; - swap_chain_desc.SampleDesc.Count = 1; - swap_chain_desc.BufferCount = 3; - swap_chain_desc.BufferUsage = DXGI_USAGE_RENDER_TARGET_OUTPUT; - swap_chain_desc.OutputWindow = window_hwnd; - swap_chain_desc.Windowed = TRUE; - swap_chain_desc.SwapEffect = m_using_flip_model_swap_chain ? DXGI_SWAP_EFFECT_FLIP_DISCARD : DXGI_SWAP_EFFECT_DISCARD; - - m_using_allow_tearing = (m_allow_tearing_supported && m_using_flip_model_swap_chain); - if (m_using_allow_tearing) - swap_chain_desc.Flags = DXGI_SWAP_CHAIN_FLAG_ALLOW_TEARING; - - Log_InfoPrintf("Creating a %dx%d %s %s swap chain", m_window_width, m_window_height, - m_using_flip_model_swap_chain ? "flip-discard" : "discard", - swap_chain_desc.Windowed ? "windowed" : "full-screen"); - - HRESULT hr = m_dxgi_factory->CreateSwapChain(m_device.Get(), &swap_chain_desc, m_swap_chain.GetAddressOf()); - if (FAILED(hr) && m_using_flip_model_swap_chain) - { - Log_WarningPrintf("Failed to create a flip-discard swap chain, trying discard."); - swap_chain_desc.SwapEffect = DXGI_SWAP_EFFECT_DISCARD; - swap_chain_desc.Flags = 0; - m_using_flip_model_swap_chain = false; - m_using_allow_tearing = false; - - hr = m_dxgi_factory->CreateSwapChain(m_device.Get(), &swap_chain_desc, m_swap_chain.GetAddressOf()); - if (FAILED(hr)) - { - Log_ErrorPrintf("CreateSwapChain failed: 0x%08X", hr); - return false; - } - } - - hr = m_dxgi_factory->MakeWindowAssociation(swap_chain_desc.OutputWindow, DXGI_MWA_NO_WINDOW_CHANGES); - if (FAILED(hr)) - Log_WarningPrintf("MakeWindowAssociation() to disable ALT+ENTER failed"); - - return createSwapChainRTV(); + return m_interface.HasContext(); } -bool D3D11HostDisplay::createSwapChainRTV() +bool D3D11HostDisplay::createDeviceContext(bool debug_device) { - ComPtr backbuffer; - HRESULT hr = m_swap_chain->GetBuffer(0, IID_PPV_ARGS(backbuffer.GetAddressOf())); - if (FAILED(hr)) - { - Log_ErrorPrintf("GetBuffer for RTV failed: 0x%08X", hr); + std::optional wi = getWindowInfo(); + if (!wi || !m_interface.CreateContextAndSwapChain(wi.value(), shouldUseFlipModelSwapChain(), debug_device)) return false; - } - - D3D11_TEXTURE2D_DESC backbuffer_desc; - backbuffer->GetDesc(&backbuffer_desc); - - CD3D11_RENDER_TARGET_VIEW_DESC rtv_desc(D3D11_RTV_DIMENSION_TEXTURE2D, backbuffer_desc.Format, 0, 0, - backbuffer_desc.ArraySize); - hr = m_device->CreateRenderTargetView(backbuffer.Get(), &rtv_desc, m_swap_chain_rtv.GetAddressOf()); - if (FAILED(hr)) - { - Log_ErrorPrintf("CreateRenderTargetView for swap chain failed: 0x%08X", hr); - return false; - } + m_window_width = static_cast(m_interface.GetSwapChainWidth()); + m_window_height = static_cast(m_interface.GetSwapChainHeight()); return true; } +bool D3D11HostDisplay::initializeDeviceContext(std::string_view shader_cache_directory, bool debug_device) +{ + return QtHostDisplay::initializeDeviceContext(shader_cache_directory, debug_device); +} + +bool D3D11HostDisplay::activateDeviceContext() +{ + return true; +} + +void D3D11HostDisplay::deactivateDeviceContext() {} + +void D3D11HostDisplay::destroyDeviceContext() +{ + QtHostDisplay::destroyDeviceContext(); + m_interface.DestroySwapChain(); + m_interface.DestroyContext(); +} + bool D3D11HostDisplay::recreateSurface() { - return createSwapChain(); + std::optional wi = getWindowInfo(); + if (!wi.has_value()) + return false; + + if (!m_interface.RecreateSwapChain(wi.value(), shouldUseFlipModelSwapChain())) + return false; + + m_window_width = static_cast(m_interface.GetSwapChainWidth()); + m_window_height = static_cast(m_interface.GetSwapChainHeight()); + return true; } void D3D11HostDisplay::destroySurface() { - m_swap_chain_rtv.Reset(); - m_swap_chain.Reset(); - QtHostDisplay::destroySurface(); + m_interface.DestroySwapChain(); } void D3D11HostDisplay::WindowResized(s32 new_window_width, s32 new_window_height) { QtHostDisplay::WindowResized(new_window_width, new_window_height); - if (!m_swap_chain) - return; - - m_swap_chain_rtv.Reset(); - - HRESULT hr = m_swap_chain->ResizeBuffers(0, new_window_width, new_window_height, DXGI_FORMAT_UNKNOWN, - m_using_allow_tearing ? DXGI_SWAP_CHAIN_FLAG_ALLOW_TEARING : 0); - if (FAILED(hr)) - Log_ErrorPrintf("ResizeBuffers() failed: 0x%08X", hr); - - if (!createSwapChainRTV()) - Panic("Failed to recreate swap chain RTV after resize"); + m_interface.ResizeSwapChain(static_cast(new_window_width), static_cast(new_window_height)); + m_window_width = static_cast(m_interface.GetSwapChainWidth()); + m_window_height = static_cast(m_interface.GetSwapChainHeight()); } bool D3D11HostDisplay::createDeviceResources() { - HRESULT hr; - - m_display_vertex_shader = - D3D11::ShaderCompiler::CreateVertexShader(m_device.Get(), s_display_vs_bytecode, sizeof(s_display_vs_bytecode)); - m_display_pixel_shader = - D3D11::ShaderCompiler::CreatePixelShader(m_device.Get(), s_display_ps_bytecode, sizeof(s_display_ps_bytecode)); - if (!m_display_vertex_shader || !m_display_pixel_shader) + if (!QtHostDisplay::createDeviceResources()) return false; - if (!m_display_uniform_buffer.Create(m_device.Get(), D3D11_BIND_CONSTANT_BUFFER, DISPLAY_UNIFORM_BUFFER_SIZE)) - return false; - - CD3D11_RASTERIZER_DESC rasterizer_desc = CD3D11_RASTERIZER_DESC(CD3D11_DEFAULT()); - rasterizer_desc.CullMode = D3D11_CULL_NONE; - hr = m_device->CreateRasterizerState(&rasterizer_desc, m_display_rasterizer_state.GetAddressOf()); - if (FAILED(hr)) - return false; - - CD3D11_DEPTH_STENCIL_DESC depth_stencil_desc = CD3D11_DEPTH_STENCIL_DESC(CD3D11_DEFAULT()); - depth_stencil_desc.DepthEnable = FALSE; - depth_stencil_desc.DepthWriteMask = D3D11_DEPTH_WRITE_MASK_ZERO; - hr = m_device->CreateDepthStencilState(&depth_stencil_desc, m_display_depth_stencil_state.GetAddressOf()); - if (FAILED(hr)) - return false; - - CD3D11_BLEND_DESC blend_desc = CD3D11_BLEND_DESC(CD3D11_DEFAULT()); - hr = m_device->CreateBlendState(&blend_desc, m_display_blend_state.GetAddressOf()); - if (FAILED(hr)) - return false; - - CD3D11_SAMPLER_DESC sampler_desc = CD3D11_SAMPLER_DESC(CD3D11_DEFAULT()); - sampler_desc.Filter = D3D11_FILTER_MIN_MAG_MIP_POINT; - hr = m_device->CreateSamplerState(&sampler_desc, m_point_sampler.GetAddressOf()); - if (FAILED(hr)) - return false; - - sampler_desc.Filter = D3D11_FILTER_MIN_MAG_LINEAR_MIP_POINT; - hr = m_device->CreateSamplerState(&sampler_desc, m_linear_sampler.GetAddressOf()); - if (FAILED(hr)) - return false; - - return true; + return m_interface.CreateResources(); } void D3D11HostDisplay::destroyDeviceResources() { QtHostDisplay::destroyDeviceResources(); - - m_display_uniform_buffer.Release(); - m_swap_chain_rtv.Reset(); - m_linear_sampler.Reset(); - m_point_sampler.Reset(); - m_display_pixel_shader.Reset(); - m_display_vertex_shader.Reset(); - m_display_blend_state.Reset(); - m_display_depth_stencil_state.Reset(); - m_display_rasterizer_state.Reset(); + m_interface.DestroyResources(); } bool D3D11HostDisplay::createImGuiContext() { - if (!QtHostDisplay::createImGuiContext()) + if (!QtHostDisplay::createImGuiContext() || !m_interface.CreateImGuiContext()) return false; - if (!ImGui_ImplDX11_Init(m_device.Get(), m_context.Get())) - return false; - - ImGui_ImplDX11_NewFrame(); ImGui::NewFrame(); return true; } void D3D11HostDisplay::destroyImGuiContext() { - ImGui_ImplDX11_Shutdown(); + m_interface.DestroyImGuiContext(); QtHostDisplay::destroyImGuiContext(); } void D3D11HostDisplay::Render() { - static constexpr std::array clear_color = {}; - m_context->ClearRenderTargetView(m_swap_chain_rtv.Get(), clear_color.data()); - m_context->OMSetRenderTargets(1, m_swap_chain_rtv.GetAddressOf(), nullptr); - - renderDisplay(); - - ImGui::Render(); - ImGui_ImplDX11_RenderDrawData(ImGui::GetDrawData()); - - if (!m_vsync && m_using_allow_tearing) - m_swap_chain->Present(0, DXGI_PRESENT_ALLOW_TEARING); - else - m_swap_chain->Present(BoolToUInt32(m_vsync), 0); - - ImGui::NewFrame(); - ImGui_ImplDX11_NewFrame(); -} - -void D3D11HostDisplay::renderDisplay() -{ - if (!m_display_texture_handle) + if (!m_interface.HasSwapChain() || !m_interface.BeginRender()) return; - auto [vp_left, vp_top, vp_width, vp_height] = - CalculateDrawRect(m_window_width, m_window_height, m_display_top_margin); + if (HasDisplayTexture()) + { + const auto [left, top, width, height] = CalculateDrawRect(m_window_width, m_window_height, m_display_top_margin); + m_interface.RenderDisplay(left, top, width, height, m_display_texture_handle, m_display_texture_width, + m_display_texture_height, m_display_texture_view_x, m_display_texture_view_y, + m_display_texture_view_width, m_display_texture_view_height, m_display_linear_filtering); + } - m_context->IASetPrimitiveTopology(D3D11_PRIMITIVE_TOPOLOGY_TRIANGLELIST); - m_context->VSSetShader(m_display_vertex_shader.Get(), nullptr, 0); - m_context->PSSetShader(m_display_pixel_shader.Get(), nullptr, 0); - m_context->PSSetShaderResources(0, 1, reinterpret_cast(&m_display_texture_handle)); - m_context->PSSetSamplers( - 0, 1, m_display_linear_filtering ? m_linear_sampler.GetAddressOf() : m_point_sampler.GetAddressOf()); + m_interface.RenderImGui(); - const float uniforms[4] = { - static_cast(m_display_texture_view_x) / static_cast(m_display_texture_width), - static_cast(m_display_texture_view_y) / static_cast(m_display_texture_height), - (static_cast(m_display_texture_view_width) - 0.5f) / static_cast(m_display_texture_width), - (static_cast(m_display_texture_view_height) - 0.5f) / static_cast(m_display_texture_height)}; - const auto map = m_display_uniform_buffer.Map(m_context.Get(), sizeof(uniforms), sizeof(uniforms)); - std::memcpy(map.pointer, uniforms, sizeof(uniforms)); - m_display_uniform_buffer.Unmap(m_context.Get(), sizeof(uniforms)); - m_context->VSSetConstantBuffers(0, 1, m_display_uniform_buffer.GetD3DBufferArray()); + if (HasSoftwareCursor()) + { + const auto [left, top, width, height] = CalculateSoftwareCursorDrawRect(); + m_interface.RenderSoftwareCursor(left, top, width, height, m_cursor_texture.get()); + } - const CD3D11_VIEWPORT vp(static_cast(vp_left), static_cast(vp_top), static_cast(vp_width), - static_cast(vp_height)); - m_context->RSSetViewports(1, &vp); - m_context->RSSetState(m_display_rasterizer_state.Get()); - m_context->OMSetDepthStencilState(m_display_depth_stencil_state.Get(), 0); - m_context->OMSetBlendState(m_display_blend_state.Get(), nullptr, 0xFFFFFFFFu); - - m_context->Draw(3, 0); + m_interface.EndRenderAndPresent(); } diff --git a/src/duckstation-qt/d3d11hostdisplay.h b/src/duckstation-qt/d3d11hostdisplay.h index fa5bf1c65..0c86538da 100644 --- a/src/duckstation-qt/d3d11hostdisplay.h +++ b/src/duckstation-qt/d3d11hostdisplay.h @@ -1,29 +1,27 @@ #pragma once -#include "common/d3d11/staging_texture.h" -#include "common/d3d11/stream_buffer.h" -#include "common/d3d11/texture.h" -#include "common/windows_headers.h" +#include "common/window_info.h" #include "core/host_display.h" +#include "frontend-common/d3d11_host_display.h" +#include "qtdisplaywidget.h" #include "qthostdisplay.h" -#include -#include #include -#include + +class QtHostInterface; class D3D11HostDisplay final : public QtHostDisplay { public: - template - using ComPtr = Microsoft::WRL::ComPtr; - D3D11HostDisplay(QtHostInterface* host_interface); ~D3D11HostDisplay(); bool hasDeviceContext() const override; bool createDeviceContext(bool debug_device) override; + bool initializeDeviceContext(std::string_view shader_cache_directory, bool debug_device) override; + bool activateDeviceContext() override; + void deactivateDeviceContext() override; void destroyDeviceContext() override; bool recreateSurface() override; - void destroySurface() override; + void destroySurface(); RenderAPI GetRenderAPI() const override; void* GetRenderDevice() const override; @@ -42,40 +40,12 @@ public: void Render() override; private: - static constexpr u32 DISPLAY_UNIFORM_BUFFER_SIZE = 16; + bool shouldUseFlipModelSwapChain() const; bool createImGuiContext() override; void destroyImGuiContext() override; bool createDeviceResources() override; void destroyDeviceResources() override; - bool shouldUseFlipModelSwapChain() const; - bool createSwapChain(); - bool createSwapChainRTV(); - - void renderDisplay(); - - ComPtr m_dxgi_factory; - - ComPtr m_device; - ComPtr m_context; - ComPtr m_swap_chain; - ComPtr m_swap_chain_rtv; - - ComPtr m_display_rasterizer_state; - ComPtr m_display_depth_stencil_state; - ComPtr m_display_blend_state; - ComPtr m_display_vertex_shader; - ComPtr m_display_pixel_shader; - ComPtr m_point_sampler; - ComPtr m_linear_sampler; - - D3D11::Texture m_display_pixels_texture; - D3D11::StreamBuffer m_display_uniform_buffer; - D3D11::AutoStagingTexture m_readback_staging_texture; - - bool m_allow_tearing_supported = false; - bool m_using_flip_model_swap_chain = false; - bool m_using_allow_tearing = false; - bool m_vsync = false; + FrontendCommon::D3D11HostDisplay m_interface; };