yukijoou/kwin
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

backends/x11: Make SwapEventFilter report presentation feedback to OutputFrame

Browse source
This commit is contained in:
Vlad Zahorodnii 2024-02-29 16:46:05 +02:00
parent 64dc01c640
commit 79b7545840
2 changed files with 8 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
src/backends/x11/standalone/x11_standalone_glx_backend.cpp
View file

@ -74,8 +74,9 @@ typedef struct xcb_glx_buffer_swap_complete_event_t
namespace KWin
{
SwapEventFilter::SwapEventFilter(xcb_drawable_t drawable, xcb_glx_drawable_t glxDrawable)
SwapEventFilter::SwapEventFilter(GlxBackend *backend, xcb_drawable_t drawable, xcb_glx_drawable_t glxDrawable)
: X11EventFilter(Xcb::Extensions::self()->glxEventBase() + XCB_GLX_BUFFER_SWAP_COMPLETE)
, m_backend(backend)
, m_drawable(drawable)
, m_glxDrawable(glxDrawable)
{
@ -92,9 +93,7 @@ bool SwapEventFilter::event(xcb_generic_event_t *event)
// The clock for the UST timestamp is left unspecified in the spec, however, usually,
// it's CLOCK_MONOTONIC, so no special conversions are needed.
const std::chrono::microseconds timestamp((uint64_t(swapEvent->ust_hi) << 32) | swapEvent->ust_lo);
const auto platform = static_cast<X11StandaloneBackend *>(kwinApp()->outputBackend());
RenderLoopPrivate::get(platform->renderLoop())->notifyFrameCompleted(timestamp, Compositor::self()->backend()->primaryLayer(nullptr)->queryRenderTime());
m_backend->vblank(timestamp);
return true;
}
@ -303,7 +302,7 @@ void GlxBackend::init()
if (supportsSwapEvent && !forceSoftwareVsync) {
// Nice, the GLX_INTEL_swap_event extension is available. We are going to receive
// the presentation timestamp (UST) after glXSwapBuffers() via the X command stream.
m_swapEventFilter = std::make_unique<SwapEventFilter>(window, glxWindow);
m_swapEventFilter = std::make_unique<SwapEventFilter>(this, window, glxWindow);
glXSelectEvent(display(), glxWindow, GLX_BUFFER_SWAP_COMPLETE_INTEL_MASK);
} else {
// If the GLX_INTEL_swap_event extension is unavailble, we are going to wait for

6
src/backends/x11/standalone/x11_standalone_glx_backend.h
View file

@ -53,10 +53,11 @@ public:
class SwapEventFilter : public X11EventFilter
{
public:
SwapEventFilter(xcb_drawable_t drawable, xcb_glx_drawable_t glxDrawable);
SwapEventFilter(GlxBackend *backend, xcb_drawable_t drawable, xcb_glx_drawable_t glxDrawable);
bool event(xcb_generic_event_t *event) override;
private:
GlxBackend *m_backend;
xcb_drawable_t m_drawable;
xcb_glx_drawable_t m_glxDrawable;
};
@ -100,8 +101,9 @@ public:
return m_x11Display;
}
private:
void vblank(std::chrono::nanoseconds timestamp);
private:
void present(const QRegion &damage);
bool initBuffer();
bool checkVersion();