backends/drm: outputLayer -> primaryLayer

It makes terminology consistent.

src/backends/drm/drm_abstract_output.h

@@ -30,7 +30,7 @@ public:
     DrmGpu *gpu() const;
 
     virtual bool present() = 0;
-    virtual DrmOutputLayer *outputLayer() const = 0;
+    virtual DrmOutputLayer *primaryLayer() const = 0;
 
     void updateEnabled(bool enabled);
 

src/backends/drm/drm_egl_backend.cpp

@@ -208,13 +208,13 @@ void EglGbmBackend::present(Output *output)
 
 OutputLayer *EglGbmBackend::primaryLayer(Output *output)
 {
-    return static_cast<DrmAbstractOutput *>(output)->outputLayer();
+    return static_cast<DrmAbstractOutput *>(output)->primaryLayer();
 }
 
 std::shared_ptr<GLTexture> EglGbmBackend::textureForOutput(Output *output) const
 {
     const auto drmOutput = static_cast<DrmAbstractOutput *>(output);
-    return static_cast<EglGbmLayer *>(drmOutput->outputLayer())->texture();
+    return static_cast<EglGbmLayer *>(drmOutput->primaryLayer())->texture();
 }
 
 std::optional<GbmFormat> EglGbmBackend::gbmFormatForDrmFormat(uint32_t format) const

src/backends/drm/drm_gpu.cpp

@@ -767,7 +767,7 @@ void DrmGpu::releaseBuffers()
         pipeline->cursorLayer()->releaseBuffers();
     }
     for (const auto &output : std::as_const(m_virtualOutputs)) {
-        output->outputLayer()->releaseBuffers();
+        output->primaryLayer()->releaseBuffers();
     }
 }
 

src/backends/drm/drm_output.cpp

@@ -453,7 +453,7 @@ bool DrmOutput::usesSoftwareCursor() const
     return !m_setCursorSuccessful || !m_moveCursorSuccessful;
 }
 
-DrmOutputLayer *DrmOutput::outputLayer() const
+DrmOutputLayer *DrmOutput::primaryLayer() const
 {
     return m_pipeline->primaryLayer();
 }

src/backends/drm/drm_output.h

@@ -42,7 +42,7 @@ public:
     DrmPipeline *pipeline() const;
 
     bool present() override;
-    DrmOutputLayer *outputLayer() const override;
+    DrmOutputLayer *primaryLayer() const override;
 
     bool queueChanges(const OutputConfiguration &config);
     void applyQueuedChanges(const OutputConfiguration &config);

src/backends/drm/drm_qpainter_backend.cpp

@@ -41,7 +41,7 @@ void DrmQPainterBackend::present(Output *output)
 
 OutputLayer *DrmQPainterBackend::primaryLayer(Output *output)
 {
-    return static_cast<DrmAbstractOutput *>(output)->outputLayer();
+    return static_cast<DrmAbstractOutput *>(output)->primaryLayer();
 }
 
 std::shared_ptr<DrmPipelineLayer> DrmQPainterBackend::createPrimaryLayer(DrmPipeline *pipeline)

src/backends/drm/drm_virtual_output.cpp

@@ -69,7 +69,7 @@ void DrmVirtualOutput::setDpmsMode(DpmsMode mode)
     setState(next);
 }
 
-DrmOutputLayer *DrmVirtualOutput::outputLayer() const
+DrmOutputLayer *DrmVirtualOutput::primaryLayer() const
 {
     return m_layer.get();
 }

src/backends/drm/drm_virtual_output.h

@@ -30,7 +30,7 @@ public:
     ~DrmVirtualOutput() override;
 
     bool present() override;
-    DrmOutputLayer *outputLayer() const override;
+    DrmOutputLayer *primaryLayer() const override;
     void recreateSurface();
 
 private:

src/composite.cpp

@@ -615,12 +615,12 @@ void Compositor::composite(RenderLoop *renderLoop)
     }
 
     Output *output = findOutput(renderLoop);
-    OutputLayer *outputLayer = m_backend->primaryLayer(output);
+    OutputLayer *primaryLayer = m_backend->primaryLayer(output);
     fTraceDuration("Paint (", output->name(), ")");
 
     RenderLayer *superLayer = m_superlayers[renderLoop];
     prePaintPass(superLayer);
-    superLayer->setOutputLayer(outputLayer);
+    superLayer->setOutputLayer(primaryLayer);
 
     SurfaceItem *scanoutCandidate = superLayer->delegate()->scanoutCandidate();
     renderLoop->setFullscreenSurface(scanoutCandidate);
@@ -634,24 +634,24 @@ void Compositor::composite(RenderLoop *renderLoop)
             return sublayer->isVisible();
         });
         if (scanoutPossible && !output->directScanoutInhibited()) {
-            directScanout = outputLayer->scanout(scanoutCandidate);
+            directScanout = primaryLayer->scanout(scanoutCandidate);
         }
     }
 
     if (!directScanout) {
-        QRegion surfaceDamage = outputLayer->repaints();
-        outputLayer->resetRepaints();
+        QRegion surfaceDamage = primaryLayer->repaints();
+        primaryLayer->resetRepaints();
         preparePaintPass(superLayer, &surfaceDamage);
 
-        if (auto beginInfo = outputLayer->beginFrame()) {
+        if (auto beginInfo = primaryLayer->beginFrame()) {
             auto &[renderTarget, repaint] = beginInfo.value();
             renderTarget.setDevicePixelRatio(output->scale());
 
             const QRegion bufferDamage = surfaceDamage.united(repaint).intersected(superLayer->rect());
-            outputLayer->aboutToStartPainting(bufferDamage);
+            primaryLayer->aboutToStartPainting(bufferDamage);
 
             paintPass(superLayer, &renderTarget, bufferDamage);
-            outputLayer->endFrame(bufferDamage, surfaceDamage);
+            primaryLayer->endFrame(bufferDamage, surfaceDamage);
         }
     }
     renderLoop->endFrame();