Remove HLSLTest include directory

llvm-beanz · llvm-beanz · commit 5279e1146a51 · 2024-12-21T13:26:55.000-06:00
This just removes the HLSLTest subdirectory from the include structure.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -64,8 +64,8 @@ if (NOT HLSLTEST_ENABLE_VULKAN AND NOT HLSLTEST_ENABLE_D3D12 AND NOT APPLE)
 endif ()
 
 configure_file(
-  ${CMAKE_CURRENT_SOURCE_DIR}/include/HLSLTest/Config.h.in
-  ${CMAKE_CURRENT_BINARY_DIR}/include/HLSLTest/Config.h)
+  ${CMAKE_CURRENT_SOURCE_DIR}/include/Config.h.in
+  ${CMAKE_CURRENT_BINARY_DIR}/include/Config.h)
 
 set(DIRECTX_HEADERS_PATH ${CMAKE_CURRENT_SOURCE_DIR}/third-party/DirectX-Headers)
 
diff --git a/include/API/API.h b/include/API/API.h
diff --git a/include/API/Capabilities.h b/include/API/Capabilities.h
diff --git a/include/API/Device.h b/include/API/Device.h
@@ -12,8 +12,8 @@
 #ifndef HLSLTEST_API_DEVICE_H
 #define HLSLTEST_API_DEVICE_H
 
-#include "HLSLTest/API/API.h"
-#include "HLSLTest/API/Capabilities.h"
+#include "API/API.h"
+#include "API/Capabilities.h"
 #include "llvm/ADT/iterator_range.h"
 #include "llvm/ADT/StringRef.h"
 
diff --git a/include/API/Pipeline.h b/include/API/Pipeline.h
diff --git a/include/Config.h.in b/include/Config.h.in
diff --git a/include/WinError.h b/include/WinError.h
diff --git a/lib/API/Capabilities.cpp b/lib/API/Capabilities.cpp
@@ -9,12 +9,12 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include "HLSLTest/API/Capabilities.h"
+#include "API/Capabilities.h"
 
 using namespace hlsltest;
 
 char CapabilityValueBase::ID = 0;
 char CapabilityValueBool::ID = 0;
 char CapabilityValueUnsigned::ID = 0;
 
-void CapabilityValueBase::anchor() {}
+void CapabilityValueBase::anchor() {}
diff --git a/lib/API/DX/DXFeatures.h b/lib/API/DX/DXFeatures.h
@@ -12,7 +12,7 @@
 #ifndef HLSLTEST_API_DXFEATURES_H
 #define HLSLTEST_API_DXFEATURES_H
 
-#include "HLSLTest/API/Capabilities.h"
+#include "API/Capabilities.h"
 #include "llvm/ADT/ArrayRef.h"
 
 namespace llvm {
@@ -44,4 +44,4 @@ template <> struct CapabilityPrinter<directx::RootSignature> {
 
 } // namespace hlsltest
 
-#endif // HLSLTEST_API_DXFEATURES_H
+#endif // HLSLTEST_API_DXFEATURES_H
diff --git a/lib/API/DX/Device.cpp b/lib/API/DX/Device.cpp
@@ -22,10 +22,10 @@
 #undef min
 
 #include "DXFeatures.h"
-#include "HLSLTest/API/Capabilities.h"
-#include "HLSLTest/API/Device.h"
-#include "HLSLTest/API/Pipeline.h"
-#include "HLSLTest/WinError.h"
+#include "API/Capabilities.h"
+#include "API/Device.h"
+#include "API/Pipeline.h"
+#include "WinError.h"
 
 #include "llvm/ADT/SmallVector.h"
 #include "llvm/Support/Error.h"
diff --git a/lib/API/Device.cpp b/lib/API/Device.cpp
@@ -9,8 +9,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include "HLSLTest/API/Device.h"
-#include "HLSLTest/Config.h"
+#include "API/Device.h"
+#include "Config.h"
 #include "llvm/Support/Error.h"
 
 using namespace hlsltest;
diff --git a/lib/API/MTL/MTLDevice.cpp b/lib/API/MTL/MTLDevice.cpp
@@ -9,8 +9,8 @@
 #define IR_PRIVATE_IMPLEMENTATION
 #include "metal_irconverter_runtime.h"
 
-#include "HLSLTest/API/Device.h"
-#include "HLSLTest/API/Pipeline.h"
+#include "API/Device.h"
+#include "API/Pipeline.h"
 
 #include "llvm/ADT/SmallString.h"
 #include "llvm/Support/Error.h"
diff --git a/lib/API/Pipeline.cpp b/lib/API/Pipeline.cpp
@@ -9,7 +9,7 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include "HLSLTest/API/Pipeline.h"
+#include "API/Pipeline.h"
 
 using namespace hlsltest;
 
diff --git a/lib/API/VK/Device.cpp b/lib/API/VK/Device.cpp
@@ -9,8 +9,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include "HLSLTest/API/Device.h"
-#include "HLSLTest/API/Pipeline.h"
+#include "API/Device.h"
+#include "API/Pipeline.h"
 #include "llvm/Support/Error.h"
 
 #include <memory>
diff --git a/tools/api-query/api-query.cpp b/tools/api-query/api-query.cpp
@@ -9,8 +9,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include "HLSLTest/API/Capabilities.h"
-#include "HLSLTest/API/Device.h"
+#include "API/Capabilities.h"
+#include "API/Device.h"
 #include "llvm/Support/CommandLine.h"
 #include "llvm/Support/Debug.h"
 #include "llvm/Support/Error.h"
diff --git a/tools/offloader/WritePNG.cpp b/tools/offloader/WritePNG.cpp
@@ -9,7 +9,7 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include "HLSLTest/API/Pipeline.h"
+#include "API/Pipeline.h"
 #include "llvm/ADT/ScopeExit.h"
 #include "llvm/ADT/StringRef.h"
 #include "llvm/Support/Error.h"
diff --git a/tools/offloader/offloader.cpp b/tools/offloader/offloader.cpp
@@ -9,10 +9,10 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include "HLSLTest/API/API.h"
-#include "HLSLTest/API/Device.h"
-#include "HLSLTest/API/Pipeline.h"
-#include "HLSLTest/Config.h"
+#include "API/API.h"
+#include "API/Device.h"
+#include "API/Pipeline.h"
+#include "Config.h"
 #include "llvm/Support/CommandLine.h"
 #include "llvm/Support/Debug.h"
 #include "llvm/Support/Error.h"
