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

Further fixes to build with with VS2019 (end2end tests) 

These fix the tests so that the entire of Dawn can now be built with
VS2019. Some details:

Multiples of "error C3493: 'X' cannot be implicitly captured because no
default capture mode has been specified" in BufferTests.cpp. This
appears to be a bug in VS whereby the constexprs need capturing; the
workaround, rather than explicitly name them and change the function
signature, is to make the vars also static.

In DepthStencilSamplingTests.cpp we get "warning C4310: cast truncates
constant value" for uint8_t(256). Rather than try to silence the
warning the test was removed, since the cast will *always* result in
zero, which is also the first in the test values.

To successfully build two further third-party dependencies also require
updating:

https://dawn-review.googlesource.com/c/tint/+/37700
https://chromium-review.googlesource.com/c/angle/angle/+/2624888

Note: whilst this now builds the entire of Dawn with VS not yet all of
the build arguments are supported. Yet to investigate is turning on
optimisations (with is_official_build=true) which attempts to combine
"/INCREMENTAL" with "/OPT:REF" and fails (to be addressed next).

Bug: dawn:602
Change-Id: I37202992f16b999d5627022eeeb6b9fff0d4b60b
Reviewed-on: https://dawn-review.googlesource.com/c/dawn/+/37701
Reviewed-by: Corentin Wallez <cwallez@chromium.org>
Commit-Queue: Carl Woffenden <cwoffenden@gmail.com>
This commit is contained in:
Carl Woffenden 2021-01-13 12:25:45 +00:00 committed by Commit Bot service account
parent 111ba65a5e
commit 558599fc9a
2 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/tests/end2end/BufferTests.cpp
View File

@ -154,7 +154,7 @@ TEST_P(BufferMappingTests, MapRead_InCallback) {
wgpu::Buffer buffer = CreateMapReadBuffer(kBufferSize); wgpu::Buffer buffer = CreateMapReadBuffer(kBufferSize);
uint32_t myData[3] = {0x01020304, 0x05060708, 0x090A0B0C}; uint32_t myData[3] = {0x01020304, 0x05060708, 0x090A0B0C};
constexpr size_t kSize = sizeof(myData); static constexpr size_t kSize = sizeof(myData);
queue.WriteBuffer(buffer, 0, &myData, kSize); queue.WriteBuffer(buffer, 0, &myData, kSize);
struct UserData { struct UserData {
@ -355,8 +355,8 @@ TEST_P(BufferMappingTests, OffsetNotUpdatedOnError) {
TEST_P(BufferMappingTests, MapWrite_InCallbackDefault) { TEST_P(BufferMappingTests, MapWrite_InCallbackDefault) {
wgpu::Buffer buffer = CreateMapWriteBuffer(4); wgpu::Buffer buffer = CreateMapWriteBuffer(4);
constexpr uint32_t myData = 2934875; static constexpr uint32_t myData = 2934875;
constexpr size_t kSize = sizeof(myData); static constexpr size_t kSize = sizeof(myData);
struct UserData { struct UserData {
bool done; bool done;
@ -396,8 +396,8 @@ TEST_P(BufferMappingTests, MapWrite_InCallbackDefault) {
TEST_P(BufferMappingTests, MapWrite_InCallbackRange) { TEST_P(BufferMappingTests, MapWrite_InCallbackRange) {
wgpu::Buffer buffer = CreateMapWriteBuffer(4); wgpu::Buffer buffer = CreateMapWriteBuffer(4);
constexpr uint32_t myData = 2934875; static constexpr uint32_t myData = 2934875;
constexpr size_t kSize = sizeof(myData); static constexpr size_t kSize = sizeof(myData);
struct UserData { struct UserData {
bool done; bool done;

3
src/tests/end2end/DepthStencilSamplingTests.cpp
View File

@ -43,8 +43,7 @@ namespace {
const std::vector<float> kNormalizedTextureValues = {0.0, 0.3, 0.4, 0.5, 1.0}; const std::vector<float> kNormalizedTextureValues = {0.0, 0.3, 0.4, 0.5, 1.0};
// Test the limits, and some values in between. // Test the limits, and some values in between.
const std::vector<uint8_t> kStencilValues = {uint8_t(0), uint8_t(1), uint8_t(38), uint8_t(255), const std::vector<uint8_t> kStencilValues = {uint8_t(0), uint8_t(1), uint8_t(38), uint8_t(255)};
uint8_t(256)};
} // anonymous namespace } // anonymous namespace