Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Remove unnecessary trailing whitespace in files touched by #3062 #3272

Merged
merged 1 commit into from
Nov 19, 2020
Merged

Remove unnecessary trailing whitespace in files touched by #3062 #3272

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion include/dxc/dxcapi.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ typedef HRESULT(__stdcall *DxcCreateInstance2Proc)(
/// The CLSID associated with the data and code that will be used to create the object.
/// </param>
/// <param name="riid">
/// A reference to the identifier of the interface to be used to communicate
/// A reference to the identifier of the interface to be used to communicate
/// with the object.
/// </param>
/// <param name="ppv">
Expand Down
2 changes: 1 addition & 1 deletion include/dxc/dxcapi.internal.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -138,7 +138,7 @@ IDxcIntrinsicTable : public IUnknown

// Get the lowering strategy for an hlsl extension intrinsic.
virtual HRESULT STDMETHODCALLTYPE GetLoweringStrategy(UINT opcode, LPCSTR *pStrategy) = 0;

// Callback to support custom naming of hlsl extension intrinsic functions in dxil.
// Return the empty string to get the default intrinsic name, which is the mangled
// name of the high level intrinsic function.
Expand Down
4 changes: 2 additions & 2 deletions include/dxc/dxctools.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,9 +68,9 @@ IDxcRewriter2 : public IDxcRewriter {

virtual HRESULT STDMETHODCALLTYPE RewriteWithOptions(_In_ IDxcBlobEncoding *pSource,
// Optional file name for pSource. Used in errors and include handlers.
_In_opt_ LPCWSTR pSourceName,
_In_opt_ LPCWSTR pSourceName,
// Compiler arguments
_In_count_(argCount) LPCWSTR *pArguments, _In_ UINT32 argCount,
_In_count_(argCount) LPCWSTR *pArguments, _In_ UINT32 argCount,
// Defines
_In_count_(defineCount) DxcDefine *pDefines, _In_ UINT32 defineCount,
// user-provided interface to handle #include directives (optional)
Expand Down
6 changes: 3 additions & 3 deletions lib/HLSL/DxilContainerReflection.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -390,7 +390,7 @@ HRESULT DxilContainerReflection::GetPartReflection(UINT32 idx, REFIID iid, void
}
}
}

const DxilProgramHeader *pProgramHeader =
reinterpret_cast<const DxilProgramHeader*>(GetDxilPartData(pPart));
if (!IsValidDxilProgramHeader(pProgramHeader, pPart->PartSize)) {
Expand Down Expand Up @@ -2566,9 +2566,9 @@ HRESULT CFunctionReflection::GetDesc(D3D12_FUNCTION_DESC *pDesc) {
pDesc->BoundResources = (UINT)m_UsedResources.size();

//Unset: UINT InstructionCount; // Number of emitted instructions
//Unset: UINT TempRegisterCount; // Number of temporary registers used
//Unset: UINT TempRegisterCount; // Number of temporary registers used
//Unset: UINT TempArrayCount; // Number of temporary arrays used
//Unset: UINT DefCount; // Number of constant defines
//Unset: UINT DefCount; // Number of constant defines
//Unset: UINT DclCount; // Number of declarations (input + output)
//Unset: UINT TextureNormalInstructions; // Number of non-categorized texture instructions
//Unset: UINT TextureLoadInstructions; // Number of texture load instructions
Expand Down
2 changes: 1 addition & 1 deletion tools/clang/tools/dxcompiler/dxcapi.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,7 @@ HRESULT CreateDxcContainerReflection(_In_ REFIID riid, _Out_ LPVOID *ppv) {
}

HRESULT CreateDxcContainerBuilder(_In_ REFIID riid, _Out_ LPVOID *ppv) {
// Call dxil.dll's containerbuilder
// Call dxil.dll's containerbuilder
*ppv = nullptr;
const char *warning;
HRESULT hr = DxilLibCreateInstance(CLSID_DxcContainerBuilder, (IDxcContainerBuilder**)ppv);
Expand Down
6 changes: 3 additions & 3 deletions tools/clang/tools/dxcompiler/dxcompilerobj.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -367,7 +367,7 @@ class HLSLExtensionsCodegenHelperImpl : public HLSLExtensionsCodegenHelper {
virtual std::string GetIntrinsicName(UINT opcode) override {
return m_langExtensionsHelper.GetIntrinsicName(opcode);
}

virtual bool GetDxilOpcode(UINT opcode, OP::OpCode &dxilOpcode) override {
UINT dop = static_cast<UINT>(OP::OpCode::NumOpCodes);
if (m_langExtensionsHelper.GetDxilOpCode(opcode, dop)) {
Expand Down Expand Up @@ -436,7 +436,7 @@ class DxcCompiler : public IDxcCompiler3,

HRESULT STDMETHODCALLTYPE RegisterDxilContainerEventHandler(IDxcContainerEventsHandler *pHandler, UINT64 *pCookie) override {
DXASSERT(m_pDxcContainerEventsHandler == nullptr, "else events handler is already registered");
*pCookie = 1; // Only one EventsHandler supported
*pCookie = 1; // Only one EventsHandler supported
m_pDxcContainerEventsHandler = pHandler;
return S_OK;
};
Expand Down Expand Up @@ -965,7 +965,7 @@ class DxcCompiler : public IDxcCompiler3,

HRESULT hr = S_OK;
DxcEtw_DXCompilerDisassemble_Start();
DxcThreadMalloc TM(m_pMalloc);
DxcThreadMalloc TM(m_pMalloc);
try {
DefaultFPEnvScope fpEnvScope;

Expand Down