Diff
Modified: trunk/Source/WebCore/ChangeLog (280680 => 280681)
--- trunk/Source/WebCore/ChangeLog 2021-08-05 03:31:15 UTC (rev 280680)
+++ trunk/Source/WebCore/ChangeLog 2021-08-05 07:40:52 UTC (rev 280681)
@@ -1,3 +1,20 @@
+2021-08-05 Imanol Fernandez <[email protected]>
+
+ 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 <[email protected]>
Change WebSocket.cpp to @no-unify, since it’s hard to do that for someone without a Mac
Modified: trunk/Source/WebCore/platform/xr/openxr/OpenXRInputSource.cpp (280680 => 280681)
--- trunk/Source/WebCore/platform/xr/openxr/OpenXRInputSource.cpp 2021-08-05 03:31:15 UTC (rev 280680)
+++ trunk/Source/WebCore/platform/xr/openxr/OpenXRInputSource.cpp 2021-08-05 07:40:52 UTC (rev 280681)
@@ -300,7 +300,7 @@
auto& actions = it->value;
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
value = defaultValue;
Modified: trunk/Source/WebCore/platform/xr/openxr/OpenXRSwapchain.cpp (280680 => 280681)
--- trunk/Source/WebCore/platform/xr/openxr/OpenXRSwapchain.cpp 2021-08-05 03:31:15 UTC (rev 280680)
+++ trunk/Source/WebCore/platform/xr/openxr/OpenXRSwapchain.cpp 2021-08-05 07:40:52 UTC (rev 280681)
@@ -56,12 +56,11 @@
result = xrEnumerateSwapchainImages(swapchain, imageCount, &imageCount, imageHeaders[0]);
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)
, m_imageBuffers(WTFMove(imageBuffers))
@@ -78,6 +77,10 @@
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?");
auto acquireInfo = createStructure<XrSwapchainImageAcquireInfo, XR_TYPE_SWAPCHAIN_IMAGE_ACQUIRE_INFO>();
Modified: trunk/Source/WebCore/platform/xr/openxr/OpenXRSwapchain.h (280680 => 280681)
--- trunk/Source/WebCore/platform/xr/openxr/OpenXRSwapchain.h 2021-08-05 03:31:15 UTC (rev 280680)
+++ trunk/Source/WebCore/platform/xr/openxr/OpenXRSwapchain.h 2021-08-05 07:40:52 UTC (rev 280681)
@@ -43,10 +43,9 @@
int32_t height() const { return m_createInfo.height; }
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;
Vector<XrSwapchainImageOpenGLKHR> m_imageBuffers;
Modified: trunk/Source/WebKit/ChangeLog (280680 => 280681)
--- trunk/Source/WebKit/ChangeLog 2021-08-05 03:31:15 UTC (rev 280680)
+++ trunk/Source/WebKit/ChangeLog 2021-08-05 07:40:52 UTC (rev 280681)
@@ -1,3 +1,15 @@
+2021-08-05 Imanol Fernandez <[email protected]>
+
+ 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 <[email protected]>
Bifurcated RemoteLayerBackingStore zooms in every time it repaints
Modified: trunk/Source/WebKit/Shared/XR/XRDeviceProxy.cpp (280680 => 280681)
--- trunk/Source/WebKit/Shared/XR/XRDeviceProxy.cpp 2021-08-05 03:31:15 UTC (rev 280680)
+++ trunk/Source/WebKit/Shared/XR/XRDeviceProxy.cpp 2021-08-05 07:40:52 UTC (rev 280681)
@@ -76,10 +76,10 @@
{
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;
}
