Cleanup headers included in wddm.h

Change-Id: Ibb9b84b8f1ea2c69ddd134451b06f0e505c841b4
Signed-off-by: Mateusz Jablonski <mateusz.jablonski@intel.com>

runtime/os_interface/windows/wddm/wddm.cpp

@@ -5,9 +5,7 @@
  *
  */
 
-#include "runtime/helpers/aligned_memory.h"
-#include "runtime/helpers/options.h"
-#include "runtime/os_interface/windows/gdi_interface.h"
+#include "gmm_memory.h"
 #include "runtime/os_interface/windows/kmdaf_listener.h"
 #include "runtime/gmm_helper/gmm.h"
 #include "runtime/gmm_helper/gmm_helper.h"
@@ -17,17 +15,12 @@
 #include "runtime/os_interface/hw_info_config.h"
 #include "runtime/os_interface/windows/gdi_interface.h"
 #include "runtime/os_interface/windows/os_context_win.h"
+#include "runtime/os_interface/windows/wddm/wddm_interface.h"
 #include "runtime/os_interface/windows/wddm_allocation.h"
 #include "runtime/os_interface/windows/wddm_engine_mapper.h"
 #include "runtime/os_interface/windows/registry_reader.h"
-#include "runtime/helpers/debug_helpers.h"
-#include "runtime/helpers/hw_info.h"
 #include "runtime/helpers/wddm_helper.h"
-#include "runtime/command_stream/linear_stream.h"
 #include "runtime/sku_info/operations/sku_info_receiver.h"
-#include "runtime/utilities/stackvec.h"
-#include <dxgi.h>
-#include "CL/cl.h"
 
 namespace OCLRT {
 extern Wddm::CreateDXGIFactoryFcn getCreateDxgiFactory();
@@ -35,8 +28,6 @@ extern Wddm::GetSystemInfoFcn getGetSystemInfo();
 extern Wddm::VirtualAllocFcn getVirtualAlloc();
 extern Wddm::VirtualFreeFcn getVirtualFree();
 
-class WddmMemoryManager;
-
 Wddm::CreateDXGIFactoryFcn Wddm::createDxgiFactory = getCreateDxgiFactory();
 Wddm::GetSystemInfoFcn Wddm::getSystemInfo = getGetSystemInfo();
 Wddm::VirtualAllocFcn Wddm::virtualAllocFnc = getVirtualAlloc();

runtime/os_interface/windows/wddm/wddm.h

@@ -7,40 +7,32 @@
 
 #pragma once
 #include "runtime/os_interface/os_context.h"
-#include "runtime/os_interface/windows/windows_wrapper.h"
-#include "runtime/os_interface/windows/windows_defs.h"
-#include "runtime/os_interface/windows/wddm/wddm_interface.h"
-#include "umKmInc/sharedata.h"
 #include "runtime/helpers/debug_helpers.h"
-#include <d3d9types.h>
-#include <d3dkmthk.h>
-#include "gfxEscape.h"
-#include "runtime/memory_manager/host_ptr_defines.h"
-#include "runtime/utilities/debug_settings_reader.h"
 #include "runtime/gmm_helper/gmm_lib.h"
-#include "runtime/helpers/hw_info.h"
 #include "runtime/utilities/spinlock.h"
-#include "gmm_memory.h"
+#include "sku_info.h"
 #include <memory>
-#include <atomic>
 #include <mutex>
 
 namespace OCLRT {
-
-class WddmAllocation;
 class Gdi;
 class Gmm;
+class GmmMemory;
 class GmmPageTableMngr;
-struct WorkaroundTable;
-struct KmDafListener;
+class SettingsReader;
+class WddmAllocation;
+class WddmInterface;
+class WddmResidencyController;
+
 enum class PreemptionMode : uint32_t;
 
-using OsContextWin = OsContext::OsContextImpl;
+struct AllocationStorageData;
+struct HardwareInfo;
+struct KmDafListener;
+struct MonitoredFence;
+struct OsHandleStorage;
 
-enum class WddmInterfaceVersion {
-    Wddm20 = 20,
-    Wddm23 = 23,
-};
+using OsContextWin = OsContext::OsContextImpl;
 
 enum class EvictionStatus {
     SUCCESS,

unit_tests/mocks/mock_wddm.h

@@ -7,7 +7,9 @@
 
 #pragma once
 
+#include "runtime/memory_manager/host_ptr_defines.h"
 #include "runtime/os_interface/windows/wddm/wddm.h"
+#include "runtime/os_interface/windows/windows_defs.h"
 #include "gmock/gmock.h"
 #include <vector>
 #include <set>

unit_tests/mocks/mock_wddm_interface23.h

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2018 Intel Corporation
+ * Copyright (C) 2018-2019 Intel Corporation
  *
  * SPDX-License-Identifier: MIT
  *
@@ -7,7 +7,7 @@
 
 #pragma once
 
-#include "runtime/os_interface/windows/wddm/wddm.h"
+#include "runtime/os_interface/windows/wddm/wddm_interface.h"
 
 namespace OCLRT {
 class WddmMockInterface23 : public WddmInterface23 {

unit_tests/os_interface/windows/wddm20_tests.cpp

@@ -19,6 +19,7 @@
 #include "runtime/os_interface/windows/wddm_allocation.h"
 #include "runtime/os_interface/windows/wddm_engine_mapper.h"
 #include "runtime/os_interface/windows/wddm_memory_manager.h"
+#include "runtime/os_interface/windows/wddm/wddm_interface.h"
 
 #include "unit_tests/helpers/debug_manager_state_restore.h"
 #include "unit_tests/mocks/mock_gmm_resource_info.h"

unit_tests/os_interface/windows/wddm_calls.cpp

@@ -1,10 +1,11 @@
 /*
- * Copyright (C) 2017-2018 Intel Corporation
+ * Copyright (C) 2017-2019 Intel Corporation
  *
  * SPDX-License-Identifier: MIT
  *
  */
 
+#include "runtime/memory_manager/host_ptr_defines.h"
 #include "unit_tests/mocks/mock_wddm.h"
 #include "unit_tests/os_interface/windows/ult_dxgi_factory.h"
 

unit_tests/os_interface/windows/wddm_residency_controller_tests.cpp

@@ -12,6 +12,7 @@
 #include "runtime/os_interface/os_interface.h"
 #include "runtime/os_interface/windows/os_interface.h"
 #include "runtime/os_interface/windows/wddm_residency_controller.h"
+#include "runtime/os_interface/windows/wddm/wddm_interface.h"
 #include "unit_tests/mocks/mock_allocation_properties.h"
 #include "unit_tests/mocks/mock_wddm.h"
 #include "unit_tests/os_interface/windows/mock_gdi_interface.h"