Rename nxtProcTable and nxtSetProcs to dawn

This commit is contained in:
Corentin Wallez
2018-07-18 15:15:07 +02:00
committed by Corentin Wallez
parent b1669e3fa4
commit be5ca38351
24 changed files with 68 additions and 68 deletions

View File

@@ -106,7 +106,7 @@ NXTTest::~NXTTest() {
delete mBinding;
mBinding = nullptr;
nxtSetProcs(nullptr);
dawnSetProcs(nullptr);
}
bool NXTTest::IsD3D12() const {
@@ -137,12 +137,12 @@ void NXTTest::SetUp() {
mBinding->SetWindow(testWindow);
dawnDevice backendDevice;
nxtProcTable backendProcs;
dawnProcTable backendProcs;
mBinding->GetProcAndDevice(&backendProcs, &backendDevice);
// Choose whether to use the backend procs and devices directly, or set up the wire.
dawnDevice cDevice = nullptr;
nxtProcTable procs;
dawnProcTable procs;
if (gTestUsesWire) {
mC2sBuf = new dawn::wire::TerribleCommandBuffer();
@@ -152,7 +152,7 @@ void NXTTest::SetUp() {
mC2sBuf->SetHandler(mWireServer);
dawnDevice clientDevice;
nxtProcTable clientProcs;
dawnProcTable clientProcs;
mWireClient = dawn::wire::NewClientDevice(&clientProcs, &clientDevice, mC2sBuf);
mS2cBuf->SetHandler(mWireClient);
@@ -165,7 +165,7 @@ void NXTTest::SetUp() {
// Set up the device and queue because all tests need them, and NXTTest needs them too for the
// deferred expectations.
nxtSetProcs(&procs);
dawnSetProcs(&procs);
device = dawn::Device::Acquire(cDevice);
queue = device.CreateQueue();

View File

@@ -127,7 +127,7 @@ class WireTestsBase : public Test {
mockBufferMapReadCallback = new MockBufferMapReadCallback;
mockBufferMapWriteCallback = new MockBufferMapWriteCallback;
nxtProcTable mockProcs;
dawnProcTable mockProcs;
dawnDevice mockDevice;
api.GetProcTableAndDevice(&mockProcs, &mockDevice);
@@ -144,16 +144,16 @@ class WireTestsBase : public Test {
mWireServer = NewServerCommandHandler(mockDevice, mockProcs, mS2cBuf);
mC2sBuf->SetHandler(mWireServer);
nxtProcTable clientProcs;
dawnProcTable clientProcs;
mWireClient = NewClientDevice(&clientProcs, &device, mC2sBuf);
nxtSetProcs(&clientProcs);
dawnSetProcs(&clientProcs);
mS2cBuf->SetHandler(mWireClient);
apiDevice = mockDevice;
}
void TearDown() override {
nxtSetProcs(nullptr);
dawnSetProcs(nullptr);
delete mWireServer;
delete mWireClient;
delete mC2sBuf;

View File

@@ -18,16 +18,16 @@
namespace backend {
namespace null {
void Init(nxtProcTable* procs, dawnDevice* device);
void Init(dawnProcTable* procs, dawnDevice* device);
}
}
ValidationTest::ValidationTest() {
nxtProcTable procs;
dawnProcTable procs;
dawnDevice cDevice;
backend::null::Init(&procs, &cDevice);
nxtSetProcs(&procs);
dawnSetProcs(&procs);
device = dawn::Device::Acquire(cDevice);
device.SetErrorCallback(ValidationTest::OnDeviceError, static_cast<dawnCallbackUserdata>(reinterpret_cast<uintptr_t>(this)));
@@ -37,7 +37,7 @@ ValidationTest::~ValidationTest() {
// We need to destroy NXT objects before setting the procs to null otherwise the nxt*Release
// will call a nullptr
device = dawn::Device();
nxtSetProcs(nullptr);
dawnSetProcs(nullptr);
}
void ValidationTest::TearDown() {