[NFC] Extract Pipeline into support library (#15)

This extracts the pipeline description into a new Support library. This
is preprataion for generating an Image library to work with images more
formally, which will in turn depend on the Pipeline data structures.

Author: llvm-beanz

include/API/Pipeline.h renamed to include/Support/Pipeline.h

@@ -1,4 +1,4 @@
-//===- HLSLTest/WinError.h - Windows Error Utils ----------------*- C++ -*-===//
+//===- HLSLTest/Support/WinError.h - Windows Error Utils --------*- C++ -*-===//
 //
 // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
 // See https://llvm.org/LICENSE.txt for license information.
@@ -9,6 +9,9 @@
 //
 //===----------------------------------------------------------------------===//
 
+#ifndef HLSLTEST_SUPPORT_WINERROR_H
+#define HLSLTEST_SUPPORT_WINERROR_H
+
 #include "llvm/Support/Error.h"
 
 namespace HR {
@@ -21,3 +24,5 @@ inline llvm::Error toError(HRESULT HR, llvm::StringRef Msg) {
   return llvm::Error::success();
 }
 } // namespace HR
+
+#endif // #ifndef HLSLTEST_SUPPORT_WINERROR_H

include/WinError.h renamed to include/Support/WinError.h

@@ -23,12 +23,11 @@ endif()
 add_hlsl_library(API
   Capabilities.cpp
   Device.cpp
-  Pipeline.cpp
   ${api_sources})
 
 target_include_directories(HLSLTestAPI SYSTEM BEFORE ${api_headers})
 
-target_link_libraries(HLSLTestAPI INTERFACE ${api_libraries})
+target_link_libraries(HLSLTestAPI INTERFACE HLSLTestSupport ${api_libraries})
 if (TARGET DIRECTX_HEADERS)
   add_dependencies(HLSLTestAPI DIRECTX_HEADERS)
 endif()

lib/API/CMakeLists.txt

@@ -24,8 +24,8 @@
 #include "DXFeatures.h"
 #include "API/Capabilities.h"
 #include "API/Device.h"
-#include "API/Pipeline.h"
-#include "WinError.h"
+#include "Support/Pipeline.h"
+#include "Support/WinError.h"
 
 #include "llvm/ADT/SmallVector.h"
 #include "llvm/Support/Error.h"

lib/API/DX/Device.cpp

@@ -10,7 +10,7 @@
 #include "metal_irconverter_runtime.h"
 
 #include "API/Device.h"
-#include "API/Pipeline.h"
+#include "Support/Pipeline.h"
 
 #include "llvm/ADT/SmallString.h"
 #include "llvm/Support/Error.h"

lib/API/MTL/MTLDevice.cpp

@@ -1 +1,2 @@
 add_subdirectory(API)
+add_subdirectory(Support)

lib/CMakeLists.txt

@@ -0,0 +1 @@
+add_hlsl_library(Support Pipeline.cpp)

lib/Support/CMakeLists.txt

@@ -1,4 +1,4 @@
-//===- Pipeline.cpp - HLSL API Pipeline API -------------------------------===//
+//===- Pipeline.cpp - Support Pipeline API --------------------------------===//
 //
 // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
 // See https://llvm.org/LICENSE.txt for license information.
@@ -9,7 +9,7 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include "API/Pipeline.h"
+#include "Support/Pipeline.h"
 
 using namespace hlsltest;
 

lib/API/Pipeline.cpp renamed to lib/Support/Pipeline.cpp

@@ -4,4 +4,4 @@ add_hlsl_tool(offloader
 
 target_include_directories(offloader PRIVATE SYSTEM BEFORE "${HLSLTEST_BINARY_DIR}/third-party/libpng/")
 
-target_link_libraries(offloader PRIVATE LLVMSupport HLSLTestAPI png_static)
+target_link_libraries(offloader PRIVATE LLVMSupport HLSLTestAPI HLSLTestSupport png_static)

tools/offloader/CMakeLists.txt

@@ -9,7 +9,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include "API/Pipeline.h"
+#include "Support/Pipeline.h"
+
 #include "llvm/ADT/ScopeExit.h"
 #include "llvm/ADT/StringRef.h"
 #include "llvm/Support/Error.h"