mirror of
https://github.com/cocos/cocos4.git
synced 2026-11-20 23:52:40 +08:00
Fix crash of shadow stage on native. (#3461)
This commit is contained in:
@@ -23,6 +23,7 @@
|
||||
THE SOFTWARE.
|
||||
****************************************************************************/
|
||||
|
||||
#include "ShadowMapBatchedQueue.h"
|
||||
#include "BatchedBuffer.h"
|
||||
#include "Define.h"
|
||||
#include "InstancedBuffer.h"
|
||||
@@ -31,7 +32,6 @@
|
||||
#include "PipelineUBO.h"
|
||||
#include "RenderBatchedQueue.h"
|
||||
#include "RenderInstancedQueue.h"
|
||||
#include "ShadowMapBatchedQueue.h"
|
||||
#include "forward/ForwardPipeline.h"
|
||||
#include "gfx-base/GFXCommandBuffer.h"
|
||||
#include "gfx-base/GFXDescriptorSet.h"
|
||||
@@ -40,7 +40,7 @@
|
||||
|
||||
namespace cc {
|
||||
namespace pipeline {
|
||||
ShadowMapBatchedQueue::ShadowMapBatchedQueue(ForwardPipeline *pipeline)
|
||||
ShadowMapBatchedQueue::ShadowMapBatchedQueue(RenderPipeline *pipeline)
|
||||
: _phaseID(getPhaseID("shadow-caster")) {
|
||||
_pipeline = pipeline;
|
||||
_buffer = pipeline->getDescriptorSet()->getBuffer(UBOShadow::BINDING);
|
||||
|
||||
@@ -34,7 +34,7 @@ struct PassView;
|
||||
struct RenderObject;
|
||||
class RenderInstancedQueue;
|
||||
class RenderBatchedQueue;
|
||||
class ForwardPipeline;
|
||||
class RenderPipeline;
|
||||
struct Shadows;
|
||||
struct Light;
|
||||
struct ModelView;
|
||||
@@ -43,7 +43,7 @@ struct ModelView;
|
||||
|
||||
class CC_DLL ShadowMapBatchedQueue : public Object {
|
||||
public:
|
||||
explicit ShadowMapBatchedQueue(ForwardPipeline *);
|
||||
explicit ShadowMapBatchedQueue(RenderPipeline *);
|
||||
~ShadowMapBatchedQueue() override = default;
|
||||
void destroy();
|
||||
|
||||
@@ -55,14 +55,14 @@ public:
|
||||
private:
|
||||
int getShadowPassIndex(const ModelView *model) const;
|
||||
|
||||
ForwardPipeline *_pipeline = nullptr;
|
||||
RenderPipeline * _pipeline = nullptr;
|
||||
vector<const SubModelView *> _subModels;
|
||||
vector<const PassView *> _passes;
|
||||
vector<gfx::Shader *> _shaders;
|
||||
RenderInstancedQueue *_instancedQueue = nullptr;
|
||||
RenderBatchedQueue *_batchedQueue = nullptr;
|
||||
gfx::Buffer *_buffer = nullptr;
|
||||
uint _phaseID = 0;
|
||||
vector<const PassView *> _passes;
|
||||
vector<gfx::Shader *> _shaders;
|
||||
RenderInstancedQueue * _instancedQueue = nullptr;
|
||||
RenderBatchedQueue * _batchedQueue = nullptr;
|
||||
gfx::Buffer * _buffer = nullptr;
|
||||
uint _phaseID = 0;
|
||||
};
|
||||
|
||||
} // namespace pipeline
|
||||
|
||||
@@ -25,8 +25,8 @@
|
||||
|
||||
#include "ShadowStage.h"
|
||||
#include "../Define.h"
|
||||
#include "../RenderPipeline.h"
|
||||
#include "../ShadowMapBatchedQueue.h"
|
||||
#include "../forward/ForwardPipeline.h"
|
||||
#include "../helper/SharedMemory.h"
|
||||
#include "gfx-base/GFXCommandBuffer.h"
|
||||
#include "gfx-base/GFXFramebuffer.h"
|
||||
@@ -53,11 +53,11 @@ bool ShadowStage::initialize(const RenderStageInfo &info) {
|
||||
void ShadowStage::activate(RenderPipeline *pipeline, RenderFlow *flow) {
|
||||
RenderStage::activate(pipeline, flow);
|
||||
|
||||
_additiveShadowQueue = CC_NEW(ShadowMapBatchedQueue(static_cast<ForwardPipeline *>(pipeline)));
|
||||
_additiveShadowQueue = CC_NEW(ShadowMapBatchedQueue(pipeline));
|
||||
}
|
||||
|
||||
void ShadowStage::render(Camera *camera) {
|
||||
const auto *sceneData = _pipeline->getPipelineSceneData();
|
||||
const auto *sceneData = _pipeline->getPipelineSceneData();
|
||||
const auto *sharedData = sceneData->getSharedData();
|
||||
const auto *shadowInfo = sceneData->getSharedData()->getShadows();
|
||||
|
||||
@@ -75,8 +75,8 @@ void ShadowStage::render(Camera *camera) {
|
||||
_renderArea.width = static_cast<uint>(camera->viewportWidth * shadowMapSize.x * sharedData->shadingScale);
|
||||
_renderArea.height = static_cast<int>(camera->viewportHeight * shadowMapSize.y * sharedData->shadingScale);
|
||||
|
||||
_clearColors[0] = {1.0F, 1.0F, 1.0F, 1.0F};
|
||||
auto* renderPass = _framebuffer->getRenderPass();
|
||||
_clearColors[0] = {1.0F, 1.0F, 1.0F, 1.0F};
|
||||
auto *renderPass = _framebuffer->getRenderPass();
|
||||
|
||||
cmdBuffer->beginRenderPass(renderPass, _framebuffer, _renderArea,
|
||||
_clearColors, camera->clearDepth, camera->clearStencil);
|
||||
@@ -93,15 +93,13 @@ void ShadowStage::destroy() {
|
||||
}
|
||||
|
||||
void ShadowStage::clearFramebuffer(Camera *camera) {
|
||||
auto *pipeline = dynamic_cast<ForwardPipeline *>(_pipeline);
|
||||
|
||||
if (!_light || !_framebuffer) {
|
||||
return;
|
||||
}
|
||||
|
||||
auto *cmdBuffer = pipeline->getCommandBuffers()[0];
|
||||
auto *cmdBuffer = _pipeline->getCommandBuffers()[0];
|
||||
|
||||
_clearColors[0] = {1.0F, 1.0F, 1.0F, 1.0F};
|
||||
_clearColors[0] = {1.0F, 1.0F, 1.0F, 1.0F};
|
||||
auto *renderPass = _framebuffer->getRenderPass();
|
||||
|
||||
cmdBuffer->beginRenderPass(renderPass, _framebuffer, _renderArea,
|
||||
|
||||
Reference in New Issue
Block a user