From d16323f56bf8d4b06a8c9700a63a86cab55b8096 Mon Sep 17 00:00:00 2001
From: Philip Rebohle <philip.rebohle@tu-dortmund.de>
Date: Tue, 11 Dec 2018 16:03:37 +0100
Subject: [PATCH] [dxgi] Clean up DxgiAdapter
---
src/dxgi/dxgi_adapter.cpp | 10 +---------
src/dxgi/dxgi_adapter.h | 7 -------
2 files changed, 1 insertion(+), 16 deletions(-)
diff --git a/src/dxgi/dxgi_adapter.cpp b/src/dxgi/dxgi_adapter.cpp
index 6bbdd3e5..d6b5d2d7 100644
--- a/src/dxgi/dxgi_adapter.cpp
+++ b/src/dxgi/dxgi_adapter.cpp
@@ -16,8 +16,7 @@ namespace dxvk {
DxgiFactory* factory,
const Rc<DxvkAdapter>& adapter)
: m_factory (factory),
- m_adapter (adapter),
- m_formats (adapter) {
+ m_adapter (adapter) {
}
@@ -313,11 +312,4 @@ namespace dxvk {
return m_adapter;
}
-
- DXGI_VK_FORMAT_INFO STDMETHODCALLTYPE DxgiAdapter::LookupFormat(
- DXGI_FORMAT Format,
- DXGI_VK_FORMAT_MODE Mode) {
- return m_formats.GetFormatInfo(Format, Mode);
- }
-
}
diff --git a/src/dxgi/dxgi_adapter.h b/src/dxgi/dxgi_adapter.h
index 58555fb9..d450a1e5 100644
--- a/src/dxgi/dxgi_adapter.h
+++ b/src/dxgi/dxgi_adapter.h
@@ -72,18 +72,11 @@ namespace dxvk {
Rc<DxvkAdapter> STDMETHODCALLTYPE GetDXVKAdapter() final;
- DXGI_VK_FORMAT_INFO STDMETHODCALLTYPE LookupFormat(
- DXGI_FORMAT Format,
- DXGI_VK_FORMAT_MODE Mode);
-
private:
- using OutputMap = std::unordered_map<HMONITOR, DXGI_VK_OUTPUT_DATA>;
-
Com<DxgiFactory> m_factory;
Rc<DxvkAdapter> m_adapter;
- DXGIVkFormatTable m_formats;
UINT64 m_memReservation[2] = { 0, 0 };
};