Changeset 280681 in webkit

Timestamp:

Aug 5, 2021, 12:40:52 AM (5 years ago)

Author:

imanol

Message:

Fix XR related clang warnings in WPE
​https://bugs.webkit.org/show_bug.cgi?id=228779

Reviewed by Sam Weinig.

Fix a few compiler warnings.

Source/WebCore:

• platform/xr/openxr/OpenXRInputSource.cpp:

(PlatformXR::OpenXRInputSource::getButton const):

• platform/xr/openxr/OpenXRSwapchain.cpp:

(PlatformXR::OpenXRSwapchain::create):
(PlatformXR::OpenXRSwapchain::OpenXRSwapchain):
(PlatformXR::OpenXRSwapchain::acquireImage):

• platform/xr/openxr/OpenXRSwapchain.h:

Source/WebKit:

• Shared/XR/XRDeviceProxy.cpp:

(WebKit::XRDeviceProxy::views const):

Location:

trunk/Source

Files:

• WebCore/ChangeLog (modified) (1 diff)
• WebCore/platform/xr/openxr/OpenXRInputSource.cpp (modified) (1 diff)
• WebCore/platform/xr/openxr/OpenXRSwapchain.cpp (modified) (2 diffs)
• WebCore/platform/xr/openxr/OpenXRSwapchain.h (modified) (1 diff)
• WebKit/ChangeLog (modified) (1 diff)
• WebKit/Shared/XR/XRDeviceProxy.cpp (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2021-08-05  Imanol Fernandez  <ifernandez@igalia.com>
+
+        Fix XR related clang warnings in WPE
+        https://bugs.webkit.org/show_bug.cgi?id=228779
+
+        Reviewed by Sam Weinig.
+
+        Fix a few compiler warnings.
+
+        * platform/xr/openxr/OpenXRInputSource.cpp:
+        (PlatformXR::OpenXRInputSource::getButton const):
+        * platform/xr/openxr/OpenXRSwapchain.cpp:
+        (PlatformXR::OpenXRSwapchain::create):
+        (PlatformXR::OpenXRSwapchain::OpenXRSwapchain):
+        (PlatformXR::OpenXRSwapchain::acquireImage):
+        * platform/xr/openxr/OpenXRSwapchain.h:
+
 2021-08-04  Darin Adler  <darin@apple.com>
 

trunk/Source/WebCore/platform/xr/openxr/OpenXRInputSource.cpp

@@ -301 +301 @@
 
     auto queryActionState = [this, &hasValue](XrAction action, auto& value, auto defaultValue) {
-        if (action != XR_NULL_HANDLE && XR_SUCCEEDED(getActionState(action, &value)))
+        if (action != XR_NULL_HANDLE && XR_SUCCEEDED(this->getActionState(action, &value)))
             hasValue = true;
         else

trunk/Source/WebCore/platform/xr/openxr/OpenXRSwapchain.cpp

@@ -57 +57 @@
     RETURN_IF_FAILED(result, "xrEnumerateSwapchainImages with imageCount", instance, nullptr);
 
-    return std::unique_ptr<OpenXRSwapchain>(new OpenXRSwapchain(instance, session, swapchain, info, WTFMove(imageBuffers)));
+    return std::unique_ptr<OpenXRSwapchain>(new OpenXRSwapchain(instance, swapchain, info, WTFMove(imageBuffers)));
 }
 
-OpenXRSwapchain::OpenXRSwapchain(XrInstance instance, XrSession session, XrSwapchain swapchain, const XrSwapchainCreateInfo& info, Vector<XrSwapchainImageOpenGLKHR>&& imageBuffers)
+OpenXRSwapchain::OpenXRSwapchain(XrInstance instance, XrSwapchain swapchain, const XrSwapchainCreateInfo& info, Vector<XrSwapchainImageOpenGLKHR>&& imageBuffers)
     : m_instance(instance)
-    , m_session(session)
     , m_swapchain(swapchain)
     , m_createInfo(info)
@@ -79 +78 @@
 std::optional<PlatformGLObject> OpenXRSwapchain::acquireImage()
 {
+#if LOG_DISABLED
+    UNUSED_VARIABLE(m_instance);
+#endif
+
     RELEASE_ASSERT_WITH_MESSAGE(!m_acquiredTexture , "Expected no acquired images. ReleaseImage not called?");
 

trunk/Source/WebCore/platform/xr/openxr/OpenXRSwapchain.h

@@ -44 +44 @@
 
 private:
-    OpenXRSwapchain(XrInstance, XrSession, XrSwapchain, const XrSwapchainCreateInfo&, Vector<XrSwapchainImageOpenGLKHR>&&);
+    OpenXRSwapchain(XrInstance, XrSwapchain, const XrSwapchainCreateInfo&, Vector<XrSwapchainImageOpenGLKHR>&&);
 
     XrInstance m_instance;
-    XrSession m_session;
     XrSwapchain m_swapchain;
     XrSwapchainCreateInfo m_createInfo;

trunk/Source/WebKit/ChangeLog

@@ +1 @@
+2021-08-05  Imanol Fernandez  <ifernandez@igalia.com>
+
+        Fix XR related clang warnings in WPE
+        https://bugs.webkit.org/show_bug.cgi?id=228779
+
+        Reviewed by Sam Weinig.
+
+        Fix a few compiler warnings.
+
+        * Shared/XR/XRDeviceProxy.cpp:
+        (WebKit::XRDeviceProxy::views const):
+
 2021-08-04  Tim Horton  <timothy_horton@apple.com>
 

trunk/Source/WebKit/Shared/XR/XRDeviceProxy.cpp

@@ -77 +77 @@
     Vector<Device::ViewData> views;
     if (m_supportsStereoRendering && mode == SessionMode::ImmersiveVr) {
-        views.append({ .active = true, Eye::Left });
-        views.append({ .active = true, Eye::Right });
+        views.append({ .active = true, .eye = Eye::Left });
+        views.append({ .active = true, .eye = Eye::Right });
     } else
-        views.append({ .active = true, Eye::None });
+        views.append({ .active = true, .eye = Eye::None });
     return views;
 }