encounter/dawn-cmake
1
0
Fork 0
mirror of https://github.com/encounter/dawn-cmake.git synced 2025-12-09 21:47:47 +00:00
Code Issues Packages Projects Releases Wiki Activity

Enable warnings on Windows

Browse Source
This commit is contained in:
Corentin Wallez
2017-07-10 20:09:59 -04:00
committed by Corentin Wallez
parent 83e779d8f2
commit 0f833f30ed
6 changed files with 33 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/backend/BindGroupLayout.cpp
View File

@@ -35,11 +35,10 @@ namespace backend {
return std::hash<unsigned long long>()(value.to_ullong());
}
// TODO(cwallez@chromium.org): see if we can use boost's hash combined or some equivalent
// this currently assumes that size_t is 64 bits
void CombineHashes(size_t* h1, size_t h2) {
*h1 ^= (h2 << 7) + (h2 >> (64 - 7)) + 0x304975;
*h1 ^= (h2 << 7) + (h2 >> (sizeof(size_t) * 8 - 7)) + 0x304975;
}
size_t HashBindingInfo(const BindGroupLayoutBase::LayoutBindingInfo& info) {

2
src/tests/unittests/validation/ValidationTest.cpp
View File

@@ -85,7 +85,7 @@ void ValidationTest::OnDeviceError(const char* message, nxtCallbackUserdata user
void ValidationTest::OnBuilderErrorStatus(nxtBuilderErrorStatus status, const char* message, nxt::CallbackUserdata userdata1, nxt::CallbackUserdata userdata2) {
auto* self = reinterpret_cast<ValidationTest*>(static_cast<uintptr_t>(userdata1));
size_t index = userdata2;
size_t index = static_cast<size_t>(userdata2);
ASSERT_LT(index, self->expectations.size());