From 39b5d84d6a0f87cf7e54c67f12d67f25eb00ee9c Mon Sep 17 00:00:00 2001 From: Philip Rebohle Date: Wed, 10 Jan 2018 13:43:23 +0100 Subject: [PATCH] [dxgi] Added missing view type definition --- src/dxgi/dxgi_presenter.cpp | 16 ++++++++++++++-- src/dxgi/dxgi_presenter.h | 5 +++++ 2 files changed, 19 insertions(+), 2 deletions(-) diff --git a/src/dxgi/dxgi_presenter.cpp b/src/dxgi/dxgi_presenter.cpp index f2ed091d..74620ac9 100644 --- a/src/dxgi/dxgi_presenter.cpp +++ b/src/dxgi/dxgi_presenter.cpp @@ -150,6 +150,18 @@ namespace dxvk { void DxgiPresenter::presentImage() { + auto newTime = std::chrono::high_resolution_clock::now(); + auto us = std::chrono::duration_cast(newTime - m_oldTime).count(); + + m_frames += 1; + + if (us >= 1'000'000) { + std::cout << "FPS: " << (static_cast(m_frames * 1'000'000) + / static_cast(us)) << std::endl; + m_frames = 0; + m_oldTime = newTime; + } + const bool fitSize = m_backBuffer->info().extent.width == m_options.preferredBufferSize.width && m_backBuffer->info().extent.height == m_options.preferredBufferSize.height; @@ -503,8 +515,8 @@ namespace dxvk { // Shader resource slots std::array resourceSlots = {{ - { BindingIds::Sampler, VK_DESCRIPTOR_TYPE_SAMPLER }, - { BindingIds::Texture, VK_DESCRIPTOR_TYPE_SAMPLED_IMAGE }, + { BindingIds::Sampler, VK_DESCRIPTOR_TYPE_SAMPLER, VK_IMAGE_VIEW_TYPE_MAX_ENUM }, + { BindingIds::Texture, VK_DESCRIPTOR_TYPE_SAMPLED_IMAGE, VK_IMAGE_VIEW_TYPE_2D }, }}; // Create the actual shader module diff --git a/src/dxgi/dxgi_presenter.h b/src/dxgi/dxgi_presenter.h index a20604d6..4be0184c 100644 --- a/src/dxgi/dxgi_presenter.h +++ b/src/dxgi/dxgi_presenter.h @@ -1,5 +1,7 @@ #pragma once +#include + #include #include #include @@ -103,6 +105,9 @@ namespace dxvk { Rc createVertexShader(); Rc createFragmentShader(); + std::chrono::high_resolution_clock::time_point m_oldTime; + uint32_t m_frames = 0; + }; }