Move Wddm::init template method to inl file

Change-Id: Ic49242c25c8e553a74ada61533b7db31bead7d7d
intel · Apr 27, 2018 · c2455b4 · c2455b4
1 parent 95e200d
commit c2455b4
Show file tree

Hide file tree

Showing 2 changed files with 39 additions and 36 deletions.
diff --git a/runtime/os_interface/windows/wddm.h b/runtime/os_interface/windows/wddm.h
@@ -111,42 +111,7 @@ class Wddm {
     bool configureDeviceAddressSpace();
 
     template <typename GfxFamily>
-    bool init() {
-        bool success = false;
-        if (gdi != nullptr && gdi->isInitialized() && !initialized) {
-            do {
-                success = openAdapter();
-                if (!success)
-                    break;
-                success = queryAdapterInfo();
-                if (!success)
-                    break;
-                success = createDevice();
-                if (!success)
-                    break;
-                success = createPagingQueue();
-                if (!success)
-                    break;
-                success = Gmm::initContext(gfxPlatform.get(),
-                                           featureTable.get(),
-                                           waTable.get(),
-                                           gtSystemInfo.get());
-                if (!success)
-                    break;
-                success = configureDeviceAddressSpace<GfxFamily>();
-                if (!success)
-                    break;
-                context = createContext();
-                if (context == static_cast<D3DKMT_HANDLE>(0))
-                    break;
-                success = createMonitoredFence();
-                if (!success)
-                    break;
-                initialized = true;
-            } while (!success);
-        }
-        return initialized;
-    }
+    bool init();
 
     bool isInitialized() const {
         return initialized;

diff --git a/runtime/os_interface/windows/wddm.inl b/runtime/os_interface/windows/wddm.inl
@@ -36,4 +36,42 @@ bool Wddm::configureDeviceAddressSpace() {
                                                   maximumApplicationAddress + 1u,
                                                   0, 0, featureTable->ftrL3IACoherency, 0, 0);
 }
+
+template <typename GfxFamily>
+bool Wddm::init() {
+    bool success = false;
+    if (gdi != nullptr && gdi->isInitialized() && !initialized) {
+        do {
+            success = openAdapter();
+            if (!success)
+                break;
+            success = queryAdapterInfo();
+            if (!success)
+                break;
+            success = createDevice();
+            if (!success)
+                break;
+            success = createPagingQueue();
+            if (!success)
+                break;
+            success = Gmm::initContext(gfxPlatform.get(),
+                                       featureTable.get(),
+                                       waTable.get(),
+                                       gtSystemInfo.get());
+            if (!success)
+                break;
+            success = configureDeviceAddressSpace<GfxFamily>();
+            if (!success)
+                break;
+            context = createContext();
+            if (context == static_cast<D3DKMT_HANDLE>(0))
+                break;
+            success = createMonitoredFence();
+            if (!success)
+                break;
+            initialized = true;
+        } while (!success);
+    }
+    return initialized;
+}
 } // namespace OCLRT