RetroPlayer: Remove unneeded geometry variables

xbmc · Jul 2, 2018 · 0f64ca6 · 0f64ca6
1 parent f952eaa
commit 0f64ca6
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 31 deletions.
diff --git a/xbmc/cores/RetroPlayer/rendering/VideoRenderers/RPBaseRenderer.cpp b/xbmc/cores/RetroPlayer/rendering/VideoRenderers/RPBaseRenderer.cpp
@@ -36,14 +36,6 @@ CRPBaseRenderer::CRPBaseRenderer(const CRenderSettings &renderSettings, CRenderC
   m_bufferPool(std::move(bufferPool)),
   m_renderSettings(renderSettings)
 {
-  m_oldDestRect.SetRect(0.0f, 0.0f, 0.0f, 0.0f);
-
-  for(int i=0; i < 4; i++)
-  {
-    m_rotatedDestCoords[i].x = 0;
-    m_rotatedDestCoords[i].y = 0;
-  }
-
   m_bufferPool->RegisterRenderer(this);
 }
 
@@ -180,7 +172,8 @@ void CRPBaseRenderer::ManageRenderArea()
   CRenderUtils::CalculateViewMode(viewMode, rotationDegCCW, m_sourceWidth, m_sourceHeight, screenWidth, screenHeight, pixelRatio, zoomAmount);
 
   // Calculate destination dimensions
-  CRenderUtils::CalcNormalRenderRect(viewRect, GetAspectRatio() * pixelRatio, zoomAmount, m_dimensions);
+  CRect destRect;
+  CRenderUtils::CalcNormalRenderRect(viewRect, GetAspectRatio() * pixelRatio, zoomAmount, destRect);
 
   m_sourceRect.x1 = 0.0f;
   m_sourceRect.y1 = 0.0f;
@@ -189,17 +182,11 @@ void CRPBaseRenderer::ManageRenderArea()
 
   // Clip as needed
   if (!(m_context.IsFullScreenVideo() || m_context.IsCalibrating()))
-    CRenderUtils::ClipRect(viewRect, m_sourceRect, m_dimensions);
+    CRenderUtils::ClipRect(viewRect, m_sourceRect, destRect);
 
-  const CRect &destRect = m_dimensions;
-  if (m_oldDestRect != destRect || m_oldRenderOrientation != rotationDegCCW)
-  {
-    // Adapt the drawing rect points if we have to rotate and either destRect
-    // or orientation changed
-    m_rotatedDestCoords = CRenderUtils::ReorderDrawPoints(destRect, rotationDegCCW, GetAspectRatio());
-    m_oldDestRect = destRect;
-    m_oldRenderOrientation = rotationDegCCW;
-  }
+  // Adapt the drawing rect points if we have to rotate and either destRect
+  // or orientation changed
+  m_rotatedDestCoords = CRenderUtils::ReorderDrawPoints(destRect, rotationDegCCW, GetAspectRatio());
 }
 
 void CRPBaseRenderer::MarkDirty()

diff --git a/xbmc/cores/RetroPlayer/rendering/VideoRenderers/RPBaseRenderer.h b/xbmc/cores/RetroPlayer/rendering/VideoRenderers/RPBaseRenderer.h
@@ -105,23 +105,13 @@ namespace RETRO
     unsigned int m_sourceHeight = 0;
     unsigned int m_renderOrientation = 0; // Degrees counter-clockwise
 
-    /*!
-     * \brief Orientation of the previous frame
-     *
-     * For drawing the texture with glVertex4f (holds all 4 corner points of the
-     * destination rect with correct orientation based on m_renderOrientation.
-     */
-    unsigned int m_oldRenderOrientation = 0;
-
     // Rendering properties
     CRenderSettings m_renderSettings;
-    CRect m_dimensions;
     IRenderBuffer *m_renderBuffer = nullptr;
 
     // Geometry properties
-    std::array<CPoint, 4> m_rotatedDestCoords;
-    CRect m_oldDestRect; // destrect of the previous frame
-    CRect m_sourceRect; // original size of the video
+    CRect m_sourceRect;
+    std::array<CPoint, 4> m_rotatedDestCoords{};
 
   private:
     /*!