AuroraMiddleware/skia2
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Replace uses of deprecated dawn_native::BackendType

Browse Source 
Bug: dawn:824
Change-Id: I261c3329e53de62df83b4cca10aa9e909dd293df
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/492456
Auto-Submit: Corentin Wallez <cwallez@chromium.org>
Reviewed-by: Stephen White <senorblanco@google.com>
Commit-Queue: Stephen White <senorblanco@google.com>
This commit is contained in:
Corentin Wallez 2022-01-07 17:24:28 +01:00 committed by SkCQ
parent e3b935b0bf
commit 41e994f735
6 changed files with 17 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
tools/gpu/dawn/DawnTestContext.cpp
View File

@ -84,13 +84,15 @@ static void PrintDeviceError(WGPUErrorType, const char* message, void*) {
class DawnTestContextImpl : public sk_gpu_test::DawnTestContext {
public:
static wgpu::Device createDevice(const dawn_native::Instance& instance,
dawn_native::BackendType type) {
wgpu::BackendType type) {
DawnProcTable backendProcs = dawn_native::GetProcs();
dawnProcSetProcs(&backendProcs);
std::vector<dawn_native::Adapter> adapters = instance.GetAdapters();
for (dawn_native::Adapter adapter : adapters) {
if (adapter.GetBackendType() == type) {
wgpu::AdapterProperties properties;
adapter.GetProperties(&properties);
if (properties.backendType == type) {
return wgpu::Device::Acquire(adapter.CreateDevice());
}
}
@ -103,7 +105,7 @@ public:
if (sharedContext) {
device = sharedContext->getDevice();
} else {
dawn_native::BackendType type;
wgpu::BackendType type;
#if USE_OPENGL_BACKEND
dawn_native::opengl::AdapterDiscoveryOptions adapterOptions;
adapterOptions.getProc = reinterpret_cast<void*(*)(const char*)>(
@ -116,15 +118,15 @@ public:
#endif
);
instance->DiscoverAdapters(&adapterOptions);
type = dawn_native::BackendType::OpenGL;
type = wgpu::BackendType::OpenGL;
#else
instance->DiscoverDefaultAdapters();
#if defined(SK_BUILD_FOR_MAC)
type = dawn_native::BackendType::Metal;
type = wgpu::BackendType::Metal;
#elif defined(SK_BUILD_FOR_WIN)
type = dawn_native::BackendType::D3D12;
type = wgpu::BackendType::D3D12;
#elif defined(SK_BUILD_FOR_UNIX)
type = dawn_native::BackendType::Vulkan;
type = wgpu::BackendType::Vulkan;
#endif
#endif
device = createDevice(*instance, type);

6
tools/sk_app/DawnWindowContext.cpp
View File

@ -106,14 +106,16 @@ void DawnWindowContext::setDisplayParams(const DisplayParams& params) {
fDisplayParams = params;
}
wgpu::Device DawnWindowContext::createDevice(dawn_native::BackendType type) {
wgpu::Device DawnWindowContext::createDevice(wgpu::BackendType type) {
fInstance->DiscoverDefaultAdapters();
DawnProcTable backendProcs = dawn_native::GetProcs();
dawnProcSetProcs(&backendProcs);
std::vector<dawn_native::Adapter> adapters = fInstance->GetAdapters();
for (dawn_native::Adapter adapter : adapters) {
if (adapter.GetBackendType() == type) {
wgpu::AdapterProperties properties;
adapter.GetProperties(&properties);
if (properties.backendType == type) {
return adapter.CreateDevice();
}
}

2
tools/sk_app/DawnWindowContext.h
View File

@ -32,7 +32,7 @@ public:
protected:
bool isGpuContext() override { return true; }
void initializeContext(int width, int height);
wgpu::Device createDevice(dawn_native::BackendType type);
wgpu::Device createDevice(wgpu::BackendType type);
virtual wgpu::Device onInitializeContext() = 0;
virtual void onDestroyContext() = 0;
virtual void onSwapBuffers() = 0;

2
tools/sk_app/mac/DawnMTLWindowContext_mac.mm
View File

@ -119,7 +119,7 @@ DawnSwapChainImplementation DawnMTLWindowContext::createSwapChainImplementation(
}
wgpu::Device DawnMTLWindowContext::onInitializeContext() {
wgpu::Device device = this->createDevice(dawn_native::BackendType::Metal);
wgpu::Device device = this->createDevice(wgpu::BackendType::Metal);
if (!device) {
return nullptr;
}

2
tools/sk_app/unix/DawnVulkanWindowContext_unix.cpp
View File

@ -58,7 +58,7 @@ DawnSwapChainImplementation DawnVulkanWindowContext_xlib::createSwapChainImpleme
}
wgpu::Device DawnVulkanWindowContext_xlib::onInitializeContext() {
wgpu::Device device = this->createDevice(dawn_native::BackendType::Vulkan);
wgpu::Device device = this->createDevice(wgpu::BackendType::Vulkan);
if (!device) {
return nullptr;
}

2
tools/sk_app/win/DawnD3D12WindowContext_win.cpp
View File

@ -46,7 +46,7 @@ DawnSwapChainImplementation DawnD3D12WindowContext::createSwapChainImplementatio
}
wgpu::Device DawnD3D12WindowContext::onInitializeContext() {
return this->createDevice(dawn_native::BackendType::D3D12);
return this->createDevice(wgpu::BackendType::D3D12);
}
void DawnD3D12WindowContext::onDestroyContext() {