From ff205210bbccfb6ea36aca4eb80b64c07c3837e5 Mon Sep 17 00:00:00 2001 From: coulsonwang Date: Fri, 20 Nov 2020 13:36:31 +0800 Subject: [PATCH] fix wrongly render target size (#3053) --- .../renderer/gfx-metal/MTLCommandBuffer.mm | 2 +- native/cocos/renderer/gfx-metal/MTLRenderPass.h | 4 ++++ .../cocos/renderer/gfx-metal/MTLRenderPass.mm | 4 ++++ native/cocos/renderer/gfx-metal/MTLUtils.h | 3 +-- native/cocos/renderer/gfx-metal/MTLUtils.mm | 17 ++++++++++------- 5 files changed, 20 insertions(+), 10 deletions(-) diff --git a/native/cocos/renderer/gfx-metal/MTLCommandBuffer.mm b/native/cocos/renderer/gfx-metal/MTLCommandBuffer.mm index 9539a497c3..3e014c8a91 100644 --- a/native/cocos/renderer/gfx-metal/MTLCommandBuffer.mm +++ b/native/cocos/renderer/gfx-metal/MTLCommandBuffer.mm @@ -92,7 +92,7 @@ void CCMTLCommandBuffer::beginRenderPass(RenderPass *renderPass, Framebuffer *fb MTLRenderPassDescriptor *mtlRenderPassDescriptor = static_cast(renderPass)->getMTLRenderPassDescriptor(); if(!isRenderingEntireDrawable(renderArea)){ //Metal doesn't apply the viewports and scissors to renderpass load-action clearing. - mu::clearRenderArea(_mtlDevice, _mtlCommandBuffer, _mtkView.drawableSize, renderPass, mtlRenderPassDescriptor, renderArea, colors, depth, stencil, _hasScreenClean); + mu::clearRenderArea(_mtlDevice, _mtlCommandBuffer, renderPass, renderArea, colors, depth, stencil, _hasScreenClean); } else { const auto &colorAttachments = renderPass->getColorAttachments(); const auto colorAttachmentCount = colorAttachments.size(); diff --git a/native/cocos/renderer/gfx-metal/MTLRenderPass.h b/native/cocos/renderer/gfx-metal/MTLRenderPass.h index b7fc84649a..d877c1642d 100644 --- a/native/cocos/renderer/gfx-metal/MTLRenderPass.h +++ b/native/cocos/renderer/gfx-metal/MTLRenderPass.h @@ -22,10 +22,14 @@ public: CC_INLINE MTLRenderPassDescriptor *getMTLRenderPassDescriptor() const { return _mtlRenderPassDescriptor; } CC_INLINE size_t getColorRenderTargetNums() const { return _colorRenderTargetNums; } + CC_INLINE uint getRenderTargetWidth() const { return _renderTargetWidth; } + CC_INLINE uint getRenderTargetHeight() const { return _renderTargetHeight; } private: MTLRenderPassDescriptor *_mtlRenderPassDescriptor = nil; size_t _colorRenderTargetNums = 0; + uint _renderTargetWidth = 0; + uint _renderTargetHeight = 0; }; } // namespace gfx diff --git a/native/cocos/renderer/gfx-metal/MTLRenderPass.mm b/native/cocos/renderer/gfx-metal/MTLRenderPass.mm index 716fbeb65e..e7e52d0bed 100644 --- a/native/cocos/renderer/gfx-metal/MTLRenderPass.mm +++ b/native/cocos/renderer/gfx-metal/MTLRenderPass.mm @@ -54,6 +54,10 @@ void CCMTLRenderPass::setColorAttachment(size_t slot, id texture, in _mtlRenderPassDescriptor.colorAttachments[slot].texture = texture; _mtlRenderPassDescriptor.colorAttachments[slot].level = level; + if(slot == 0) { + _renderTargetWidth = texture.width; + _renderTargetHeight = texture.height; + } } void CCMTLRenderPass::setDepthStencilAttachment(id texture, int level) { diff --git a/native/cocos/renderer/gfx-metal/MTLUtils.h b/native/cocos/renderer/gfx-metal/MTLUtils.h index 992193a372..897aded1a9 100644 --- a/native/cocos/renderer/gfx-metal/MTLUtils.h +++ b/native/cocos/renderer/gfx-metal/MTLUtils.h @@ -6,7 +6,6 @@ #import #import #import -#import #include namespace cc { @@ -71,7 +70,7 @@ uint getBlockSzie(Format format); uint getBytesPerRow(Format format, uint width); bool pixelFormatIsColorRenderable(Format format); bool isSamplerDescriptorCompareFunctionSupported(uint family); -void clearRenderArea(CCMTLDevice* device, id commandBuffer, CGSize drawableSize, RenderPass *renderPass, MTLRenderPassDescriptor *renderPassDescriptor, const Rect &renderArea, const Color *colors, float depth, int stencil, bool &hasScreenClean); +void clearRenderArea(CCMTLDevice* device, id commandBuffer, RenderPass *renderPass, const Rect &renderArea, const Color *colors, float depth, int stencil, bool &hasScreenClean); CC_INLINE uint alignUp(uint inSize, uint align) { return ((inSize + align - 1) / align) * align; } } // namespace mu diff --git a/native/cocos/renderer/gfx-metal/MTLUtils.mm b/native/cocos/renderer/gfx-metal/MTLUtils.mm index 6fc23138ea..877bcd9d60 100644 --- a/native/cocos/renderer/gfx-metal/MTLUtils.mm +++ b/native/cocos/renderer/gfx-metal/MTLUtils.mm @@ -11,6 +11,7 @@ #include "MTLDevice.h" #include "MTLShader.h" #include "MTLPipelineState.h" +#include "MTLRenderPass.h" #include namespace cc { @@ -1535,18 +1536,20 @@ CCMTLGPUPipelineState* getClearRenderPassPipelineState(CCMTLDevice *device, Rend return static_cast(pipelineState)->getGPUPipelineState(); } -void clearRenderArea(CCMTLDevice *device, id commandBuffer, CGSize drawableSize, RenderPass *renderPass, MTLRenderPassDescriptor *renderPassDescriptor, const Rect &renderArea, const Color *colors, float depth, int stencil, bool &hasScreenClean) { +void clearRenderArea(CCMTLDevice *device, id commandBuffer, RenderPass *renderPass, const Rect &renderArea, const Color *colors, float depth, int stencil, bool &hasScreenClean) { const auto gpuPSO = getClearRenderPassPipelineState(device, renderPass); - + const auto mtlRenderPass = static_cast(renderPass); + MTLRenderPassDescriptor *renderPassDescriptor = mtlRenderPass->getMTLRenderPassDescriptor(); if(!hasScreenClean) { renderPassDescriptor.colorAttachments[0].loadAction = MTLLoadActionClear; renderPassDescriptor.colorAttachments[0].clearColor = toMTLClearColor(colors[0]); renderPassDescriptor.depthAttachment.clearDepth = depth; renderPassDescriptor.stencilAttachment.clearStencil = stencil; } - - float halfWidth = drawableSize.width * 0.5f ; - float halfHeight = drawableSize.height * 0.5f; + uint renderTargetWidth = mtlRenderPass->getRenderTargetWidth(); + uint renderTargetHeight = mtlRenderPass->getRenderTargetHeight(); + float halfWidth = renderTargetWidth * 0.5f ; + float halfHeight = renderTargetHeight * 0.5f; float rcpWidth = 1.0f / halfWidth ; float rcpHeight = 1.0f / halfHeight; float width = renderArea.x+ renderArea.width; @@ -1573,8 +1576,8 @@ void clearRenderArea(CCMTLDevice *device, id commandBuffer, CG } id renderEncoder = [commandBuffer renderCommandEncoderWithDescriptor:renderPassDescriptor]; - [renderEncoder setViewport:(MTLViewport){0, 0, drawableSize.width, drawableSize.height}]; - [renderEncoder setScissorRect:(MTLScissorRect){0, 0, (NSUInteger)drawableSize.width, (NSUInteger)drawableSize.height}]; + [renderEncoder setViewport:(MTLViewport){0, 0, static_cast(renderTargetWidth), static_cast(renderTargetHeight)}]; + [renderEncoder setScissorRect:(MTLScissorRect){0, 0, renderTargetWidth, renderTargetHeight}]; [renderEncoder setRenderPipelineState:gpuPSO->mtlRenderPipelineState]; if (gpuPSO->mtlDepthStencilState) { [renderEncoder setStencilFrontReferenceValue:gpuPSO->stencilRefFront