Skip to content

Commit

Permalink
Merge pull request #5067 from pow2clk/cp-release-1.7.2212
Browse files Browse the repository at this point in the history
Move WinAdapter into interface directory (#5066)
  • Loading branch information
pow2clk authored Mar 1, 2023
2 parents f949bca + d3baa77 commit e043f4a
Show file tree
Hide file tree
Showing 36 changed files with 34 additions and 35 deletions.
1 change: 0 additions & 1 deletion CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -608,7 +608,6 @@ endif()

include_directories( ${LLVM_INCLUDE_DIR} ${LLVM_MAIN_INCLUDE_DIR})

include_directories( ${LLVM_MAIN_INCLUDE_DIR}/dxc/Support) # HLSL Change
include_directories( ${LLVM_INCLUDE_DIR}/dxc/Tracing) # HLSL Change

# when crosscompiling import the executable targets from a file
Expand Down
2 changes: 1 addition & 1 deletion include/dxc/DxilContainer/DxilContainer.h
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
#include <stdint.h>
#include <iterator>
#include "dxc/DXIL/DxilConstants.h"
#include "dxc/Support/WinAdapter.h"
#include "dxc/WinAdapter.h"

struct IDxcContainerReflection;

Expand Down
2 changes: 1 addition & 1 deletion include/dxc/DxilContainer/DxilPipelineStateValidation.h
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@

#include <stdint.h>
#include <cstring>
#include "dxc/Support/WinAdapter.h"
#include "dxc/WinAdapter.h"

// Don't include assert.h here.
// Since this header is included from multiple environments,
Expand Down
2 changes: 1 addition & 1 deletion include/dxc/DxilContainer/DxilRuntimeReflection.h
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
#pragma once

#include "dxc/DXIL/DxilConstants.h"
#include "dxc/Support/WinAdapter.h"
#include "dxc/WinAdapter.h"

#define RDAT_NULL_REF ((uint32_t)0xFFFFFFFF)

Expand Down
2 changes: 1 addition & 1 deletion include/dxc/DxilRootSignature/DxilRootSignature.h
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@

#include <stdint.h>

#include "dxc/Support/WinAdapter.h"
#include "dxc/WinAdapter.h"
#include "dxc/DXIL/DxilConstants.h"

struct IDxcBlob;
Expand Down
2 changes: 1 addition & 1 deletion include/dxc/HLSL/DxilValidation.h
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@

#include "dxc/Support/Global.h"
#include "dxc/DXIL/DxilConstants.h"
#include "dxc/Support/WinAdapter.h"
#include "dxc/WinAdapter.h"
#include <memory>

namespace llvm {
Expand Down
2 changes: 1 addition & 1 deletion include/dxc/Support/Global.h
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ typedef _Return_type_success_(return >= 0) long HRESULT;
#include <stdarg.h>
#include <system_error>
#include "dxc/Support/exception.h"
#include "dxc/Support/WinAdapter.h"
#include "dxc/WinAdapter.h"

///////////////////////////////////////////////////////////////////////////////
// Memory allocation support.
Expand Down
2 changes: 1 addition & 1 deletion include/dxc/Support/WinFunctions.h
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@

#ifndef _WIN32

#include "dxc/Support/WinAdapter.h"
#include "dxc/WinAdapter.h"

HRESULT StringCchCopyEx(LPSTR pszDest, size_t cchDest, LPCSTR pszSrc,
LPSTR *ppszDestEnd, size_t *pcchRemaining, DWORD dwFlags);
Expand Down
2 changes: 1 addition & 1 deletion include/dxc/Support/WinIncludes.h
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ template <class T> void swap(CComHeapPtr<T> &a, CComHeapPtr<T> &b) {

#else // _MSC_VER

#include "dxc/Support/WinAdapter.h"
#include "dxc/WinAdapter.h"

#ifdef __cplusplus
// Define operator overloads to enable bit operations on enum values that are
Expand Down
2 changes: 1 addition & 1 deletion include/dxc/Support/exception.h
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
#pragma once

#include "dxc/Support/ErrorCodes.h"
#include "dxc/Support/WinAdapter.h"
#include "dxc/WinAdapter.h"
#include <exception>
#include <string>

Expand Down
2 changes: 1 addition & 1 deletion include/dxc/Test/WEXAdapter.h
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
#include <unistd.h>
#include <wchar.h>

#include "dxc/Support/WinAdapter.h"
#include "dxc/WinAdapter.h"
#include "dxc/Support/WinFunctions.h"
#include "gtest/gtest.h"

Expand Down
File renamed without changes.
2 changes: 1 addition & 1 deletion include/llvm-c/Core.h
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
#ifndef LLVM_C_CORE_H
#define LLVM_C_CORE_H

#include "dxc/Support/WinAdapter.h" // HLSL Change
#include "dxc/WinAdapter.h" // HLSL Change
#include "llvm-c/Support.h"

#ifdef __cplusplus
Expand Down
2 changes: 1 addition & 1 deletion include/llvm-c/Disassembler.h
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
#ifndef LLVM_C_DISASSEMBLER_H
#define LLVM_C_DISASSEMBLER_H

#include "dxc/Support/WinAdapter.h" // HLSL Change
#include "dxc/WinAdapter.h" // HLSL Change
#include "llvm/Support/DataTypes.h"
#include <stddef.h>

Expand Down
2 changes: 1 addition & 1 deletion include/llvm/ADT/STLExtras.h
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
#ifndef LLVM_ADT_STLEXTRAS_H
#define LLVM_ADT_STLEXTRAS_H

#include "dxc/Support/WinAdapter.h" // HLSL Change
#include "dxc/WinAdapter.h" // HLSL Change
#include "llvm/Support/Compiler.h"
#include <algorithm> // for std::all_of
#include <cassert>
Expand Down
2 changes: 1 addition & 1 deletion include/llvm/Analysis/ConstantFolding.h
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
#ifndef LLVM_ANALYSIS_CONSTANTFOLDING_H
#define LLVM_ANALYSIS_CONSTANTFOLDING_H

#include "dxc/Support/WinAdapter.h" // HLSL Change
#include "dxc/WinAdapter.h" // HLSL Change

namespace llvm {
class Constant;
Expand Down
2 changes: 1 addition & 1 deletion include/llvm/MC/MCStreamer.h
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
#ifndef LLVM_MC_MCSTREAMER_H
#define LLVM_MC_MCSTREAMER_H

#include "dxc/Support/WinAdapter.h" // HLSL Change
#include "dxc/WinAdapter.h" // HLSL Change
#include "llvm/ADT/ArrayRef.h"
#include "llvm/ADT/SmallVector.h"
#include "llvm/MC/MCDirectives.h"
Expand Down
2 changes: 1 addition & 1 deletion include/llvm/Support/ConvertUTF.h
Original file line number Diff line number Diff line change
Expand Up @@ -180,7 +180,7 @@ unsigned getNumBytesForUTF8(UTF8 firstByte);
/*************************************************************************/
/* Below are LLVM-specific wrappers of the functions above. */

#include "dxc/Support/WinAdapter.h" // HLSL Change
#include "dxc/WinAdapter.h" // HLSL Change
#include "llvm/ADT/ArrayRef.h"
#include "llvm/ADT/StringRef.h"

Expand Down
2 changes: 1 addition & 1 deletion include/llvm/Support/FileSystem.h
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
#ifndef LLVM_SUPPORT_FILESYSTEM_H
#define LLVM_SUPPORT_FILESYSTEM_H

#include "dxc/Support/WinAdapter.h" // HLSL Change
#include "dxc/WinAdapter.h" // HLSL Change
#include "llvm/ADT/IntrusiveRefCntPtr.h"
#include "llvm/ADT/SmallString.h"
#include "llvm/ADT/Twine.h"
Expand Down
2 changes: 1 addition & 1 deletion include/llvm/Support/Format.h
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
#ifndef LLVM_SUPPORT_FORMAT_H
#define LLVM_SUPPORT_FORMAT_H

#include "dxc/Support/WinAdapter.h" // HLSL Change
#include "dxc/WinAdapter.h" // HLSL Change
#include "llvm/ADT/STLExtras.h"
#include "llvm/ADT/StringRef.h"
#include "llvm/Support/DataTypes.h"
Expand Down
2 changes: 1 addition & 1 deletion include/llvm/Support/MathExtras.h
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
#ifndef LLVM_SUPPORT_MATHEXTRAS_H
#define LLVM_SUPPORT_MATHEXTRAS_H

#include "dxc/Support/WinAdapter.h" // HLSL Change
#include "dxc/WinAdapter.h" // HLSL Change
#include "llvm/Support/Compiler.h"
#include "llvm/Support/SwapByteOrder.h"
#include <cassert>
Expand Down
2 changes: 1 addition & 1 deletion include/llvm/TableGen/Main.h
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
#ifdef _WIN32
#include <sal.h>
#else
#include "dxc/Support/WinAdapter.h"
#include "dxc/WinAdapter.h"
#endif
// HLSL Change Ends

Expand Down
2 changes: 1 addition & 1 deletion lib/DXIL/DxilModule.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
#include "dxc/DXIL/DxilShaderModel.h"
#include "dxc/DXIL/DxilSignatureElement.h"
#include "dxc/DXIL/DxilFunctionProps.h"
#include "dxc/Support/WinAdapter.h"
#include "dxc/WinAdapter.h"
#include "dxc/DXIL/DxilEntryProps.h"
#include "dxc/DXIL/DxilSubobject.h"
#include "dxc/DXIL/DxilInstructions.h"
Expand Down
2 changes: 1 addition & 1 deletion lib/DXIL/DxilModuleHelper.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
#include "dxc/DXIL/DxilShaderModel.h"
#include "dxc/DXIL/DxilSignatureElement.h"
#include "dxc/DXIL/DxilFunctionProps.h"
#include "dxc/Support/WinAdapter.h"
#include "dxc/WinAdapter.h"
#include "dxc/DXIL/DxilEntryProps.h"
#include "dxc/DXIL/DxilSubobject.h"
#include "dxc/DXIL/DxilInstructions.h"
Expand Down
2 changes: 1 addition & 1 deletion lib/DxcSupport/WinAdapter.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@

#ifndef _WIN32

#include "dxc/Support/WinAdapter.h"
#include "dxc/WinAdapter.h"
#include "dxc/Support/WinFunctions.h"

//===--------------------------- CAllocator -------------------------------===//
Expand Down
2 changes: 1 addition & 1 deletion lib/DxilContainer/DxilContainerReader.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
///////////////////////////////////////////////////////////////////////////////

#include "dxc/Support/Global.h"
#include "dxc/Support/WinAdapter.h"
#include "dxc/WinAdapter.h"
#include "dxc/DxilContainer/DxilContainer.h"
#include "dxc/DxilContainer/DxilContainerReader.h"

Expand Down
2 changes: 1 addition & 1 deletion lib/HLSL/DxilContainerReflection.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@
#else
// Dummy D3D11 struct to allow nix-dead code to compile
struct D3D11_SHADER_INPUT_BIND_DESC {int dummy;};
#include "dxc/Support/WinAdapter.h"
#include "dxc/WinAdapter.h"
#endif

#include "dxc/DxilContainer/DxilRuntimeReflection.h"
Expand Down
2 changes: 1 addition & 1 deletion lib/HLSL/HLModule.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
#include "dxc/HLSL/HLModule.h"
#include "dxc/DXIL/DxilTypeSystem.h"
#include "dxc/DXIL/DxilUtil.h"
#include "dxc/Support/WinAdapter.h"
#include "dxc/WinAdapter.h"

#include "llvm/ADT/STLExtras.h"
#include "llvm/IR/Constants.h"
Expand Down
2 changes: 1 addition & 1 deletion lib/MSSupport/MSFileSystemImpl.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
#include <new>

#include "dxc/Support/WinIncludes.h"
#include "dxc/Support/WinAdapter.h"
#include "dxc/WinAdapter.h"
#include "llvm/Support/MSFileSystem.h"

///////////////////////////////////////////////////////////////////////////////////////////////////
Expand Down
2 changes: 1 addition & 1 deletion lib/Support/ConvertUTFWrapper.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
//
//===----------------------------------------------------------------------===//

#include "dxc/Support/WinAdapter.h" // HLSL Change
#include "dxc/WinAdapter.h" // HLSL Change
#include "llvm/Support/ConvertUTF.h"
#include "llvm/Support/SwapByteOrder.h"
#include <string>
Expand Down
2 changes: 1 addition & 1 deletion lib/Support/regerror.c
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@

#include "regutils.h"

#include "dxc/Support/WinAdapter.h" // HLSL Change
#include "dxc/WinAdapter.h" // HLSL Change

#ifdef _MSC_VER
#define snprintf _snprintf
Expand Down
2 changes: 1 addition & 1 deletion lib/Support/regex_impl.h
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@
#ifndef _REGEX_IMPL_H_ // HLSL Change
#define _REGEX_IMPL_H_ // HLSL Change

#include "dxc/Support/WinAdapter.h" // HLSL Change
#include "dxc/WinAdapter.h" // HLSL Change
#include <sys/types.h>

typedef off_t llvm_regoff_t;
Expand Down
2 changes: 1 addition & 1 deletion tools/clang/include/clang/AST/HlslTypes.h
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
#include "clang/Basic/SourceLocation.h"
#include "clang/Basic/Specifiers.h"
#include "dxc/DXIL/DxilConstants.h"
#include "dxc/Support/WinAdapter.h"
#include "dxc/WinAdapter.h"
#include "llvm/Support/Casting.h"
#include "llvm/ADT/ArrayRef.h"
#include "llvm/ADT/Optional.h"
Expand Down
2 changes: 1 addition & 1 deletion tools/clang/lib/Sema/SemaHLSL.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@
#include "llvm/Support/raw_ostream.h"
#include "dxc/Support/Global.h"
#include "dxc/Support/WinIncludes.h"
#include "dxc/Support/WinAdapter.h"
#include "dxc/WinAdapter.h"
#include "dxc/dxcapi.internal.h"
#include "dxc/HlslIntrinsicOp.h"
#include "gen_intrin_main_tables_15.h"
Expand Down
2 changes: 1 addition & 1 deletion tools/clang/tools/dxcompiler/dxillib.h
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
#ifndef __DXC_DXILLIB__
#define __DXC_DXILLIB__

#include "dxc/Support/WinAdapter.h"
#include "dxc/WinAdapter.h"
#include "dxc/Support/WinIncludes.h"

// Initialize Dxil library.
Expand Down
2 changes: 1 addition & 1 deletion tools/clang/unittests/HLSL/HLSLTestOptions.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@

#include "HLSLTestOptions.h"
#include "dxc/Test/WEXAdapter.h"
#include "dxc/Support/WinAdapter.h"
#include "dxc/WinAdapter.h"

namespace clang {
namespace hlsl {
Expand Down

0 comments on commit e043f4a

Please sign in to comment.