encounter
/
dawn-cmake
mirror of https://github.com/encounter/dawn-cmake.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix compilation on MSVC 

BUG=

Change-Id: I9f33a4c26cc2ca1e6d6cdbc245d929175867b1e5
Reviewed-on: https://dawn-review.googlesource.com/c/dawn/+/13961
Commit-Queue: Austin Eng <enga@chromium.org>
Reviewed-by: Austin Eng <enga@chromium.org>
Reviewed-by: Jiawei Shao <jiawei.shao@intel.com>
This commit is contained in:
Corentin Wallez 2019-11-23 03:40:53 +00:00 committed by Commit Bot service account
parent 733842c59d
commit 8e9c3f663c
2 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/tests/perf_tests/DrawCallPerf.cpp
View File

@ -124,6 +124,7 @@ namespace {
UniformData::Static, RenderBundle::No}; UniformData::Static, RenderBundle::No};
unsigned int unused[] = { unsigned int unused[] = {
0, // Avoid making a 0-sized array.
AssignParam(std::get<Ts>(paramTuple), args)..., AssignParam(std::get<Ts>(paramTuple), args)...,
}; };
DAWN_UNUSED(unused); DAWN_UNUSED(unused);

14
src/tests/unittests/RefCountedTests.cpp
View File

@ -20,9 +20,13 @@
using namespace dawn_native; using namespace dawn_native;
struct RCTest : public RefCounted { struct RCTest : public RefCounted {
using RefCounted::RefCounted; RCTest() : RefCounted() {
}
RCTest(bool* deleted): deleted(deleted) { RCTest(uint64_t payload) : RefCounted(payload) {
}
RCTest(bool* deleted) : deleted(deleted) {
} }
~RCTest() override { ~RCTest() override {
@ -213,18 +217,18 @@ TEST(Ref, InitialPayloadValue) {
ASSERT_EQ(testDefaultConstructor->GetRefCountPayload(), 0u); ASSERT_EQ(testDefaultConstructor->GetRefCountPayload(), 0u);
testDefaultConstructor->Release(); testDefaultConstructor->Release();
RCTest* testZero = new RCTest(0); RCTest* testZero = new RCTest(uint64_t(0ull));
ASSERT_EQ(testZero->GetRefCountPayload(), 0u); ASSERT_EQ(testZero->GetRefCountPayload(), 0u);
testZero->Release(); testZero->Release();
RCTest* testOne = new RCTest(1); RCTest* testOne = new RCTest(1ull);
ASSERT_EQ(testOne->GetRefCountPayload(), 1u); ASSERT_EQ(testOne->GetRefCountPayload(), 1u);
testOne->Release(); testOne->Release();
} }
// Test that the payload survives ref and release operations // Test that the payload survives ref and release operations
TEST(Ref, PayloadUnchangedByRefCounting) { TEST(Ref, PayloadUnchangedByRefCounting) {
RCTest* test = new RCTest(1); RCTest* test = new RCTest(1ull);
ASSERT_EQ(test->GetRefCountPayload(), 1u); ASSERT_EQ(test->GetRefCountPayload(), 1u);
test->Reference(); test->Reference();