From be9af447745b98df0f5f0532bc79fdce9dccfbbb Mon Sep 17 00:00:00 2001 From: jk20012001 Date: Sun, 23 Apr 2023 17:34:13 +0800 Subject: [PATCH] fix light type used in ubo and shader (#14891) --- cocos/rendering/pipeline-ubo.ts | 10 +++++----- cocos/rendering/render-additive-light-queue.ts | 6 +++--- .../main-functions/render-to-shadowmap/fs.chunk | 9 ++++----- editor/assets/effects/legacy/standard.effect | 9 ++++----- editor/assets/effects/legacy/toon.effect | 9 ++++----- native/cocos/renderer/pipeline/PipelineUBO.cpp | 10 +++++----- .../renderer/pipeline/RenderAdditiveLightQueue.cpp | 6 +++--- 7 files changed, 28 insertions(+), 31 deletions(-) diff --git a/cocos/rendering/pipeline-ubo.ts b/cocos/rendering/pipeline-ubo.ts index 070cfa647a..b173fdc3a6 100644 --- a/cocos/rendering/pipeline-ubo.ts +++ b/cocos/rendering/pipeline-ubo.ts @@ -264,7 +264,7 @@ export class PipelineUBO { _vec4ShadowInfo.set(near, far, 0, 1.0 - mainLight.shadowSaturation); Vec4.toArray(sv, _vec4ShadowInfo, UBOShadow.SHADOW_NEAR_FAR_LINEAR_SATURATION_INFO_OFFSET); - _vec4ShadowInfo.set(0, packing, mainLight.shadowNormalBias, levelCount); + _vec4ShadowInfo.set(LightType.DIRECTIONAL, packing, mainLight.shadowNormalBias, levelCount); Vec4.toArray(sv, _vec4ShadowInfo, UBOShadow.SHADOW_LIGHT_PACKING_NBIAS_NULL_INFO_OFFSET); } else { const layerThreshold = this.getPCFRadius(shadowInfo, mainLight); @@ -301,7 +301,7 @@ export class PipelineUBO { _vec4ShadowInfo.set(0.1, mainLight.shadowDistance, 0, 1.0 - mainLight.shadowSaturation); Vec4.toArray(sv, _vec4ShadowInfo, UBOShadow.SHADOW_NEAR_FAR_LINEAR_SATURATION_INFO_OFFSET); - _vec4ShadowInfo.set(0.0, packing, mainLight.shadowNormalBias, mainLight.csmLevel); + _vec4ShadowInfo.set(LightType.DIRECTIONAL, packing, mainLight.shadowNormalBias, mainLight.csmLevel); Vec4.toArray(sv, _vec4ShadowInfo, UBOShadow.SHADOW_LIGHT_PACKING_NBIAS_NULL_INFO_OFFSET); } _vec4ShadowInfo.set(shadowInfo.size.x, shadowInfo.size.y, mainLight.shadowPcf, mainLight.shadowBias); @@ -349,7 +349,7 @@ export class PipelineUBO { far = csmLayers.specialLayer.shadowCameraFar; levelCount = 1; } - _vec4ShadowInfo.set(0.0, packing, mainLight.shadowNormalBias, 0); + _vec4ShadowInfo.set(LightType.DIRECTIONAL, packing, mainLight.shadowNormalBias, 0); Vec4.toArray(sv, _vec4ShadowInfo, UBOShadow.SHADOW_LIGHT_PACKING_NBIAS_NULL_INFO_OFFSET); } else { const layer = csmLayers.layers[level]; @@ -379,7 +379,7 @@ export class PipelineUBO { _vec4ShadowInfo.set(near, far, 0, 1.0 - mainLight.shadowSaturation); Vec4.toArray(sv, _vec4ShadowInfo, UBOShadow.SHADOW_NEAR_FAR_LINEAR_SATURATION_INFO_OFFSET); - _vec4ShadowInfo.set(0.0, packing, mainLight.shadowNormalBias, levelCount); + _vec4ShadowInfo.set(LightType.DIRECTIONAL, packing, mainLight.shadowNormalBias, levelCount); Vec4.toArray(sv, _vec4ShadowInfo, UBOShadow.SHADOW_LIGHT_PACKING_NBIAS_NULL_INFO_OFFSET); _vec4ShadowInfo.set(shadowInfo.size.x, shadowInfo.size.y, mainLight.shadowPcf, mainLight.shadowBias); @@ -406,7 +406,7 @@ export class PipelineUBO { _vec4ShadowInfo.set(shadowInfo.size.x, shadowInfo.size.y, spotLight.shadowPcf, spotLight.shadowBias); Vec4.toArray(sv, _vec4ShadowInfo, UBOShadow.SHADOW_WIDTH_HEIGHT_PCF_BIAS_INFO_OFFSET); - _vec4ShadowInfo.set(1.0, packing, spotLight.shadowNormalBias, 0.0); + _vec4ShadowInfo.set(LightType.SPOT, packing, spotLight.shadowNormalBias, 0.0); Vec4.toArray(sv, _vec4ShadowInfo, UBOShadow.SHADOW_LIGHT_PACKING_NBIAS_NULL_INFO_OFFSET); } break; diff --git a/cocos/rendering/render-additive-light-queue.ts b/cocos/rendering/render-additive-light-queue.ts index 657620e0bb..f8d0c99bbb 100644 --- a/cocos/rendering/render-additive-light-queue.ts +++ b/cocos/rendering/render-additive-light-queue.ts @@ -387,7 +387,7 @@ export class RenderAdditiveLightQueue { this._shadowUBO[UBOShadow.SHADOW_WIDTH_HEIGHT_PCF_BIAS_INFO_OFFSET + 2] = 1.0; this._shadowUBO[UBOShadow.SHADOW_WIDTH_HEIGHT_PCF_BIAS_INFO_OFFSET + 3] = 0.0; - this._shadowUBO[UBOShadow.SHADOW_LIGHT_PACKING_NBIAS_NULL_INFO_OFFSET + 0] = 2.0; + this._shadowUBO[UBOShadow.SHADOW_LIGHT_PACKING_NBIAS_NULL_INFO_OFFSET + 0] = LightType.SPHERE; this._shadowUBO[UBOShadow.SHADOW_LIGHT_PACKING_NBIAS_NULL_INFO_OFFSET + 1] = packing; this._shadowUBO[UBOShadow.SHADOW_LIGHT_PACKING_NBIAS_NULL_INFO_OFFSET + 2] = 0.0; this._shadowUBO[UBOShadow.SHADOW_LIGHT_PACKING_NBIAS_NULL_INFO_OFFSET + 3] = 0.0; @@ -429,7 +429,7 @@ export class RenderAdditiveLightQueue { this._shadowUBO[UBOShadow.SHADOW_WIDTH_HEIGHT_PCF_BIAS_INFO_OFFSET + 2] = spotLight.shadowPcf; this._shadowUBO[UBOShadow.SHADOW_WIDTH_HEIGHT_PCF_BIAS_INFO_OFFSET + 3] = spotLight.shadowBias; - this._shadowUBO[UBOShadow.SHADOW_LIGHT_PACKING_NBIAS_NULL_INFO_OFFSET + 0] = 1.0; + this._shadowUBO[UBOShadow.SHADOW_LIGHT_PACKING_NBIAS_NULL_INFO_OFFSET + 0] = LightType.SPOT; this._shadowUBO[UBOShadow.SHADOW_LIGHT_PACKING_NBIAS_NULL_INFO_OFFSET + 1] = packing; this._shadowUBO[UBOShadow.SHADOW_LIGHT_PACKING_NBIAS_NULL_INFO_OFFSET + 2] = spotLight.shadowNormalBias; this._shadowUBO[UBOShadow.SHADOW_LIGHT_PACKING_NBIAS_NULL_INFO_OFFSET + 3] = 0.0; @@ -471,7 +471,7 @@ export class RenderAdditiveLightQueue { this._shadowUBO[UBOShadow.SHADOW_WIDTH_HEIGHT_PCF_BIAS_INFO_OFFSET + 2] = 1.0; this._shadowUBO[UBOShadow.SHADOW_WIDTH_HEIGHT_PCF_BIAS_INFO_OFFSET + 3] = 0.0; - this._shadowUBO[UBOShadow.SHADOW_LIGHT_PACKING_NBIAS_NULL_INFO_OFFSET + 0] = 2.0; + this._shadowUBO[UBOShadow.SHADOW_LIGHT_PACKING_NBIAS_NULL_INFO_OFFSET + 0] = LightType.POINT; this._shadowUBO[UBOShadow.SHADOW_LIGHT_PACKING_NBIAS_NULL_INFO_OFFSET + 1] = packing; this._shadowUBO[UBOShadow.SHADOW_LIGHT_PACKING_NBIAS_NULL_INFO_OFFSET + 2] = 0.0; this._shadowUBO[UBOShadow.SHADOW_LIGHT_PACKING_NBIAS_NULL_INFO_OFFSET + 3] = 0.0; diff --git a/editor/assets/chunks/shading-entries/main-functions/render-to-shadowmap/fs.chunk b/editor/assets/chunks/shading-entries/main-functions/render-to-shadowmap/fs.chunk index e1824dc45d..e4fcac8b96 100644 --- a/editor/assets/chunks/shading-entries/main-functions/render-to-shadowmap/fs.chunk +++ b/editor/assets/chunks/shading-entries/main-functions/render-to-shadowmap/fs.chunk @@ -9,12 +9,11 @@ void main () { highp float clipDepth = v_clip_depth.x / v_clip_depth.y * 0.5 + 0.5; // spot use linear - if(cc_shadowLPNNInfo.x > EPSILON && cc_shadowLPNNInfo.x < 1.999999) { - // enabled linear depth - #if CC_SHADOWMAP_USE_LINEAR_DEPTH + #if CC_SHADOWMAP_USE_LINEAR_DEPTH + if (IS_SPOT_LIGHT(cc_shadowLPNNInfo.x)) { clipDepth = CCGetLinearDepth(FSInput_worldPos.xyz); - #endif - } + } + #endif #if CC_SHADOWMAP_FORMAT == SHADOWMAP_FORMAT_RGBA8 fragColorX = packDepthToRGBA(clipDepth); diff --git a/editor/assets/effects/legacy/standard.effect b/editor/assets/effects/legacy/standard.effect index 715c4bdfeb..92837b9d4e 100644 --- a/editor/assets/effects/legacy/standard.effect +++ b/editor/assets/effects/legacy/standard.effect @@ -410,12 +410,11 @@ CCProgram shadow-caster-fs %{ highp float clipDepth = v_clip_depth.x / v_clip_depth.y * 0.5 + 0.5; // spot use linear - if(cc_shadowLPNNInfo.x > 0.000001 && cc_shadowLPNNInfo.x < 1.999999) { - // enabled linear depth - #if CC_SHADOWMAP_USE_LINEAR_DEPTH + #if CC_SHADOWMAP_USE_LINEAR_DEPTH + if (IS_SPOT_LIGHT(cc_shadowLPNNInfo.x)) { clipDepth = CCGetLinearDepth(v_worldPos.xyz); - #endif - } + } + #endif #if CC_SHADOWMAP_FORMAT == SHADOWMAP_FORMAT_RGBA8 return packDepthToRGBA(clipDepth); diff --git a/editor/assets/effects/legacy/toon.effect b/editor/assets/effects/legacy/toon.effect index e4b025068a..21e2519341 100644 --- a/editor/assets/effects/legacy/toon.effect +++ b/editor/assets/effects/legacy/toon.effect @@ -319,12 +319,11 @@ CCProgram shadow-caster-fs %{ highp float clipDepth = v_clip_depth.x / v_clip_depth.y * 0.5 + 0.5; // spot use linear - if(cc_shadowLPNNInfo.x > 0.000001 && cc_shadowLPNNInfo.x < 1.999999) { - // enabled linear depth - #if CC_SHADOWMAP_USE_LINEAR_DEPTH + #if CC_SHADOWMAP_USE_LINEAR_DEPTH + if (IS_SPOT_LIGHT(cc_shadowLPNNInfo.x)) { clipDepth = CCGetLinearDepth(v_worldPos.xyz); - #endif - } + } + #endif #if CC_SHADOWMAP_FORMAT == SHADOWMAP_FORMAT_RGBA8 return packDepthToRGBA(clipDepth); diff --git a/native/cocos/renderer/pipeline/PipelineUBO.cpp b/native/cocos/renderer/pipeline/PipelineUBO.cpp index ab099bdda9..89018accf2 100644 --- a/native/cocos/renderer/pipeline/PipelineUBO.cpp +++ b/native/cocos/renderer/pipeline/PipelineUBO.cpp @@ -256,7 +256,7 @@ void PipelineUBO::updateShadowUBOView(const RenderPipeline *pipeline, ccstd::arr memcpy(sv.data() + UBOShadow::SHADOW_NEAR_FAR_LINEAR_SATURATION_INFO_OFFSET, &shadowNFLSInfos, sizeof(shadowNFLSInfos)); - const float shadowLPNNInfos[4] = {0.0F, packing, mainLight->getShadowNormalBias(), levelCount}; + const float shadowLPNNInfos[4] = {static_cast(scene::LightType::DIRECTIONAL), packing, mainLight->getShadowNormalBias(), levelCount}; memcpy(sv.data() + UBOShadow::SHADOW_LIGHT_PACKING_NBIAS_NULL_INFO_OFFSET, &shadowLPNNInfos, sizeof(shadowLPNNInfos)); } else { const auto layerThreshold = PipelineUBO::getPCFRadius(shadowInfo, mainLight); @@ -292,7 +292,7 @@ void PipelineUBO::updateShadowUBOView(const RenderPipeline *pipeline, ccstd::arr const float shadowNFLSInfos[4] = {0.1F, mainLight->getShadowDistance(), 0.0F, 1.0F - mainLight->getShadowSaturation()}; memcpy(sv.data() + UBOShadow::SHADOW_NEAR_FAR_LINEAR_SATURATION_INFO_OFFSET, &shadowNFLSInfos, sizeof(shadowNFLSInfos)); - const float shadowLPNNInfos[4] = {0.0F, packing, mainLight->getShadowNormalBias(), static_cast(mainLight->getCSMLevel())}; + const float shadowLPNNInfos[4] = {static_cast(scene::LightType::DIRECTIONAL), packing, mainLight->getShadowNormalBias(), static_cast(mainLight->getCSMLevel())}; memcpy(sv.data() + UBOShadow::SHADOW_LIGHT_PACKING_NBIAS_NULL_INFO_OFFSET, &shadowLPNNInfos, sizeof(shadowLPNNInfos)); } const float shadowWHPBInfos[4] = {shadowInfo->getSize().x, shadowInfo->getSize().y, static_cast(mainLight->getShadowPcf()), mainLight->getShadowBias()}; @@ -342,7 +342,7 @@ void PipelineUBO::updateShadowUBOLightView(const RenderPipeline *pipeline, ccstd farClamp = csmLayers->getSpecialLayer()->getShadowCameraFar(); levelCount = 1.0F; } - const float shadowLPNNInfos[4] = {0.0F, packing, mainLight->getShadowNormalBias(), 0.0F}; + const float shadowLPNNInfos[4] = {static_cast(scene::LightType::DIRECTIONAL), packing, mainLight->getShadowNormalBias(), 0.0F}; memcpy(shadowUBO.data() + UBOShadow::SHADOW_LIGHT_PACKING_NBIAS_NULL_INFO_OFFSET, &shadowLPNNInfos, sizeof(shadowLPNNInfos)); } else { const CSMLayerInfo *layer = csmLayers->getLayers()[level]; @@ -367,7 +367,7 @@ void PipelineUBO::updateShadowUBOLightView(const RenderPipeline *pipeline, ccstd const float shadowNFLSInfos[4] = {nearClamp, farClamp, 0.0F, 1.0F - mainLight->getShadowSaturation()}; memcpy(shadowUBO.data() + UBOShadow::SHADOW_NEAR_FAR_LINEAR_SATURATION_INFO_OFFSET, &shadowNFLSInfos, sizeof(shadowNFLSInfos)); - const float shadowLPNNInfos[4] = {0.0F, packing, mainLight->getShadowNormalBias(), levelCount}; + const float shadowLPNNInfos[4] = {static_cast(scene::LightType::DIRECTIONAL), packing, mainLight->getShadowNormalBias(), levelCount}; memcpy(shadowUBO.data() + UBOShadow::SHADOW_LIGHT_PACKING_NBIAS_NULL_INFO_OFFSET, &shadowLPNNInfos, sizeof(shadowLPNNInfos)); const float shadowWHPBInfos[4] = {shadowInfo->getSize().x, shadowInfo->getSize().y, static_cast(mainLight->getShadowPcf()), mainLight->getShadowBias()}; @@ -390,7 +390,7 @@ void PipelineUBO::updateShadowUBOLightView(const RenderPipeline *pipeline, ccstd const float shadowNFLSInfos[4] = {0.01F, spotLight->getRange(), 0.0F, 0.0F}; memcpy(shadowUBO.data() + UBOShadow::SHADOW_NEAR_FAR_LINEAR_SATURATION_INFO_OFFSET, &shadowNFLSInfos, sizeof(shadowNFLSInfos)); - const float shadowLPNNInfos[4] = {1.0F, packing, spotLight->getShadowNormalBias(), 0.0F}; + const float shadowLPNNInfos[4] = {static_cast(scene::LightType::SPOT), packing, spotLight->getShadowNormalBias(), 0.0F}; memcpy(shadowUBO.data() + UBOShadow::SHADOW_LIGHT_PACKING_NBIAS_NULL_INFO_OFFSET, &shadowLPNNInfos, sizeof(shadowLPNNInfos)); const float shadowWHPBInfos[4] = {shadowInfo->getSize().x, shadowInfo->getSize().y, spotLight->getShadowPcf(), spotLight->getShadowBias()}; diff --git a/native/cocos/renderer/pipeline/RenderAdditiveLightQueue.cpp b/native/cocos/renderer/pipeline/RenderAdditiveLightQueue.cpp index 149b41374f..b02dbe46fc 100644 --- a/native/cocos/renderer/pipeline/RenderAdditiveLightQueue.cpp +++ b/native/cocos/renderer/pipeline/RenderAdditiveLightQueue.cpp @@ -429,7 +429,7 @@ void RenderAdditiveLightQueue::updateLightDescriptorSet(const scene::Camera *cam float shadowWHPBInfos[4] = {shadowSize.x, shadowSize.y, 1.0F, 0.0F}; memcpy(_shadowUBO.data() + UBOShadow::SHADOW_WIDTH_HEIGHT_PCF_BIAS_INFO_OFFSET, &shadowWHPBInfos, sizeof(float) * 4); - float shadowLPNNInfos[4] = {2.0F, packing, 0.0F, 0.0F}; + float shadowLPNNInfos[4] = {static_cast(scene::LightType::SPHERE), packing, 0.0F, 0.0F}; memcpy(_shadowUBO.data() + UBOShadow::SHADOW_LIGHT_PACKING_NBIAS_NULL_INFO_OFFSET, &shadowLPNNInfos, sizeof(float) * 4); } break; case scene::LightType::SPOT: { @@ -461,7 +461,7 @@ void RenderAdditiveLightQueue::updateLightDescriptorSet(const scene::Camera *cam float shadowWHPBInfos[4] = {shadowSize.x, shadowSize.y, spotLight->getShadowPcf(), spotLight->getShadowBias()}; memcpy(_shadowUBO.data() + UBOShadow::SHADOW_WIDTH_HEIGHT_PCF_BIAS_INFO_OFFSET, &shadowWHPBInfos, sizeof(shadowWHPBInfos)); - float shadowLPNNInfos[4] = {1.0F, packing, spotLight->getShadowNormalBias(), 0.0F}; + float shadowLPNNInfos[4] = {static_cast(scene::LightType::SPOT), packing, spotLight->getShadowNormalBias(), 0.0F}; memcpy(_shadowUBO.data() + UBOShadow::SHADOW_LIGHT_PACKING_NBIAS_NULL_INFO_OFFSET, &shadowLPNNInfos, sizeof(float) * 4); float shadowInvProjDepthInfos[4] = {matShadowInvProj.m[10], matShadowInvProj.m[14], matShadowInvProj.m[11], matShadowInvProj.m[15]}; @@ -493,7 +493,7 @@ void RenderAdditiveLightQueue::updateLightDescriptorSet(const scene::Camera *cam float shadowWHPBInfos[4] = {shadowSize.x, shadowSize.y, 1.0F, 0.0F}; memcpy(_shadowUBO.data() + UBOShadow::SHADOW_WIDTH_HEIGHT_PCF_BIAS_INFO_OFFSET, &shadowWHPBInfos, sizeof(float) * 4); - float shadowLPNNInfos[4] = {2.0F, packing, 0.0F, 0.0F}; + float shadowLPNNInfos[4] = {static_cast(scene::LightType::POINT), packing, 0.0F, 0.0F}; memcpy(_shadowUBO.data() + UBOShadow::SHADOW_LIGHT_PACKING_NBIAS_NULL_INFO_OFFSET, &shadowLPNNInfos, sizeof(float) * 4); } break; default: