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

Rename SurfaceDescriptorFromXlib -> SurfaceDescriptorFromXlibWindow 

As suggested by
https://github.com/webgpu-native/webgpu-headers/pull/150#discussion_r822311773

Bug: none
Change-Id: I4f611a1c345eb644168cf923c6c0c1672114b9d9
Reviewed-on: https://dawn-review.googlesource.com/c/dawn/+/83201
Reviewed-by: Austin Eng <enga@chromium.org>
Commit-Queue: Shrek Shao <shrekshao@google.com>
This commit is contained in:
Shrek Shao 2022-03-09 19:04:21 +00:00 committed by Dawn LUCI CQ
parent 74d4e53fc6
commit 5b9b9867cd
5 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
dawn.json
View File

@ -2335,7 +2335,7 @@
{"name": "hwnd", "type": "void", "annotation": "*"} {"name": "hwnd", "type": "void", "annotation": "*"}
] ]
}, },
"surface descriptor from xlib": { "surface descriptor from xlib window": {
"category": "structure", "category": "structure",
"chained": "in", "chained": "in",
"tags": ["native"], "tags": ["native"],
@ -2406,7 +2406,7 @@
{"value": 0, "name": "invalid", "valid": false}, {"value": 0, "name": "invalid", "valid": false},
{"value": 1, "name": "surface descriptor from metal layer", "tags": ["native"]}, {"value": 1, "name": "surface descriptor from metal layer", "tags": ["native"]},
{"value": 2, "name": "surface descriptor from windows HWND", "tags": ["native"]}, {"value": 2, "name": "surface descriptor from windows HWND", "tags": ["native"]},
{"value": 3, "name": "surface descriptor from xlib", "tags": ["native"]}, {"value": 3, "name": "surface descriptor from xlib window", "tags": ["native"]},
{"value": 4, "name": "surface descriptor from canvas HTML selector"}, {"value": 4, "name": "surface descriptor from canvas HTML selector"},
{"value": 5, "name": "shader module SPIRV descriptor"}, {"value": 5, "name": "shader module SPIRV descriptor"},
{"value": 6, "name": "shader module WGSL descriptor"}, {"value": 6, "name": "shader module WGSL descriptor"},

2
dawn_wire.json
View File

@ -174,7 +174,7 @@
"client_side_structures": [ "client_side_structures": [
"SurfaceDescriptorFromMetalLayer", "SurfaceDescriptorFromMetalLayer",
"SurfaceDescriptorFromWindowsHWND", "SurfaceDescriptorFromWindowsHWND",
"SurfaceDescriptorFromXlib", "SurfaceDescriptorFromXlibWindow",
"SurfaceDescriptorFromWindowsCoreWindow", "SurfaceDescriptorFromWindowsCoreWindow",
"SurfaceDescriptorFromWindowsSwapChainPanel" "SurfaceDescriptorFromWindowsSwapChainPanel"
], ],

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

@ -69,7 +69,7 @@ namespace dawn::native {
wgpu::SType::SurfaceDescriptorFromWindowsHWND, wgpu::SType::SurfaceDescriptorFromWindowsHWND,
wgpu::SType::SurfaceDescriptorFromWindowsCoreWindow, wgpu::SType::SurfaceDescriptorFromWindowsCoreWindow,
wgpu::SType::SurfaceDescriptorFromWindowsSwapChainPanel, wgpu::SType::SurfaceDescriptorFromWindowsSwapChainPanel,
wgpu::SType::SurfaceDescriptorFromXlib)); wgpu::SType::SurfaceDescriptorFromXlibWindow));
#if defined(DAWN_ENABLE_BACKEND_METAL) #if defined(DAWN_ENABLE_BACKEND_METAL)
const SurfaceDescriptorFromMetalLayer* metalDesc = nullptr; const SurfaceDescriptorFromMetalLayer* metalDesc = nullptr;
@ -116,7 +116,7 @@ namespace dawn::native {
#endif // defined(DAWN_PLATFORM_WINDOWS) #endif // defined(DAWN_PLATFORM_WINDOWS)
#if defined(DAWN_USE_X11) #if defined(DAWN_USE_X11)
const SurfaceDescriptorFromXlib* xDesc = nullptr; const SurfaceDescriptorFromXlibWindow* xDesc = nullptr;
FindInChain(descriptor->nextInChain, &xDesc); FindInChain(descriptor->nextInChain, &xDesc);
if (xDesc) { if (xDesc) {
// Check the validity of the window by calling a getter function on the window that // Check the validity of the window by calling a getter function on the window that
@ -146,7 +146,7 @@ namespace dawn::native {
const SurfaceDescriptorFromWindowsHWND* hwndDesc = nullptr; const SurfaceDescriptorFromWindowsHWND* hwndDesc = nullptr;
const SurfaceDescriptorFromWindowsCoreWindow* coreWindowDesc = nullptr; const SurfaceDescriptorFromWindowsCoreWindow* coreWindowDesc = nullptr;
const SurfaceDescriptorFromWindowsSwapChainPanel* swapChainPanelDesc = nullptr; const SurfaceDescriptorFromWindowsSwapChainPanel* swapChainPanelDesc = nullptr;
const SurfaceDescriptorFromXlib* xDesc = nullptr; const SurfaceDescriptorFromXlibWindow* xDesc = nullptr;
FindInChain(descriptor->nextInChain, &metalDesc); FindInChain(descriptor->nextInChain, &metalDesc);
FindInChain(descriptor->nextInChain, &hwndDesc); FindInChain(descriptor->nextInChain, &hwndDesc);
FindInChain(descriptor->nextInChain, &coreWindowDesc); FindInChain(descriptor->nextInChain, &coreWindowDesc);

6
src/dawn/tests/end2end/WindowSurfaceTests.cpp
View File

@ -181,12 +181,12 @@ TEST_F(WindowSurfaceInstanceTests, CorrectSTypeXlib) {
GLFWwindow* window = CreateWindow(); GLFWwindow* window = CreateWindow();
std::unique_ptr<wgpu::ChainedStruct> chainedDescriptor = std::unique_ptr<wgpu::ChainedStruct> chainedDescriptor =
utils::SetupWindowAndGetSurfaceDescriptorForTesting(window); utils::SetupWindowAndGetSurfaceDescriptorForTesting(window);
ASSERT_EQ(chainedDescriptor->sType, wgpu::SType::SurfaceDescriptorFromXlib); ASSERT_EQ(chainedDescriptor->sType, wgpu::SType::SurfaceDescriptorFromXlibWindow);
} }
// Test with setting an invalid window // Test with setting an invalid window
TEST_F(WindowSurfaceInstanceTests, InvalidXWindow) { TEST_F(WindowSurfaceInstanceTests, InvalidXWindow) {
wgpu::SurfaceDescriptorFromXlib chainedDescriptor; wgpu::SurfaceDescriptorFromXlibWindow chainedDescriptor;
chainedDescriptor.display = XOpenDisplay(nullptr); chainedDescriptor.display = XOpenDisplay(nullptr);
// From the "X Window System Protocol" "X Version 11, Release 6.8" page 2 at // From the "X Window System Protocol" "X Version 11, Release 6.8" page 2 at
// https://www.x.org/releases/X11R7.5/doc/x11proto/proto.pdf // https://www.x.org/releases/X11R7.5/doc/x11proto/proto.pdf
@ -203,7 +203,7 @@ TEST_F(WindowSurfaceInstanceTests, InvalidXWindow) {
// Test using Xlib when it is not supported // Test using Xlib when it is not supported
TEST_F(WindowSurfaceInstanceTests, XlibSurfacesAreInvalid) { TEST_F(WindowSurfaceInstanceTests, XlibSurfacesAreInvalid) {
wgpu::SurfaceDescriptorFromXlib chainedDescriptor; wgpu::SurfaceDescriptorFromXlibWindow chainedDescriptor;
chainedDescriptor.display = nullptr; chainedDescriptor.display = nullptr;
chainedDescriptor.window = 0; chainedDescriptor.window = 0;

4
src/dawn/utils/GLFWUtils.cpp
View File

@ -71,8 +71,8 @@ namespace utils {
#elif defined(DAWN_USE_X11) #elif defined(DAWN_USE_X11)
std::unique_ptr<wgpu::ChainedStruct> SetupWindowAndGetSurfaceDescriptorForTesting( std::unique_ptr<wgpu::ChainedStruct> SetupWindowAndGetSurfaceDescriptorForTesting(
GLFWwindow* window) { GLFWwindow* window) {
std::unique_ptr<wgpu::SurfaceDescriptorFromXlib> desc = std::unique_ptr<wgpu::SurfaceDescriptorFromXlibWindow> desc =
std::make_unique<wgpu::SurfaceDescriptorFromXlib>(); std::make_unique<wgpu::SurfaceDescriptorFromXlibWindow>();
desc->display = glfwGetX11Display(); desc->display = glfwGetX11Display();
desc->window = glfwGetX11Window(window); desc->window = glfwGetX11Window(window);
return std::move(desc); return std::move(desc);