Make end2end and perf tests use webgpu.h

BUG=dawn:22

Change-Id: Ief855d294779b97283a79532e9d503aab6fda751
Reviewed-on: https://dawn-review.googlesource.com/c/dawn/+/12740
Reviewed-by: Kai Ninomiya <kainino@chromium.org>
Reviewed-by: Austin Eng <enga@chromium.org>
Commit-Queue: Corentin Wallez <cwallez@chromium.org>
This commit is contained in:
Corentin Wallez
2019-10-28 13:27:36 +00:00
committed by Commit Bot service account
parent 9cf62efda9
commit cab352c2f6
46 changed files with 2659 additions and 2624 deletions

View File

@@ -97,16 +97,16 @@ class BufferUploadPerf : public DawnPerfTestWithParams<BufferUploadParams> {
private:
void Step() override;
dawn::Buffer dst;
wgpu::Buffer dst;
std::vector<uint8_t> data;
};
void BufferUploadPerf::TestSetUp() {
DawnPerfTestWithParams<BufferUploadParams>::TestSetUp();
dawn::BufferDescriptor desc = {};
wgpu::BufferDescriptor desc = {};
desc.size = data.size();
desc.usage = dawn::BufferUsage::CopyDst;
desc.usage = wgpu::BufferUsage::CopyDst;
dst = device.CreateBuffer(&desc);
}
@@ -122,11 +122,11 @@ void BufferUploadPerf::Step() {
} break;
case UploadMethod::CreateBufferMapped: {
dawn::BufferDescriptor desc = {};
wgpu::BufferDescriptor desc = {};
desc.size = data.size();
desc.usage = dawn::BufferUsage::CopySrc | dawn::BufferUsage::MapWrite;
desc.usage = wgpu::BufferUsage::CopySrc | wgpu::BufferUsage::MapWrite;
dawn::CommandEncoder encoder = device.CreateCommandEncoder();
wgpu::CommandEncoder encoder = device.CreateCommandEncoder();
for (unsigned int i = 0; i < kNumIterations; ++i) {
auto result = device.CreateBufferMapped(&desc);
@@ -135,7 +135,7 @@ void BufferUploadPerf::Step() {
encoder.CopyBufferToBuffer(result.buffer, 0, dst, 0, data.size());
}
dawn::CommandBuffer commands = encoder.Finish();
wgpu::CommandBuffer commands = encoder.Finish();
queue.Submit(1, &commands);
} break;
}

View File

@@ -208,9 +208,9 @@ void DawnPerfTestBase::DoRunLoop(double maxRunTime) {
mNumStepsPerformed = 0;
mRunning = true;
dawn::FenceDescriptor desc = {};
wgpu::FenceDescriptor desc = {};
uint64_t signaledFenceValue = 0;
dawn::Fence fence = mTest->queue.CreateFence(&desc);
wgpu::Fence fence = mTest->queue.CreateFence(&desc);
mTimer->Start();