Skip to content

Commit e043f4a

Browse files
pow2clkpow2clk
authored
Merge pull request #5067 from pow2clk/cp-release-1.7.2212
Move WinAdapter into interface directory (#5066)
2 parents f949bca + d3baa77 commit e043f4a

36 files changed

+34
-35
lines changed

‎CMakeLists.txt

-1
Original file line numberDiff line numberDiff line change
@@ -608,7 +608,6 @@ endif()
608608

609609
include_directories( ${LLVM_INCLUDE_DIR} ${LLVM_MAIN_INCLUDE_DIR})
610610

611-
include_directories( ${LLVM_MAIN_INCLUDE_DIR}/dxc/Support) # HLSL Change
612611
include_directories( ${LLVM_INCLUDE_DIR}/dxc/Tracing) # HLSL Change
613612

614613
# when crosscompiling import the executable targets from a file

‎include/dxc/DxilContainer/DxilContainer.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
#include <stdint.h>
1818
#include <iterator>
1919
#include "dxc/DXIL/DxilConstants.h"
20-
#include "dxc/Support/WinAdapter.h"
20+
#include "dxc/WinAdapter.h"
2121

2222
struct IDxcContainerReflection;
2323

‎include/dxc/DxilContainer/DxilPipelineStateValidation.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414

1515
#include <stdint.h>
1616
#include <cstring>
17-
#include "dxc/Support/WinAdapter.h"
17+
#include "dxc/WinAdapter.h"
1818

1919
// Don't include assert.h here.
2020
// Since this header is included from multiple environments,

‎include/dxc/DxilContainer/DxilRuntimeReflection.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
#pragma once
1313

1414
#include "dxc/DXIL/DxilConstants.h"
15-
#include "dxc/Support/WinAdapter.h"
15+
#include "dxc/WinAdapter.h"
1616

1717
#define RDAT_NULL_REF ((uint32_t)0xFFFFFFFF)
1818

‎include/dxc/DxilRootSignature/DxilRootSignature.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616

1717
#include <stdint.h>
1818

19-
#include "dxc/Support/WinAdapter.h"
19+
#include "dxc/WinAdapter.h"
2020
#include "dxc/DXIL/DxilConstants.h"
2121

2222
struct IDxcBlob;

‎include/dxc/HLSL/DxilValidation.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313

1414
#include "dxc/Support/Global.h"
1515
#include "dxc/DXIL/DxilConstants.h"
16-
#include "dxc/Support/WinAdapter.h"
16+
#include "dxc/WinAdapter.h"
1717
#include <memory>
1818

1919
namespace llvm {

‎include/dxc/Support/Global.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ typedef _Return_type_success_(return >= 0) long HRESULT;
2727
#include <stdarg.h>
2828
#include <system_error>
2929
#include "dxc/Support/exception.h"
30-
#include "dxc/Support/WinAdapter.h"
30+
#include "dxc/WinAdapter.h"
3131

3232
///////////////////////////////////////////////////////////////////////////////
3333
// Memory allocation support.

‎include/dxc/Support/WinFunctions.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717

1818
#ifndef _WIN32
1919

20-
#include "dxc/Support/WinAdapter.h"
20+
#include "dxc/WinAdapter.h"
2121

2222
HRESULT StringCchCopyEx(LPSTR pszDest, size_t cchDest, LPCSTR pszSrc,
2323
LPSTR *ppszDestEnd, size_t *pcchRemaining, DWORD dwFlags);

‎include/dxc/Support/WinIncludes.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ template <class T> void swap(CComHeapPtr<T> &a, CComHeapPtr<T> &b) {
5959

6060
#else // _MSC_VER
6161

62-
#include "dxc/Support/WinAdapter.h"
62+
#include "dxc/WinAdapter.h"
6363

6464
#ifdef __cplusplus
6565
// Define operator overloads to enable bit operations on enum values that are

‎include/dxc/Support/exception.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
#pragma once
1212

1313
#include "dxc/Support/ErrorCodes.h"
14-
#include "dxc/Support/WinAdapter.h"
14+
#include "dxc/WinAdapter.h"
1515
#include <exception>
1616
#include <string>
1717

‎include/dxc/Test/WEXAdapter.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
#include <unistd.h>
77
#include <wchar.h>
88

9-
#include "dxc/Support/WinAdapter.h"
9+
#include "dxc/WinAdapter.h"
1010
#include "dxc/Support/WinFunctions.h"
1111
#include "gtest/gtest.h"
1212

‎include/dxc/Support/WinAdapter.h ‎include/dxc/WinAdapter.h

File renamed without changes.

‎include/llvm-c/Core.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
#ifndef LLVM_C_CORE_H
1616
#define LLVM_C_CORE_H
1717

18-
#include "dxc/Support/WinAdapter.h" // HLSL Change
18+
#include "dxc/WinAdapter.h" // HLSL Change
1919
#include "llvm-c/Support.h"
2020

2121
#ifdef __cplusplus

‎include/llvm-c/Disassembler.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
#ifndef LLVM_C_DISASSEMBLER_H
1616
#define LLVM_C_DISASSEMBLER_H
1717

18-
#include "dxc/Support/WinAdapter.h" // HLSL Change
18+
#include "dxc/WinAdapter.h" // HLSL Change
1919
#include "llvm/Support/DataTypes.h"
2020
#include <stddef.h>
2121

‎include/llvm/ADT/STLExtras.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
#ifndef LLVM_ADT_STLEXTRAS_H
1818
#define LLVM_ADT_STLEXTRAS_H
1919

20-
#include "dxc/Support/WinAdapter.h" // HLSL Change
20+
#include "dxc/WinAdapter.h" // HLSL Change
2121
#include "llvm/Support/Compiler.h"
2222
#include <algorithm> // for std::all_of
2323
#include <cassert>

‎include/llvm/Analysis/ConstantFolding.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
#ifndef LLVM_ANALYSIS_CONSTANTFOLDING_H
2121
#define LLVM_ANALYSIS_CONSTANTFOLDING_H
2222

23-
#include "dxc/Support/WinAdapter.h" // HLSL Change
23+
#include "dxc/WinAdapter.h" // HLSL Change
2424

2525
namespace llvm {
2626
class Constant;

‎include/llvm/MC/MCStreamer.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
#ifndef LLVM_MC_MCSTREAMER_H
1515
#define LLVM_MC_MCSTREAMER_H
1616

17-
#include "dxc/Support/WinAdapter.h" // HLSL Change
17+
#include "dxc/WinAdapter.h" // HLSL Change
1818
#include "llvm/ADT/ArrayRef.h"
1919
#include "llvm/ADT/SmallVector.h"
2020
#include "llvm/MC/MCDirectives.h"

‎include/llvm/Support/ConvertUTF.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -180,7 +180,7 @@ unsigned getNumBytesForUTF8(UTF8 firstByte);
180180
/*************************************************************************/
181181
/* Below are LLVM-specific wrappers of the functions above. */
182182

183-
#include "dxc/Support/WinAdapter.h" // HLSL Change
183+
#include "dxc/WinAdapter.h" // HLSL Change
184184
#include "llvm/ADT/ArrayRef.h"
185185
#include "llvm/ADT/StringRef.h"
186186

‎include/llvm/Support/FileSystem.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727
#ifndef LLVM_SUPPORT_FILESYSTEM_H
2828
#define LLVM_SUPPORT_FILESYSTEM_H
2929

30-
#include "dxc/Support/WinAdapter.h" // HLSL Change
30+
#include "dxc/WinAdapter.h" // HLSL Change
3131
#include "llvm/ADT/IntrusiveRefCntPtr.h"
3232
#include "llvm/ADT/SmallString.h"
3333
#include "llvm/ADT/Twine.h"

‎include/llvm/Support/Format.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
#ifndef LLVM_SUPPORT_FORMAT_H
2424
#define LLVM_SUPPORT_FORMAT_H
2525

26-
#include "dxc/Support/WinAdapter.h" // HLSL Change
26+
#include "dxc/WinAdapter.h" // HLSL Change
2727
#include "llvm/ADT/STLExtras.h"
2828
#include "llvm/ADT/StringRef.h"
2929
#include "llvm/Support/DataTypes.h"

‎include/llvm/Support/MathExtras.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
#ifndef LLVM_SUPPORT_MATHEXTRAS_H
1515
#define LLVM_SUPPORT_MATHEXTRAS_H
1616

17-
#include "dxc/Support/WinAdapter.h" // HLSL Change
17+
#include "dxc/WinAdapter.h" // HLSL Change
1818
#include "llvm/Support/Compiler.h"
1919
#include "llvm/Support/SwapByteOrder.h"
2020
#include <cassert>

‎include/llvm/TableGen/Main.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
#ifdef _WIN32
1919
#include <sal.h>
2020
#else
21-
#include "dxc/Support/WinAdapter.h"
21+
#include "dxc/WinAdapter.h"
2222
#endif
2323
// HLSL Change Ends
2424

‎lib/DXIL/DxilModule.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
#include "dxc/DXIL/DxilShaderModel.h"
1515
#include "dxc/DXIL/DxilSignatureElement.h"
1616
#include "dxc/DXIL/DxilFunctionProps.h"
17-
#include "dxc/Support/WinAdapter.h"
17+
#include "dxc/WinAdapter.h"
1818
#include "dxc/DXIL/DxilEntryProps.h"
1919
#include "dxc/DXIL/DxilSubobject.h"
2020
#include "dxc/DXIL/DxilInstructions.h"

‎lib/DXIL/DxilModuleHelper.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
#include "dxc/DXIL/DxilShaderModel.h"
1515
#include "dxc/DXIL/DxilSignatureElement.h"
1616
#include "dxc/DXIL/DxilFunctionProps.h"
17-
#include "dxc/Support/WinAdapter.h"
17+
#include "dxc/WinAdapter.h"
1818
#include "dxc/DXIL/DxilEntryProps.h"
1919
#include "dxc/DXIL/DxilSubobject.h"
2020
#include "dxc/DXIL/DxilInstructions.h"

‎lib/DxcSupport/WinAdapter.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99

1010
#ifndef _WIN32
1111

12-
#include "dxc/Support/WinAdapter.h"
12+
#include "dxc/WinAdapter.h"
1313
#include "dxc/Support/WinFunctions.h"
1414

1515
//===--------------------------- CAllocator -------------------------------===//

‎lib/DxilContainer/DxilContainerReader.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
///////////////////////////////////////////////////////////////////////////////
1111

1212
#include "dxc/Support/Global.h"
13-
#include "dxc/Support/WinAdapter.h"
13+
#include "dxc/WinAdapter.h"
1414
#include "dxc/DxilContainer/DxilContainer.h"
1515
#include "dxc/DxilContainer/DxilContainerReader.h"
1616

‎lib/HLSL/DxilContainerReflection.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@
4242
#else
4343
// Dummy D3D11 struct to allow nix-dead code to compile
4444
struct D3D11_SHADER_INPUT_BIND_DESC {int dummy;};
45-
#include "dxc/Support/WinAdapter.h"
45+
#include "dxc/WinAdapter.h"
4646
#endif
4747

4848
#include "dxc/DxilContainer/DxilRuntimeReflection.h"

‎lib/HLSL/HLModule.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
#include "dxc/HLSL/HLModule.h"
1616
#include "dxc/DXIL/DxilTypeSystem.h"
1717
#include "dxc/DXIL/DxilUtil.h"
18-
#include "dxc/Support/WinAdapter.h"
18+
#include "dxc/WinAdapter.h"
1919

2020
#include "llvm/ADT/STLExtras.h"
2121
#include "llvm/IR/Constants.h"

‎lib/MSSupport/MSFileSystemImpl.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
#include <new>
2727

2828
#include "dxc/Support/WinIncludes.h"
29-
#include "dxc/Support/WinAdapter.h"
29+
#include "dxc/WinAdapter.h"
3030
#include "llvm/Support/MSFileSystem.h"
3131

3232
///////////////////////////////////////////////////////////////////////////////////////////////////

‎lib/Support/ConvertUTFWrapper.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
//
88
//===----------------------------------------------------------------------===//
99

10-
#include "dxc/Support/WinAdapter.h" // HLSL Change
10+
#include "dxc/WinAdapter.h" // HLSL Change
1111
#include "llvm/Support/ConvertUTF.h"
1212
#include "llvm/Support/SwapByteOrder.h"
1313
#include <string>

‎lib/Support/regerror.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@
4545

4646
#include "regutils.h"
4747

48-
#include "dxc/Support/WinAdapter.h" // HLSL Change
48+
#include "dxc/WinAdapter.h" // HLSL Change
4949

5050
#ifdef _MSC_VER
5151
#define snprintf _snprintf

‎lib/Support/regex_impl.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@
3838
#ifndef _REGEX_IMPL_H_ // HLSL Change
3939
#define _REGEX_IMPL_H_ // HLSL Change
4040

41-
#include "dxc/Support/WinAdapter.h" // HLSL Change
41+
#include "dxc/WinAdapter.h" // HLSL Change
4242
#include <sys/types.h>
4343

4444
typedef off_t llvm_regoff_t;

‎tools/clang/include/clang/AST/HlslTypes.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
#include "clang/Basic/SourceLocation.h"
2121
#include "clang/Basic/Specifiers.h"
2222
#include "dxc/DXIL/DxilConstants.h"
23-
#include "dxc/Support/WinAdapter.h"
23+
#include "dxc/WinAdapter.h"
2424
#include "llvm/Support/Casting.h"
2525
#include "llvm/ADT/ArrayRef.h"
2626
#include "llvm/ADT/Optional.h"

‎tools/clang/lib/Sema/SemaHLSL.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@
3636
#include "llvm/Support/raw_ostream.h"
3737
#include "dxc/Support/Global.h"
3838
#include "dxc/Support/WinIncludes.h"
39-
#include "dxc/Support/WinAdapter.h"
39+
#include "dxc/WinAdapter.h"
4040
#include "dxc/dxcapi.internal.h"
4141
#include "dxc/HlslIntrinsicOp.h"
4242
#include "gen_intrin_main_tables_15.h"

‎tools/clang/tools/dxcompiler/dxillib.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
#ifndef __DXC_DXILLIB__
1414
#define __DXC_DXILLIB__
1515

16-
#include "dxc/Support/WinAdapter.h"
16+
#include "dxc/WinAdapter.h"
1717
#include "dxc/Support/WinIncludes.h"
1818

1919
// Initialize Dxil library.

‎tools/clang/unittests/HLSL/HLSLTestOptions.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414

1515
#include "HLSLTestOptions.h"
1616
#include "dxc/Test/WEXAdapter.h"
17-
#include "dxc/Support/WinAdapter.h"
17+
#include "dxc/WinAdapter.h"
1818

1919
namespace clang {
2020
namespace hlsl {

0 commit comments

Comments
 (0)