From f82ddea5bc1f27fbc47f067ca9c0f2bfcd06319f Mon Sep 17 00:00:00 2001 From: Yun Hsiao Wu Date: Thu, 29 Oct 2020 13:46:09 +0800 Subject: [PATCH] pipeline adaptations for pre-rotation (#2958) --- native/cocos/renderer/gfx-vulkan/VKDevice.cpp | 8 ++++---- .../cocos/renderer/pipeline/forward/ForwardStage.cpp | 12 +++++++----- native/cocos/renderer/pipeline/ui/UIStage.cpp | 11 +++++++---- 3 files changed, 18 insertions(+), 13 deletions(-) diff --git a/native/cocos/renderer/gfx-vulkan/VKDevice.cpp b/native/cocos/renderer/gfx-vulkan/VKDevice.cpp index de879b5668..32157d93c8 100644 --- a/native/cocos/renderer/gfx-vulkan/VKDevice.cpp +++ b/native/cocos/renderer/gfx-vulkan/VKDevice.cpp @@ -471,10 +471,8 @@ void CCVKDevice::destroy() { CC_SAFE_DESTROY(_context); } -void CCVKDevice::resize(uint width, uint height) { - _width = width; - _height = height; -} +// op-op since we maintain surface size internally +void CCVKDevice::resize(uint width, uint height) {} void CCVKDevice::acquire() { CCVKQueue *queue = (CCVKQueue *)_queue; @@ -728,6 +726,8 @@ bool CCVKDevice::checkSwapchainStatus() { _transform = MapSurfaceTransform(preTransform); context->swapchainCreateInfo.preTransform = preTransform; + CC_LOG_INFO("Resizing surface: %dx%d, surface rotation: %d degrees", newWidth, newHeight, (uint)_transform * 90); + VK_CHECK(vkCreateSwapchainKHR(_gpuDevice->vkDevice, &context->swapchainCreateInfo, nullptr, &_gpuSwapchain->vkSwapchain)); if (context->swapchainCreateInfo.oldSwapchain != VK_NULL_HANDLE) { diff --git a/native/cocos/renderer/pipeline/forward/ForwardStage.cpp b/native/cocos/renderer/pipeline/forward/ForwardStage.cpp index 069deb19df..10756623ba 100644 --- a/native/cocos/renderer/pipeline/forward/ForwardStage.cpp +++ b/native/cocos/renderer/pipeline/forward/ForwardStage.cpp @@ -138,11 +138,13 @@ void ForwardStage::render(RenderView *view) { _additiveLightQueue->gatherLightPasses(view, cmdBuff); auto camera = view->getCamera(); - - _renderArea.x = camera->viewportX * camera->width; - _renderArea.y = camera->viewportY * camera->height; - _renderArea.width = camera->viewportWidth * camera->width * pipeline->getShadingScale(); - _renderArea.height = camera->viewportHeight * camera->height * pipeline->getShadingScale(); + // render area is not oriented + uint w = (uint)_device->getSurfaceTransform() % 2 ? camera->height : camera->width; + uint h = (uint)_device->getSurfaceTransform() % 2 ? camera->width : camera->height; + _renderArea.x = camera->viewportX * w; + _renderArea.y = camera->viewportY * h; + _renderArea.width = camera->viewportWidth * w * pipeline->getShadingScale(); + _renderArea.height = camera->viewportHeight * h * pipeline->getShadingScale(); if (static_cast(camera->clearFlag) & gfx::ClearFlagBit::COLOR) { if (pipeline->isHDR()) { diff --git a/native/cocos/renderer/pipeline/ui/UIStage.cpp b/native/cocos/renderer/pipeline/ui/UIStage.cpp index 18a1ac526f..86cf7eedb5 100644 --- a/native/cocos/renderer/pipeline/ui/UIStage.cpp +++ b/native/cocos/renderer/pipeline/ui/UIStage.cpp @@ -69,10 +69,13 @@ void UIStage::render(RenderView *view) { _renderQueues[0]->sort(); const auto camera = view->getCamera(); - _renderArea.x = camera->viewportX * camera->width; - _renderArea.y = camera->viewportY * camera->height; - _renderArea.width = camera->viewportWidth * camera->width; - _renderArea.height = camera->viewportHeight * camera->height; + // render area is not oriented + uint w = (uint)_device->getSurfaceTransform() % 2 ? camera->height : camera->width; + uint h = (uint)_device->getSurfaceTransform() % 2 ? camera->width : camera->height; + _renderArea.x = camera->viewportX * w; + _renderArea.y = camera->viewportY * h; + _renderArea.width = camera->viewportWidth * w; + _renderArea.height = camera->viewportHeight * h; auto cmdBuff = pipeline->getCommandBuffers()[0];