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

Rename Surface::Type::Xlib to XlibWindow for consistency. 

Bug: None
Change-Id: I2750c2fc86cc893d6f124cf7d539a85458bd4105
Reviewed-on: https://dawn-review.googlesource.com/c/dawn/+/84761
Auto-Submit: Corentin Wallez <cwallez@chromium.org>
Reviewed-by: Austin Eng <enga@chromium.org>
Commit-Queue: Austin Eng <enga@chromium.org>
This commit is contained in:
Corentin Wallez 2022-03-29 19:32:23 +00:00 committed by Dawn LUCI CQ
parent fd41f30c0b
commit 982188ac16
3 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/dawn/native/Surface.cpp
View File

@ -35,6 +35,9 @@ namespace dawn::native {
const absl::FormatConversionSpec& spec, const absl::FormatConversionSpec& spec,
absl::FormatSink* s) { absl::FormatSink* s) {
switch (value) { switch (value) {
case Surface::Type::AndroidWindow:
s->Append("AndroidWindow");
break;
case Surface::Type::MetalLayer: case Surface::Type::MetalLayer:
s->Append("MetalLayer"); s->Append("MetalLayer");
break; break;
@ -47,11 +50,8 @@ namespace dawn::native {
case Surface::Type::WindowsSwapChainPanel: case Surface::Type::WindowsSwapChainPanel:
s->Append("WindowsSwapChainPanel"); s->Append("WindowsSwapChainPanel");
break; break;
case Surface::Type::Xlib: case Surface::Type::XlibWindow:
s->Append("Xlib"); s->Append("XlibWindow");
break;
case Surface::Type::AndroidWindow:
s->Append("AndroidWindow");
break; break;
} }
return {true}; return {true};
@ -190,7 +190,7 @@ namespace dawn::native {
mSwapChainPanel = static_cast<IUnknown*>(swapChainPanelDesc->swapChainPanel); mSwapChainPanel = static_cast<IUnknown*>(swapChainPanelDesc->swapChainPanel);
#endif // defined(DAWN_PLATFORM_WINDOWS) #endif // defined(DAWN_PLATFORM_WINDOWS)
} else if (xDesc) { } else if (xDesc) {
mType = Type::Xlib; mType = Type::XlibWindow;
mXDisplay = xDesc->display; mXDisplay = xDesc->display;
mXWindow = xDesc->window; mXWindow = xDesc->window;
} else { } else {
@ -259,11 +259,11 @@ namespace dawn::native {
} }
void* Surface::GetXDisplay() const { void* Surface::GetXDisplay() const {
ASSERT(mType == Type::Xlib); ASSERT(mType == Type::XlibWindow);
return mXDisplay; return mXDisplay;
} }
uint32_t Surface::GetXWindow() const { uint32_t Surface::GetXWindow() const {
ASSERT(mType == Type::Xlib); ASSERT(mType == Type::XlibWindow);
return mXWindow; return mXWindow;
} }

2
src/dawn/native/Surface.h
View File

@ -56,7 +56,7 @@ namespace dawn::native {
WindowsHWND, WindowsHWND,
WindowsCoreWindow, WindowsCoreWindow,
WindowsSwapChainPanel, WindowsSwapChainPanel,
Xlib XlibWindow,
}; };
Type GetType() const; Type GetType() const;
InstanceBase* GetInstance(); InstanceBase* GetInstance();

2
src/dawn/native/vulkan/SwapChainVk.cpp
View File

@ -159,7 +159,7 @@ namespace dawn::native::vulkan {
#endif // defined(DAWN_PLATFORM_ANDROID) #endif // defined(DAWN_PLATFORM_ANDROID)
#if defined(DAWN_USE_X11) #if defined(DAWN_USE_X11)
case Surface::Type::Xlib: { case Surface::Type::XlibWindow: {
if (info.HasExt(InstanceExt::XlibSurface)) { if (info.HasExt(InstanceExt::XlibSurface)) {
VkXlibSurfaceCreateInfoKHR createInfo; VkXlibSurfaceCreateInfoKHR createInfo;
createInfo.sType = VK_STRUCTURE_TYPE_XLIB_SURFACE_CREATE_INFO_KHR; createInfo.sType = VK_STRUCTURE_TYPE_XLIB_SURFACE_CREATE_INFO_KHR;