From 3f2f7a9f4af4347b6b16858c4deba9e11dbc2761 Mon Sep 17 00:00:00 2001 From: "huiyu.eun" Date: Wed, 23 Jun 2021 16:49:44 +0900 Subject: [PATCH] Revert "[Tizen] Fix window/screen rotation issue." This reverts commit c2b5ef083bfabe4391903950086002058dd29678. --- dali/internal/render/common/render-algorithms.cpp | 16 ++++++---------- dali/internal/render/common/render-algorithms.h | 10 +++------- 2 files changed, 9 insertions(+), 17 deletions(-) diff --git a/dali/internal/render/common/render-algorithms.cpp b/dali/internal/render/common/render-algorithms.cpp index 5998670..9727826 100644 --- a/dali/internal/render/common/render-algorithms.cpp +++ b/dali/internal/render/common/render-algorithms.cpp @@ -383,13 +383,11 @@ inline void SetupDepthBuffer(const RenderItem& item, Graphics::CommandBuffer& co * @param[in] item The current RenderItem about to be rendered * @param[in,out] commandBuffer The command buffer to write into * @param[in] instruction The render-instruction to process. - * @param[in] orientation The Scene's surface orientation. */ inline void RenderAlgorithms::SetupScissorClipping( const RenderItem& item, Graphics::CommandBuffer& commandBuffer, - const RenderInstruction& instruction, - int orientation) + const RenderInstruction& instruction) { // Get the number of child scissors in the stack (do not include layer or root box). size_t childStackDepth = mScissorStack.size() - 1u; @@ -458,9 +456,8 @@ inline void RenderAlgorithms::SetupScissorClipping( { useScissorBox.y = (instruction.mFrameBuffer->GetHeight() - useScissorBox.height) - useScissorBox.y; } - - Graphics::Viewport graphicsViewport = ViewportFromClippingBox(mViewportRectangle, 0); - commandBuffer.SetScissor(Rect2DFromClippingBox(useScissorBox, orientation, graphicsViewport)); + Graphics::Rect2D scissorBox = {useScissorBox.x, useScissorBox.y, uint32_t(useScissorBox.width), uint32_t(useScissorBox.height)}; + commandBuffer.SetScissor(scissorBox); } } } @@ -471,8 +468,7 @@ inline void RenderAlgorithms::SetupClipping(const RenderItem& uint32_t& lastClippingDepth, uint32_t& lastClippingId, Integration::StencilBufferAvailable stencilBufferAvailable, - const RenderInstruction& instruction, - int orientation) + const RenderInstruction& instruction) { RenderMode::Type renderMode = RenderMode::AUTO; const Renderer* renderer = item.mRenderer; @@ -494,7 +490,7 @@ inline void RenderAlgorithms::SetupClipping(const RenderItem& // As both scissor and stencil clips can be nested, we may be simultaneously traversing up the scissor tree, requiring a scissor to be un-done. Whilst simultaneously adding a new stencil clip. // We process both based on our current and old clipping depths for each mode. // Both methods with return rapidly if there is nothing to be done for that type of clipping. - SetupScissorClipping(item, commandBuffer, instruction, orientation); + SetupScissorClipping(item, commandBuffer, instruction); if(stencilBufferAvailable == Integration::StencilBufferAvailable::TRUE) { @@ -641,7 +637,7 @@ inline void RenderAlgorithms::ProcessRenderList(const RenderList& // Set up clipping based on both the Renderer and Actor APIs. // The Renderer API will be used if specified. If AUTO, the Actors automatic clipping feature will be used. - SetupClipping(item, secondaryCommandBuffer, usedStencilBuffer, lastClippingDepth, lastClippingId, stencilBufferAvailable, instruction, orientation); + SetupClipping(item, secondaryCommandBuffer, usedStencilBuffer, lastClippingDepth, lastClippingId, stencilBufferAvailable, instruction); if(DALI_LIKELY(item.mRenderer)) { diff --git a/dali/internal/render/common/render-algorithms.h b/dali/internal/render/common/render-algorithms.h index 84d5807..8cfcacc 100644 --- a/dali/internal/render/common/render-algorithms.h +++ b/dali/internal/render/common/render-algorithms.h @@ -60,7 +60,7 @@ public: * @param[in] boundTextures The textures bound for rendering * @param[in] viewport The viewport for drawing * @param[in] rootClippingRect The clipping rectangle - * @param[in] orientation The Scene's surface orientation. + * @param[in] orientation The surface orientation */ void ProcessRenderInstruction(const SceneGraph::RenderInstruction& instruction, BufferIndex bufferIndex, @@ -115,13 +115,11 @@ private: * @param[in] commandBuffer The command buffer to write into * @param[in] instruction The render-instruction to process. - * @param[in] orientation The Scene's surface orientation. */ inline void SetupScissorClipping( const Dali::Internal::SceneGraph::RenderItem& item, Graphics::CommandBuffer& commandBuffer, - const Dali::Internal::SceneGraph::RenderInstruction& instruction, - int orientation); + const Dali::Internal::SceneGraph::RenderInstruction& instruction); /** * @brief Set up the clipping based on the specified clipping settings. @@ -132,7 +130,6 @@ private: * @param[in/out] lastClippingId The clipping ID of the last renderer drawn. Used by the clipping feature. * @param[in] stencilBufferAvailable Whether the stencil buffer is available * @param[in] instruction The render-instruction to process. - * @param[in] orientation The Scene's surface orientation. */ inline void SetupClipping(const Dali::Internal::SceneGraph::RenderItem& item, Graphics::CommandBuffer& commandBuffer, @@ -140,8 +137,7 @@ private: uint32_t& lastClippingDepth, uint32_t& lastClippingId, Integration::StencilBufferAvailable stencilBufferAvailable, - const Dali::Internal::SceneGraph::RenderInstruction& instruction, - int orientation); + const Dali::Internal::SceneGraph::RenderInstruction& instruction); /** * @brief Process a render-list. -- 2.7.4