From af2f5cc77ff14b7f152ba174ee0bb232887058c4 Mon Sep 17 00:00:00 2001
From: Philip Rebohle <philip.rebohle@tu-dortmund.de>
Date: Wed, 28 Nov 2018 19:06:34 +0100
Subject: [PATCH] [dxgi] Remove format lookup methods from IDXGIVkAdapter
 interface

---
 src/dxgi/dxgi_adapter.cpp  |  7 -------
 src/dxgi/dxgi_adapter.h    |  6 +-----
 src/dxgi/dxgi_interfaces.h | 26 --------------------------
 3 files changed, 1 insertion(+), 38 deletions(-)

diff --git a/src/dxgi/dxgi_adapter.cpp b/src/dxgi/dxgi_adapter.cpp
index 84e2ee1d..0c552ce0 100644
--- a/src/dxgi/dxgi_adapter.cpp
+++ b/src/dxgi/dxgi_adapter.cpp
@@ -335,13 +335,6 @@ namespace dxvk {
   }
   
   
-  DXGI_VK_FORMAT_FAMILY STDMETHODCALLTYPE DxgiAdapter::LookupFormatFamily(
-          DXGI_FORMAT               Format,
-          DXGI_VK_FORMAT_MODE       Mode) {
-    return m_formats.GetFormatFamily(Format, Mode);
-  }
-  
-  
   HRESULT DxgiAdapter::GetOutputFromMonitor(
           HMONITOR                  Monitor,
           IDXGIOutput**             ppOutput) {
diff --git a/src/dxgi/dxgi_adapter.h b/src/dxgi/dxgi_adapter.h
index d204b8a5..93dde1b9 100644
--- a/src/dxgi/dxgi_adapter.h
+++ b/src/dxgi/dxgi_adapter.h
@@ -79,11 +79,7 @@ namespace dxvk {
     
     DXGI_VK_FORMAT_INFO STDMETHODCALLTYPE LookupFormat(
             DXGI_FORMAT               Format,
-            DXGI_VK_FORMAT_MODE       Mode) final;
-    
-    DXGI_VK_FORMAT_FAMILY STDMETHODCALLTYPE LookupFormatFamily(
-            DXGI_FORMAT               Format,
-            DXGI_VK_FORMAT_MODE       Mode) final;
+            DXGI_VK_FORMAT_MODE       Mode);
     
     HRESULT GetOutputFromMonitor(
             HMONITOR                  Monitor,
diff --git a/src/dxgi/dxgi_interfaces.h b/src/dxgi/dxgi_interfaces.h
index 8466f7ce..4795a029 100644
--- a/src/dxgi/dxgi_interfaces.h
+++ b/src/dxgi/dxgi_interfaces.h
@@ -106,32 +106,6 @@ IDXGIVkAdapter : public IDXGIAdapter3 {
           IDXGIObject*              pContainer,
     const dxvk::DxvkDeviceFeatures* pFeatures,
           IDXGIVkDevice**           ppDevice) = 0;
-  
-  /**
-   * \brief Maps a DXGI format to a compatible Vulkan format
-   * 
-   * For color formats, the returned Vulkan format has the
-   * same memory layout as the DXGI format so that it can
-   * be mapped and copied to buffers. For depth-stencil
-   * formats, this is not guaranteed.
-   * \param [in] format The DXGI format
-   * \param [in] mode Format lookup mode
-   * \returns Vulkan format mapping
-   */
-  virtual dxvk::DXGI_VK_FORMAT_INFO STDMETHODCALLTYPE LookupFormat(
-          DXGI_FORMAT               Format,
-          dxvk::DXGI_VK_FORMAT_MODE Mode) = 0;
-  
-  /**
-   * \brief Queries the compatibility family of a given format
-   * 
-   * \param [in] Format The DXGI format
-   * \param [in] Mode Format lookup mode
-   * \returns Format family
-   */
-  virtual dxvk::DXGI_VK_FORMAT_FAMILY STDMETHODCALLTYPE LookupFormatFamily(
-          DXGI_FORMAT               Format,
-          dxvk::DXGI_VK_FORMAT_MODE Mode) = 0;
 };