From d6ad4bca439046f85f7d1b82ec002212953ea7ba Mon Sep 17 00:00:00 2001 From: troublemaker52025 Date: Tue, 7 Feb 2023 16:29:40 +0800 Subject: [PATCH] fix shader uniform compare error with low precision (#14161) --- editor/assets/chunks/common/common-define.chunk | 11 ++++++----- .../chunks/common/debug/debug-view-define.chunk | 2 +- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/editor/assets/chunks/common/common-define.chunk b/editor/assets/chunks/common/common-define.chunk index 4554ad0e80..8d434609de 100644 --- a/editor/assets/chunks/common/common-define.chunk +++ b/editor/assets/chunks/common/common-define.chunk @@ -26,6 +26,7 @@ // common function #pragma define equalf(data1, data2) (abs(float(data1) - float(data2)) < EPSILON) +#pragma define equalf_lowp(data1, data2) (abs(float(data1) - float(data2)) < EPSILON_LOWP) #pragma define equalf_epsilon(data1, data2, epsilonValue) (abs(float(data1) - float(data2)) < epsilonValue) // runtime constants @@ -59,8 +60,8 @@ #define LIGHT_TYPE_SPOT 2.0 #define LIGHT_TYPE_SPHERE 3.0 #define LIGHT_TYPE_RANGED_DIRECTIONAL 4.0 -#define IS_DIRECTIONAL_LIGHT(light_type) equalf(light_type, LIGHT_TYPE_DIRECTIONAL) -#define IS_SPHERE_LIGHT(light_type) equalf(light_type, LIGHT_TYPE_SPHERE) -#define IS_SPOT_LIGHT(light_type) equalf(light_type, LIGHT_TYPE_SPOT) -#define IS_POINT_LIGHT(light_type) equalf(light_type, LIGHT_TYPE_POINT) -#define IS_RANGED_DIRECTIONAL_LIGHT(light_type) equalf(light_type, LIGHT_TYPE_RANGED_DIRECTIONAL) +#define IS_DIRECTIONAL_LIGHT(light_type) equalf_lowp(light_type, LIGHT_TYPE_DIRECTIONAL) +#define IS_SPHERE_LIGHT(light_type) equalf_lowp(light_type, LIGHT_TYPE_SPHERE) +#define IS_SPOT_LIGHT(light_type) equalf_lowp(light_type, LIGHT_TYPE_SPOT) +#define IS_POINT_LIGHT(light_type) equalf_lowp(light_type, LIGHT_TYPE_POINT) +#define IS_RANGED_DIRECTIONAL_LIGHT(light_type) equalf_lowp(light_type, LIGHT_TYPE_RANGED_DIRECTIONAL) diff --git a/editor/assets/chunks/common/debug/debug-view-define.chunk b/editor/assets/chunks/common/debug/debug-view-define.chunk index 8ac26a55e3..ae653b7c3c 100644 --- a/editor/assets/chunks/common/debug/debug-view-define.chunk +++ b/editor/assets/chunks/common/debug/debug-view-define.chunk @@ -58,7 +58,7 @@ #define CC_SURFACES_DEBUG_VIEW_COMPOSITE_AND_MISC 2 #define IS_DEBUG_VIEW_ENABLE_WITH_CAMERA (cc_surfaceTransform.y != 3.0) -#pragma define IS_DEBUG_VIEW_SINGLE_MODE(mode) (equalf(cc_debug_view_mode.x, mode) && (cc_surfaceTransform.y != 3.0)) +#pragma define IS_DEBUG_VIEW_SINGLE_MODE(mode) (equalf_lowp(cc_debug_view_mode.x, mode) && (cc_surfaceTransform.y != 3.0)) #define IS_DEBUG_VIEW_LIGHTING_ENABLE_WITH_ALBEDO ((cc_debug_view_mode.y > 0.0) || !IS_DEBUG_VIEW_ENABLE_WITH_CAMERA) #define IS_DEBUG_VIEW_MISC_ENABLE_CSM_LAYER_COLORATION ((cc_debug_view_mode.z > 0.0) && IS_DEBUG_VIEW_ENABLE_WITH_CAMERA) #define IS_DEBUG_VIEW_COMPOSITE_ENABLE_DIRECT_DIFFUSE ((cc_debug_view_composite_pack_1.x > 0.0) || !IS_DEBUG_VIEW_ENABLE_WITH_CAMERA)