From 8d25a7ddca54ab2d2147f2c6b36be7bcaa8d46ab Mon Sep 17 00:00:00 2001 From: hyde zhou Date: Mon, 27 Jun 2022 11:39:25 +0800 Subject: [PATCH] fix forceUpdate (#11706) * fix forceUpdate --- .../cocos/renderer/gfx-agent/DescriptorSetAgent.cpp | 11 +++++++++++ native/cocos/renderer/gfx-agent/DescriptorSetAgent.h | 1 + native/cocos/renderer/gfx-base/GFXDescriptorSet.cpp | 5 ----- native/cocos/renderer/gfx-base/GFXDescriptorSet.h | 2 +- .../cocos/renderer/gfx-empty/EmptyDescriptorSet.cpp | 3 +++ native/cocos/renderer/gfx-empty/EmptyDescriptorSet.h | 1 + .../cocos/renderer/gfx-gles2/GLES2DescriptorSet.cpp | 5 +++++ native/cocos/renderer/gfx-gles2/GLES2DescriptorSet.h | 1 + .../cocos/renderer/gfx-gles3/GLES3DescriptorSet.cpp | 5 +++++ native/cocos/renderer/gfx-gles3/GLES3DescriptorSet.h | 1 + native/cocos/renderer/gfx-metal/MTLDescriptorSet.h | 1 + native/cocos/renderer/gfx-metal/MTLDescriptorSet.mm | 6 ++++++ .../renderer/gfx-validator/DescriptorSetValidator.cpp | 6 ++++++ .../renderer/gfx-validator/DescriptorSetValidator.h | 1 + native/cocos/renderer/gfx-vulkan/VKDescriptorSet.cpp | 5 +++++ native/cocos/renderer/gfx-vulkan/VKDescriptorSet.h | 1 + 16 files changed, 49 insertions(+), 6 deletions(-) diff --git a/native/cocos/renderer/gfx-agent/DescriptorSetAgent.cpp b/native/cocos/renderer/gfx-agent/DescriptorSetAgent.cpp index 4f68abe46b..a02a5cb265 100644 --- a/native/cocos/renderer/gfx-agent/DescriptorSetAgent.cpp +++ b/native/cocos/renderer/gfx-agent/DescriptorSetAgent.cpp @@ -88,6 +88,17 @@ void DescriptorSetAgent::update() { }); } +void DescriptorSetAgent::forceUpdate() { + _isDirty = false; + ENQUEUE_MESSAGE_1( + DeviceAgent::getInstance()->getMessageQueue(), + DescriptorSetForceUpdate, + actor, getActor(), + { + actor->forceUpdate(); + }); +} + void DescriptorSetAgent::bindBuffer(uint32_t binding, Buffer *buffer, uint32_t index) { DescriptorSet::bindBuffer(binding, buffer, index); diff --git a/native/cocos/renderer/gfx-agent/DescriptorSetAgent.h b/native/cocos/renderer/gfx-agent/DescriptorSetAgent.h index a1f4ecc525..35061c8d35 100644 --- a/native/cocos/renderer/gfx-agent/DescriptorSetAgent.h +++ b/native/cocos/renderer/gfx-agent/DescriptorSetAgent.h @@ -37,6 +37,7 @@ public: ~DescriptorSetAgent() override; void update() override; + void forceUpdate() override; void bindBuffer(uint32_t binding, Buffer *buffer, uint32_t index) override; void bindTexture(uint32_t binding, Texture *texture, uint32_t index) override; diff --git a/native/cocos/renderer/gfx-base/GFXDescriptorSet.cpp b/native/cocos/renderer/gfx-base/GFXDescriptorSet.cpp index 51e7ef5afe..903fa45a9c 100644 --- a/native/cocos/renderer/gfx-base/GFXDescriptorSet.cpp +++ b/native/cocos/renderer/gfx-base/GFXDescriptorSet.cpp @@ -48,11 +48,6 @@ void DescriptorSet::initialize(const DescriptorSetInfo &info) { doInit(info); } -void DescriptorSet::forceUpdate() { - _isDirty = true; - update(); -} - void DescriptorSet::destroy() { doDestroy(); diff --git a/native/cocos/renderer/gfx-base/GFXDescriptorSet.h b/native/cocos/renderer/gfx-base/GFXDescriptorSet.h index 6072ab21e0..7d7f8be44f 100644 --- a/native/cocos/renderer/gfx-base/GFXDescriptorSet.h +++ b/native/cocos/renderer/gfx-base/GFXDescriptorSet.h @@ -40,7 +40,7 @@ public: void destroy(); virtual void update() = 0; - void forceUpdate(); + virtual void forceUpdate() = 0; virtual void bindBuffer(uint32_t binding, Buffer *buffer, uint32_t index); virtual void bindTexture(uint32_t binding, Texture *texture, uint32_t index); diff --git a/native/cocos/renderer/gfx-empty/EmptyDescriptorSet.cpp b/native/cocos/renderer/gfx-empty/EmptyDescriptorSet.cpp index f741dbc3cb..02a564bd73 100644 --- a/native/cocos/renderer/gfx-empty/EmptyDescriptorSet.cpp +++ b/native/cocos/renderer/gfx-empty/EmptyDescriptorSet.cpp @@ -37,5 +37,8 @@ void EmptyDescriptorSet::doDestroy() { void EmptyDescriptorSet::update() { } +void EmptyDescriptorSet::forceUpdate() { +} + } // namespace gfx } // namespace cc diff --git a/native/cocos/renderer/gfx-empty/EmptyDescriptorSet.h b/native/cocos/renderer/gfx-empty/EmptyDescriptorSet.h index 1af61867a4..0026f5ce29 100644 --- a/native/cocos/renderer/gfx-empty/EmptyDescriptorSet.h +++ b/native/cocos/renderer/gfx-empty/EmptyDescriptorSet.h @@ -33,6 +33,7 @@ namespace gfx { class CC_DLL EmptyDescriptorSet final : public DescriptorSet { public: void update() override; + void forceUpdate() override; protected: void doInit(const DescriptorSetInfo &info) override; diff --git a/native/cocos/renderer/gfx-gles2/GLES2DescriptorSet.cpp b/native/cocos/renderer/gfx-gles2/GLES2DescriptorSet.cpp index f5112c8896..306f94e2c5 100644 --- a/native/cocos/renderer/gfx-gles2/GLES2DescriptorSet.cpp +++ b/native/cocos/renderer/gfx-gles2/GLES2DescriptorSet.cpp @@ -94,5 +94,10 @@ void GLES2DescriptorSet::update() { } } +void GLES2DescriptorSet::forceUpdate() { + _isDirty = true; + update(); +} + } // namespace gfx } // namespace cc diff --git a/native/cocos/renderer/gfx-gles2/GLES2DescriptorSet.h b/native/cocos/renderer/gfx-gles2/GLES2DescriptorSet.h index d21afc0f4d..942f83f67f 100644 --- a/native/cocos/renderer/gfx-gles2/GLES2DescriptorSet.h +++ b/native/cocos/renderer/gfx-gles2/GLES2DescriptorSet.h @@ -39,6 +39,7 @@ public: ~GLES2DescriptorSet() override; void update() override; + void forceUpdate() override; inline GLES2GPUDescriptorSet *gpuDescriptorSet() const { return _gpuDescriptorSet; } diff --git a/native/cocos/renderer/gfx-gles3/GLES3DescriptorSet.cpp b/native/cocos/renderer/gfx-gles3/GLES3DescriptorSet.cpp index 667ca30038..fbcfad0578 100644 --- a/native/cocos/renderer/gfx-gles3/GLES3DescriptorSet.cpp +++ b/native/cocos/renderer/gfx-gles3/GLES3DescriptorSet.cpp @@ -86,5 +86,10 @@ void GLES3DescriptorSet::update() { } } +void GLES3DescriptorSet::forceUpdate() { + _isDirty = true; + update(); +} + } // namespace gfx } // namespace cc diff --git a/native/cocos/renderer/gfx-gles3/GLES3DescriptorSet.h b/native/cocos/renderer/gfx-gles3/GLES3DescriptorSet.h index 4780dda002..2794522547 100644 --- a/native/cocos/renderer/gfx-gles3/GLES3DescriptorSet.h +++ b/native/cocos/renderer/gfx-gles3/GLES3DescriptorSet.h @@ -39,6 +39,7 @@ public: ~GLES3DescriptorSet() override; void update() override; + void forceUpdate() override; inline GLES3GPUDescriptorSet *gpuDescriptorSet() const { return _gpuDescriptorSet; } diff --git a/native/cocos/renderer/gfx-metal/MTLDescriptorSet.h b/native/cocos/renderer/gfx-metal/MTLDescriptorSet.h index 46416126e5..64d90138fc 100644 --- a/native/cocos/renderer/gfx-metal/MTLDescriptorSet.h +++ b/native/cocos/renderer/gfx-metal/MTLDescriptorSet.h @@ -42,6 +42,7 @@ public: CCMTLDescriptorSet &operator=(CCMTLDescriptorSet &&) = delete; void update() override; + void forceUpdate() override; inline CCMTLGPUDescriptorSet *gpuDescriptorSet() const { return _gpuDescriptorSet; } diff --git a/native/cocos/renderer/gfx-metal/MTLDescriptorSet.mm b/native/cocos/renderer/gfx-metal/MTLDescriptorSet.mm index daf3856b1a..68a6ed5407 100644 --- a/native/cocos/renderer/gfx-metal/MTLDescriptorSet.mm +++ b/native/cocos/renderer/gfx-metal/MTLDescriptorSet.mm @@ -86,5 +86,11 @@ void CCMTLDescriptorSet::update() { _isDirty = false; } } + +void CCMTLDescriptorSet::forceUpdate() { + _isDirty = true; + update(); +} + } // namespace gfx } // namespace cc diff --git a/native/cocos/renderer/gfx-validator/DescriptorSetValidator.cpp b/native/cocos/renderer/gfx-validator/DescriptorSetValidator.cpp index 69d52ec44f..f1630c6393 100644 --- a/native/cocos/renderer/gfx-validator/DescriptorSetValidator.cpp +++ b/native/cocos/renderer/gfx-validator/DescriptorSetValidator.cpp @@ -105,6 +105,12 @@ void DescriptorSetValidator::update() { _isDirty = false; } +void DescriptorSetValidator::forceUpdate() { + _isDirty = true; + _actor->forceUpdate(); + _isDirty = false; +} + void DescriptorSetValidator::updateReferenceStamp() { _referenceStamp = DeviceValidator::getInstance()->currentFrame(); } diff --git a/native/cocos/renderer/gfx-validator/DescriptorSetValidator.h b/native/cocos/renderer/gfx-validator/DescriptorSetValidator.h index 2dd8dd3a9e..6ec83a8ddd 100644 --- a/native/cocos/renderer/gfx-validator/DescriptorSetValidator.h +++ b/native/cocos/renderer/gfx-validator/DescriptorSetValidator.h @@ -37,6 +37,7 @@ public: ~DescriptorSetValidator() override; void update() override; + void forceUpdate() override; void bindBuffer(uint32_t binding, Buffer *buffer, uint32_t index) override; void bindTexture(uint32_t binding, Texture *texture, uint32_t index) override; diff --git a/native/cocos/renderer/gfx-vulkan/VKDescriptorSet.cpp b/native/cocos/renderer/gfx-vulkan/VKDescriptorSet.cpp index f89d072acb..535a504d21 100644 --- a/native/cocos/renderer/gfx-vulkan/VKDescriptorSet.cpp +++ b/native/cocos/renderer/gfx-vulkan/VKDescriptorSet.cpp @@ -258,5 +258,10 @@ void CCVKDescriptorSet::update() { } } +void CCVKDescriptorSet::forceUpdate() { + _isDirty = true; + update(); +} + } // namespace gfx } // namespace cc diff --git a/native/cocos/renderer/gfx-vulkan/VKDescriptorSet.h b/native/cocos/renderer/gfx-vulkan/VKDescriptorSet.h index 81c7e77023..5af4f1b97e 100644 --- a/native/cocos/renderer/gfx-vulkan/VKDescriptorSet.h +++ b/native/cocos/renderer/gfx-vulkan/VKDescriptorSet.h @@ -39,6 +39,7 @@ public: ~CCVKDescriptorSet() override; void update() override; + void forceUpdate() override; inline CCVKGPUDescriptorSet *gpuDescriptorSet() const { return _gpuDescriptorSet; }