microsoft
/
DirectXShaderCompiler
зеркало из https://github.com/microsoft/DirectXShaderCompiler.git
1
0
Форкнуть 0
Код Задачи Пакеты Проекты Релизы Вики Активность

[ClangCL] Cleanup rest clang-cl warnings (#5847) 

1. printf format mismatch.
2. avoid cast from CComPtr<IncludeHandlerVFSOverlayForTest> to
CComPtr<IDxcIncludeHandler>.
3. fix signed unsigned mismatch.
4. fix order of fields in constructor.
5. add override for override methods.
6. port
01f4209631
7. add copy assignment operator to avoid
-Wdeprecated-copy-with-user-provided-copy
8. disable -Wignored-qualifiers for taef header WexTestClass.h.
9. remove unused fields.
10. add -clang-cl for hctbuild.
This commit is contained in:
Xiang Li 2023-10-16 15:40:51 -04:00 коммит произвёл GitHub
Родитель 1306b0ce66
Коммит 956fa34b4f
Не найден ключ, соответствующий данной подписи
Идентификатор ключа GPG: 4AEE18F83AFDEB23
18 изменённых файлов: 110 добавлений и 103 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

6
include/dxc/Support/microcom.h
Просмотреть файл

@ -74,7 +74,9 @@ template <typename T> void DxcCallDestructor(T *obj) { obj->T::~T(); }
#define DXC_MICROCOM_REF_FIELD(m_dwRef) \
volatile std::atomic<llvm::sys::cas_flag> m_dwRef = {0};
#define DXC_MICROCOM_ADDREF_IMPL(m_dwRef) \
ULONG STDMETHODCALLTYPE AddRef() override { return (ULONG)++m_dwRef; }
ULONG STDMETHODCALLTYPE AddRef() noexcept override { \
return (ULONG)++m_dwRef; \
}
#define DXC_MICROCOM_ADDREF_RELEASE_IMPL(m_dwRef) \
DXC_MICROCOM_ADDREF_IMPL(m_dwRef) \
ULONG STDMETHODCALLTYPE Release() override { \
@ -107,7 +109,7 @@ inline T *CreateOnMalloc(IMalloc *pMalloc, Args &&...args) {
#define DXC_MICROCOM_TM_ADDREF_RELEASE_IMPL() \
DXC_MICROCOM_ADDREF_IMPL(m_dwRef) \
ULONG STDMETHODCALLTYPE Release() override { \
ULONG STDMETHODCALLTYPE Release() noexcept override { \
ULONG result = (ULONG)--m_dwRef; \
if (result == 0) { \
CComPtr<IMalloc> pTmp(m_pMalloc); \

11
include/dxc/Test/HlslTestUtils.h
Просмотреть файл

@ -19,7 +19,18 @@
#include <string>
#include <vector>
#ifdef _WIN32
// Disable -Wignored-qualifiers for WexTestClass.h.
// For const size_t GetSize() const; in TestData.h.
#ifdef __clang__
#pragma clang diagnostic push
#pragma clang diagnostic ignored "-Wignored-qualifiers"
#endif
#include "WexTestClass.h"
#ifdef __clang__
#pragma clang diagnostic pop
#endif
#include <dxgiformat.h>
#else
#include "WEXAdapter.h"

5
projects/dxilconv/include/ShaderBinary/ShaderBinary.h
Просмотреть файл

@ -239,6 +239,11 @@ class COperandBase {
public:
COperandBase() { Clear(); }
COperandBase(const COperandBase &Op) { memcpy(this, &Op, sizeof(*this)); }
COperandBase &operator=(const COperandBase &Op) {
if (this != &Op)
memcpy(this, &Op, sizeof(*this));
return *this;
}
D3D10_SB_OPERAND_TYPE OperandType() const { return m_Type; }
const COperandIndex *OperandIndex(UINT Index) const {
return &m_Index[Index];

9
tools/clang/lib/CodeGen/CGBuilder.h
Просмотреть файл

@ -22,9 +22,9 @@ class CodeGenFunction;
/// instructions.
template <bool PreserveNames>
class CGBuilderInserter
: protected llvm::IRBuilderDefaultInserter<PreserveNames> {
: protected llvm::IRBuilderDefaultInserter<PreserveNames> {
public:
CGBuilderInserter() : CGF(nullptr) {}
CGBuilderInserter() = default;
explicit CGBuilderInserter(CodeGenFunction *CGF) : CGF(CGF) {}
protected:
@ -32,10 +32,9 @@ protected:
void InsertHelper(llvm::Instruction *I, const llvm::Twine &Name,
llvm::BasicBlock *BB,
llvm::BasicBlock::iterator InsertPt) const;
private:
void operator=(const CGBuilderInserter &) = delete;
CodeGenFunction *CGF;
private:
CodeGenFunction *CGF = nullptr;
};
// Don't preserve names on values in an optimized build.

4
tools/clang/unittests/HLSL/AllocatorTest.cpp
Просмотреть файл

@ -9,9 +9,6 @@
///////////////////////////////////////////////////////////////////////////////
#include "dxc/Support/WinIncludes.h"
#ifdef _WIN32
#include "WexTestClass.h"
#endif
#include "dxc/Test/HlslTestUtils.h"
#include "dxc/HLSL/DxilSpanAllocator.h"
@ -104,6 +101,7 @@ bool Align(unsigned &pos, unsigned end, unsigned align) {
struct Element {
Element() = default;
Element(const Element &) = default;
Element &operator=(const Element &) = default;
Element(unsigned id, unsigned start, unsigned end)
: id(id), start(start), end(end) {}
bool operator<(const Element &other) { return id < other.id; }

3
tools/clang/unittests/HLSL/DXIsenseTest.cpp
Просмотреть файл

@ -13,9 +13,6 @@
#include "dxc/Test/HLSLTestData.h"
#include <stdint.h>
#ifdef _WIN32
#include "WexTestClass.h"
#endif
#include "dxc/Support/microcom.h"
#include "dxc/Test/HlslTestUtils.h"

3
tools/clang/unittests/HLSL/LinkerTest.cpp
Просмотреть файл

@ -18,9 +18,6 @@
#include <fstream>
#ifdef _WIN32
#include "WexTestClass.h"
#endif
#include "dxc/DxilContainer/DxilContainer.h"
#include "dxc/Support/Global.h" // for IFT macro
#include "dxc/Test/DxcTestUtils.h"

120
tools/clang/unittests/HLSL/MSFileSysTest.cpp
Просмотреть файл

@ -13,7 +13,6 @@
// Includes on Windows are highly order dependent.
#include <stdint.h>
#include "dxc/Support/WinIncludes.h"
#include "WexTestClass.h"
#include "dxc/Test/HlslTestUtils.h"
#include "llvm/Support/MSFileSystem.h"
@ -38,14 +37,15 @@ private: \
volatile std::atomic<llvm::sys::cas_flag> m_dwRef; \
\
public: \
ULONG STDMETHODCALLTYPE AddRef() { return (ULONG)++m_dwRef; } \
ULONG STDMETHODCALLTYPE Release() { \
ULONG STDMETHODCALLTYPE AddRef() override { return (ULONG)++m_dwRef; } \
ULONG STDMETHODCALLTYPE Release() override { \
ULONG result = (ULONG)--m_dwRef; \
if (result == 0) \
delete this; \
return result; \
} \
HRESULT STDMETHODCALLTYPE QueryInterface(REFIID iid, void **ppvObject) { \
HRESULT STDMETHODCALLTYPE QueryInterface(REFIID iid, void **ppvObject) \
override { \
if (ppvObject == nullptr) \
return E_POINTER; \
if (IsEqualIID(iid, __uuidof(IUnknown)) || \
@ -100,12 +100,12 @@ public:
m_items[i].pwcsName = CoTaskMemDup(m_items[i].pwcsName);
}
}
~FixedEnumSTATSTG() {
virtual ~FixedEnumSTATSTG() {
for (auto &item : m_items)
CoTaskMemFree(item.pwcsName);
}
virtual HRESULT STDMETHODCALLTYPE Next(ULONG celt, STATSTG *rgelt,
ULONG *pceltFetched) {
HRESULT STDMETHODCALLTYPE Next(ULONG celt, STATSTG *rgelt,
ULONG *pceltFetched) override {
if (celt != 1 || pceltFetched == nullptr)
return E_NOTIMPL;
if (m_index >= m_items.size()) {
@ -119,22 +119,20 @@ public:
++m_index;
return S_OK;
}
virtual HRESULT STDMETHODCALLTYPE Skip(ULONG celt) { return E_NOTIMPL; }
virtual HRESULT STDMETHODCALLTYPE Reset(void) { return E_NOTIMPL; }
virtual HRESULT STDMETHODCALLTYPE Clone(IEnumSTATSTG **) { return E_NOTIMPL; }
HRESULT STDMETHODCALLTYPE Skip(ULONG celt) override { return E_NOTIMPL; }
HRESULT STDMETHODCALLTYPE Reset(void) override { return E_NOTIMPL; }
HRESULT STDMETHODCALLTYPE Clone(IEnumSTATSTG **) override {
return E_NOTIMPL;
}
};
class MockDxcSystemAccess : public IDxcSystemAccess {
SIMPLE_IUNKNOWN_IMPL1(IDxcSystemAccess)
private:
LPCSTR m_fileName;
LPCSTR m_contents;
unsigned m_length;
public:
unsigned findCount;
MockDxcSystemAccess() : m_dwRef(0), findCount(1) {}
virtual ~MockDxcSystemAccess() {}
static HRESULT Create(MockDxcSystemAccess **pResult) {
*pResult = new (std::nothrow) MockDxcSystemAccess();
if (*pResult == nullptr)
@ -143,8 +141,8 @@ public:
return S_OK;
}
virtual HRESULT STDMETHODCALLTYPE EnumFiles(LPCWSTR fileName,
IEnumSTATSTG **pResult) override {
HRESULT STDMETHODCALLTYPE EnumFiles(LPCWSTR fileName,
IEnumSTATSTG **pResult) override {
wchar_t hlslName[] = L"filename.hlsl";
wchar_t fxName[] = L"filename2.fx";
STATSTG items[] = {{hlslName,
@ -180,94 +178,96 @@ public:
*pResult = resultEnum;
return S_OK;
}
virtual HRESULT STDMETHODCALLTYPE OpenStorage(LPCWSTR lpFileName,
DWORD dwDesiredAccess,
DWORD dwShareMode,
DWORD dwCreationDisposition,
DWORD dwFlagsAndAttributes,
IUnknown **pResult) override {
HRESULT STDMETHODCALLTYPE OpenStorage(LPCWSTR lpFileName,
DWORD dwDesiredAccess,
DWORD dwShareMode,
DWORD dwCreationDisposition,
DWORD dwFlagsAndAttributes,
IUnknown **pResult) override {
*pResult = SHCreateMemStream(nullptr, 0);
return (*pResult == nullptr) ? E_OUTOFMEMORY : S_OK;
}
virtual HRESULT STDMETHODCALLTYPE
HRESULT STDMETHODCALLTYPE
SetStorageTime(IUnknown *storage, const FILETIME *lpCreationTime,
const FILETIME *lpLastAccessTime,
const FILETIME *lpLastWriteTime) override {
return E_NOTIMPL;
}
virtual HRESULT STDMETHODCALLTYPE GetFileInformationForStorage(
HRESULT STDMETHODCALLTYPE GetFileInformationForStorage(
IUnknown *storage,
LPBY_HANDLE_FILE_INFORMATION lpFileInformation) override {
return E_NOTIMPL;
}
virtual HRESULT STDMETHODCALLTYPE
GetFileTypeForStorage(IUnknown *storage, DWORD *fileType) override {
HRESULT STDMETHODCALLTYPE GetFileTypeForStorage(IUnknown *storage,
DWORD *fileType) override {
return E_NOTIMPL;
}
virtual HRESULT STDMETHODCALLTYPE CreateHardLinkInStorage(
HRESULT STDMETHODCALLTYPE CreateHardLinkInStorage(
LPCWSTR lpFileName, LPCWSTR lpExistingFileName) override {
return E_NOTIMPL;
}
virtual HRESULT STDMETHODCALLTYPE MoveStorage(LPCWSTR lpExistingFileName,
LPCWSTR lpNewFileName,
DWORD dwFlags) override {
HRESULT STDMETHODCALLTYPE MoveStorage(LPCWSTR lpExistingFileName,
LPCWSTR lpNewFileName,
DWORD dwFlags) override {
return E_NOTIMPL;
}
virtual HRESULT STDMETHODCALLTYPE
HRESULT STDMETHODCALLTYPE
GetFileAttributesForStorage(LPCWSTR lpFileName, DWORD *pResult) override {
return E_NOTIMPL;
}
virtual HRESULT STDMETHODCALLTYPE DeleteStorage(LPCWSTR lpFileName) override {
HRESULT STDMETHODCALLTYPE DeleteStorage(LPCWSTR lpFileName) override {
return E_NOTIMPL;
}
virtual HRESULT STDMETHODCALLTYPE
HRESULT STDMETHODCALLTYPE
RemoveDirectoryStorage(LPCWSTR lpFileName) override {
return E_NOTIMPL;
}
virtual HRESULT STDMETHODCALLTYPE
HRESULT STDMETHODCALLTYPE
CreateDirectoryStorage(LPCWSTR lpPathName) override {
return E_NOTIMPL;
}
virtual HRESULT STDMETHODCALLTYPE GetCurrentDirectoryForStorage(
DWORD nBufferLength, LPWSTR lpBuffer, DWORD *len) override {
HRESULT STDMETHODCALLTYPE GetCurrentDirectoryForStorage(DWORD nBufferLength,
LPWSTR lpBuffer,
DWORD *len) override {
return E_NOTIMPL;
}
virtual HRESULT STDMETHODCALLTYPE GetMainModuleFileNameW(
DWORD nBufferLength, LPWSTR lpBuffer, DWORD *len) override {
HRESULT STDMETHODCALLTYPE GetMainModuleFileNameW(DWORD nBufferLength,
LPWSTR lpBuffer,
DWORD *len) override {
return E_NOTIMPL;
}
virtual HRESULT STDMETHODCALLTYPE GetTempStoragePath(DWORD nBufferLength,
LPWSTR lpBuffer,
DWORD *len) override {
HRESULT STDMETHODCALLTYPE GetTempStoragePath(DWORD nBufferLength,
LPWSTR lpBuffer,
DWORD *len) override {
return E_NOTIMPL;
}
virtual HRESULT STDMETHODCALLTYPE
SupportsCreateSymbolicLink(BOOL *pResult) override {
HRESULT STDMETHODCALLTYPE SupportsCreateSymbolicLink(BOOL *pResult) override {
return E_NOTIMPL;
}
virtual HRESULT STDMETHODCALLTYPE CreateSymbolicLinkInStorage(
HRESULT STDMETHODCALLTYPE CreateSymbolicLinkInStorage(
LPCWSTR lpSymlinkFileName, LPCWSTR lpTargetFileName,
DWORD dwFlags) override {
return E_NOTIMPL;
}
virtual HRESULT STDMETHODCALLTYPE CreateStorageMapping(
IUnknown *hFile, DWORD flProtect, DWORD dwMaximumSizeHigh,
DWORD dwMaximumSizeLow, IUnknown **pResult) override {
HRESULT STDMETHODCALLTYPE CreateStorageMapping(IUnknown *hFile,
DWORD flProtect,
DWORD dwMaximumSizeHigh,
DWORD dwMaximumSizeLow,
IUnknown **pResult) override {
return E_NOTIMPL;
}
virtual HRESULT MapViewOfFile(IUnknown *hFileMappingObject,
DWORD dwDesiredAccess, DWORD dwFileOffsetHigh,
DWORD dwFileOffsetLow,
SIZE_T dwNumberOfBytesToMap,
ID3D10Blob **pResult) override {
HRESULT MapViewOfFile(IUnknown *hFileMappingObject, DWORD dwDesiredAccess,
DWORD dwFileOffsetHigh, DWORD dwFileOffsetLow,
SIZE_T dwNumberOfBytesToMap,
ID3D10Blob **pResult) override {
return E_NOTIMPL;
}
virtual HRESULT STDMETHODCALLTYPE
OpenStdStorage(int standardFD, IUnknown **pResult) override {
HRESULT STDMETHODCALLTYPE OpenStdStorage(int standardFD,
IUnknown **pResult) override {
return E_NOTIMPL;
}
virtual HRESULT STDMETHODCALLTYPE
GetStreamDisplay(ITextFont **textFont, unsigned *columnCount) override {
HRESULT STDMETHODCALLTYPE GetStreamDisplay(ITextFont **textFont,
unsigned *columnCount) override {
return E_NOTIMPL;
}
};
@ -306,7 +306,7 @@ void MSFileSysTest::FindFirstWhenInvokedThenFailsIfNoMatch() {
CreateMSFileSystemForIface(access, &fileSystem);
WIN32_FIND_DATAW findData;
HANDLE h = fileSystem->FindFirstFileW(L"foobar", &findData);
VERIFY_ARE_EQUAL(ERROR_FILE_NOT_FOUND, GetLastError());
VERIFY_ARE_EQUAL(ERROR_FILE_NOT_FOUND, (long)GetLastError());
VERIFY_ARE_EQUAL(INVALID_HANDLE_VALUE, h);
VERIFY_ARE_EQUAL_WSTR(L"", findData.cFileName);
delete fileSystem;
@ -323,7 +323,7 @@ void MSFileSysTest::FindNextWhenLastThenNoMatch() {
VERIFY_ARE_NOT_EQUAL(INVALID_HANDLE_VALUE, h);
BOOL findNext = fileSystem->FindNextFileW(h, &findData);
VERIFY_IS_FALSE(findNext);
VERIFY_ARE_EQUAL(ERROR_FILE_NOT_FOUND, GetLastError());
VERIFY_ARE_EQUAL(ERROR_FILE_NOT_FOUND, (long)GetLastError());
fileSystem->FindClose(h);
delete fileSystem;
}
@ -357,7 +357,7 @@ void MSFileSysTest::OpenWhenNewThenZeroSize() {
char buf[4];
DWORD bytesRead;
VERIFY_IS_TRUE(fileSystem->ReadFile(h, buf, _countof(buf), &bytesRead));
VERIFY_ARE_EQUAL(0, bytesRead);
VERIFY_ARE_EQUAL(0u, bytesRead);
fileSystem->CloseHandle(h);
delete fileSystem;
}

3
tools/clang/unittests/HLSL/Objects.cpp
Просмотреть файл

@ -12,9 +12,6 @@
#include "dxc/Test/HLSLTestData.h"
#include <stdint.h>
#ifdef _WIN32
#include "WexTestClass.h"
#endif
#include "dxc/Test/HlslTestUtils.h"
#include <exception>

3
tools/clang/unittests/HLSL/OptionsTest.cpp
Просмотреть файл

@ -23,9 +23,6 @@
#include <vector>
#include "dxc/Test/HLSLTestData.h"
#ifdef _WIN32
#include "WexTestClass.h"
#endif
#include "dxc/Test/HlslTestUtils.h"
#include "dxc/DxilContainer/DxilContainer.h"

17
tools/clang/unittests/HLSL/PixTest.cpp
Просмотреть файл

@ -3261,7 +3261,7 @@ void main()
VERIFY_SUCCEEDED(type->QueryInterface(IID_PPV_ARGS(&structType)));
DWORD fieldCount = 0;
VERIFY_SUCCEEDED(structType->GetNumFields(&fieldCount));
VERIFY_ARE_EQUAL(fieldCount, 1);
VERIFY_ARE_EQUAL(fieldCount, 1u);
// Just a crash test:
CComPtr<IDxcPixStructField> structField;
structType->GetFieldByName(L"", &structField);
@ -3289,9 +3289,10 @@ public:
DXC_MICROCOM_ADDREF_RELEASE_IMPL(m_dwRef)
DxcIncludeHandlerForInjectedSourcesForPix(
PixTest *pixTest, std::vector<std::pair<std::wstring, std::string>> files)
: m_dwRef(0), m_pixTest(pixTest), m_files(files){};
: m_dwRef(0), m_files(files), m_pixTest(pixTest){};
HRESULT STDMETHODCALLTYPE QueryInterface(REFIID iid, void **ppvObject) {
HRESULT STDMETHODCALLTYPE QueryInterface(REFIID iid,
void **ppvObject) override {
return DoBasicQueryInterface<IDxcIncludeHandler>(this, iid, ppvObject);
}
@ -3913,7 +3914,7 @@ PixTest::TestableResults PixTest::TestStructAnnotationCase(
for (ValueLocation const &valueLocation :
passOutput.valueLocations) // For each allocas and dxil values
{
if (CurRegIdx == valueLocation.base &&
if (CurRegIdx == (unsigned)valueLocation.base &&
(unsigned)valueLocation.count == cover.countOfMembers) {
VERIFY_IS_FALSE(found);
found = true;
@ -4335,7 +4336,7 @@ void main()
VERIFY_ARE_EQUAL(0u, Testables.OffsetAndSizes[0].offset);
VERIFY_ARE_EQUAL(4u * 32u, Testables.OffsetAndSizes[0].size);
} else {
VERIFY_ARE_EQUAL(4, Testables.OffsetAndSizes.size());
VERIFY_ARE_EQUAL(4u, Testables.OffsetAndSizes.size());
for (unsigned i = 0; i < 4; i++) {
VERIFY_ARE_EQUAL(1u, Testables.OffsetAndSizes[i].countOfMembers);
VERIFY_ARE_EQUAL(i * 32u, Testables.OffsetAndSizes[i].offset);
@ -4381,7 +4382,7 @@ void main()
VERIFY_ARE_EQUAL(0u, Testables.OffsetAndSizes[0].offset);
VERIFY_ARE_EQUAL(2u * 32u, Testables.OffsetAndSizes[0].size);
} else {
VERIFY_ARE_EQUAL(2, Testables.OffsetAndSizes.size());
VERIFY_ARE_EQUAL(2u, Testables.OffsetAndSizes.size());
for (unsigned i = 0; i < 2; i++) {
VERIFY_ARE_EQUAL(1u, Testables.OffsetAndSizes[i].countOfMembers);
VERIFY_ARE_EQUAL(i * 32u, Testables.OffsetAndSizes[i].offset);
@ -4491,7 +4492,7 @@ void main()
VERIFY_ARE_EQUAL(0u, Testables.OffsetAndSizes[0].offset);
VERIFY_ARE_EQUAL(5u * 32u, Testables.OffsetAndSizes[0].size);
} else {
VERIFY_ARE_EQUAL(5, Testables.OffsetAndSizes.size());
VERIFY_ARE_EQUAL(5u, Testables.OffsetAndSizes.size());
for (unsigned i = 0; i < 5; i++) {
VERIFY_ARE_EQUAL(1u, Testables.OffsetAndSizes[i].countOfMembers);
VERIFY_ARE_EQUAL(i * 32u, Testables.OffsetAndSizes[i].offset);
@ -4650,7 +4651,7 @@ void main()
VERIFY_ARE_EQUAL(32u * 3u, Testables.OffsetAndSizes[0].size);
}
VERIFY_ARE_EQUAL(3, Testables.AllocaWrites.size());
VERIFY_ARE_EQUAL(3u, Testables.AllocaWrites.size());
ValidateAllocaWrite(Testables.AllocaWrites, 0, "i32");
ValidateAllocaWrite(Testables.AllocaWrites, 1, "e.f2.x");
ValidateAllocaWrite(Testables.AllocaWrites, 2, "e.f2.y");

1
tools/clang/unittests/HLSL/RewriterTest.cpp
Просмотреть файл

@ -34,7 +34,6 @@
#include <atlbase.h>
#include <atlfile.h>
#include "WexTestClass.h"
#include "dxc/Test/HLSLTestData.h"
#include "dxc/Test/HlslTestUtils.h"
#include "dxc/Test/DxcTestUtils.h"

1
tools/clang/unittests/HLSL/VerifierTest.cpp
Просмотреть файл

@ -17,7 +17,6 @@
#include <fstream>
#ifdef _WIN32
#include "WexTestClass.h"
#define TEST_CLASS_DERIVATION
#else
#define TEST_CLASS_DERIVATION : public ::testing::Test

14
tools/clang/unittests/HLSLExec/ExecutionTest.cpp
Просмотреть файл

@ -35,7 +35,6 @@
#include <bitset>
#undef _read
#include "WexTestClass.h"
#include "dxc/Test/DxcTestUtils.h"
#include "dxc/Support/Global.h"
#include "dxc/Support/WinIncludes.h"
@ -4416,7 +4415,10 @@ TEST_F(ExecutionTest, ATOWriteMSAATest) {
}
// Used to determine how an out of bounds offset should be converted
#define CLAMPOFFSET(offset) (((unsigned)(offset) << 28) >> 28)
constexpr int ClampOffset(int offset) {
unsigned shift = ((unsigned)offset) << 28;
return ((int)shift) >> 28;
}
// Determine if the values in pPixels correspond to the expected locations
// encoded into a uint based on the coordinates and offsets that were provided.
@ -4426,8 +4428,8 @@ void VerifyProgOffsetResults(unsigned *pPixels, bool bCheckDeriv) {
int coords[18] = {100, 150, 200, 250, 300, 350, 400, 450, 500,
550, 600, 650, 700, 750, 800, 850, 900, 950};
int offsets[18] = {
CLAMPOFFSET(-9), -8, -7, -6, -5, -4, -3, -2, -1, 0, 1, 2, 3, 4, 5, 6, 7,
CLAMPOFFSET(8)};
ClampOffset(-9), -8, -7, -6, -5, -4, -3, -2, -1, 0, 1, 2, 3, 4, 5, 6, 7,
ClampOffset(8)};
for (unsigned y = 0; y < _countof(coords); y++) {
for (unsigned x = 0; x < _countof(coords); x++) {
unsigned cmp = (coords[y] + offsets[y]) * 1000 + coords[x] + offsets[x];
@ -9870,7 +9872,7 @@ TEST_F(ExecutionTest, ComputeRawBufferLdStHalf) {
{256.0f, 105.17f, 980.0f},
{465.1652f, -1.5694e2f, -0.8543e-2f, 1333.5f}};
RawBufferLdStTestData<uint16_t> halfData;
for (int i = 0; i < sizeof(floatData) / sizeof(float); i++) {
for (unsigned i = 0; i < sizeof(floatData) / sizeof(float); i++) {
((uint16_t *)&halfData)[i] =
ConvertFloat32ToFloat16(((float *)&floatData)[i]);
}
@ -9932,7 +9934,7 @@ TEST_F(ExecutionTest, GraphicsRawBufferLdStHalf) {
{256.0f, 105.17f, 0.0f},
{465.1652f, -1.5694e2f, -0.8543e-2f, 1333.5f}};
RawBufferLdStTestData<uint16_t> halfData;
for (int i = 0; i < sizeof(floatData) / sizeof(float); i++) {
for (unsigned i = 0; i < sizeof(floatData) / sizeof(float); i++) {
((uint16_t *)&halfData)[i] =
ConvertFloat32ToFloat16(((float *)&floatData)[i]);
}

1
tools/clang/unittests/HLSLExec/ShaderOpTest.cpp
Просмотреть файл

@ -23,7 +23,6 @@
#include "ShaderOpTest.h"
#include "HlslTestUtils.h" // LogCommentFmt
#include "WexTestClass.h" // TAEF
#include "dxc/DXIL/DxilConstants.h" // ComponentType
#include "dxc/Support/Global.h" // OutputDebugBytes
#include "dxc/Support/dxcapi.use.h" // DxcDllSupport

6
tools/clang/unittests/HLSLTestLib/FileCheckerTest.cpp
Просмотреть файл

@ -552,7 +552,7 @@ FileRunCommandPart::RunDxc(dxc::DxcDllSupport &DllSupport,
IFT(DllSupport.CreateInstance(CLSID_DxcLibrary, &pLibrary));
IFT(pLibrary->CreateBlobFromFile(CommandFileName, nullptr, &pSource));
CComPtr<IDxcIncludeHandler> pIncludeHandler =
CComPtr<IncludeHandlerVFSOverlayForTest> pIncludeHandler =
AllocVFSIncludeHandler(pLibrary, pVFS);
IFT(DllSupport.CreateInstance(CLSID_DxcCompiler, &pCompiler));
IFT(pCompiler->Compile(pSource, CommandFileName, entry.c_str(),
@ -873,7 +873,7 @@ FileRunCommandPart::RunDxr(dxc::DxcDllSupport &DllSupport,
IFT(DllSupport.CreateInstance(CLSID_DxcLibrary, &pLibrary));
IFT(pLibrary->CreateBlobFromFile(CommandFileName, nullptr, &pSource));
CComPtr<IDxcIncludeHandler> pIncludeHandler =
CComPtr<IncludeHandlerVFSOverlayForTest> pIncludeHandler =
AllocVFSIncludeHandler(pLibrary, pVFS);
IFT(DllSupport.CreateInstance(CLSID_DxcRewriter, &pRewriter));
IFT(pRewriter->RewriteWithOptions(pSource, CommandFileName, flags.data(),
@ -969,7 +969,7 @@ FileRunCommandPart::RunLink(dxc::DxcDllSupport &DllSupport,
HRESULT resultStatus;
IFT(DllSupport.CreateInstance(CLSID_DxcLibrary, &pLibrary));
CComPtr<IDxcIncludeHandler> pIncludeHandler =
CComPtr<IncludeHandlerVFSOverlayForTest> pIncludeHandler =
AllocVFSIncludeHandler(pLibrary, pVFS);
IFT(DllSupport.CreateInstance(CLSID_DxcLinker, &pLinker));
IFT(DllSupport.CreateInstance(CLSID_DxcCompiler, &pCompiler));

2
tools/dxexp/dxexp.cpp
Просмотреть файл

@ -414,7 +414,7 @@ int main(int argc, const char *argv[]) {
text_printf("Experimental shader model feature failed with unexpected "
"HRESULT 0x%08x.\n",
(unsigned int)hr);
json_printf("{ \"err\": \"0x%08x\" }", hr);
json_printf("{ \"err\": \"0x%08x\" }", (unsigned int)hr);
json_printf("\n}\n");
return 4;
}

4
utils/hct/hctbuild.cmd
Просмотреть файл

@ -225,6 +225,10 @@ if "%1"=="-clang" (
set CMAKE_OPTS=%CMAKE_OPTS% -DCMAKE_C_COMPILER=clang-cl -DCMAKE_CXX_COMPILER=clang-cl
shift /1 & goto :parse_args
)
if "%1"=="-clang-cl" (
set CMAKE_OPTS=%CMAKE_OPTS% -T ClangCL
shift /1 & goto :parse_args
)
if "%1"=="-update-generated-sources" (
set CMAKE_OPTS=%CMAKE_OPTS% -DHLSL_COPY_GENERATED_SOURCES=1
shift /1 & goto :parse_args