UnityMirror/spine-runtimes
1
0
Fork 0
mirror of https://github.com/EsotericSoftware/spine-runtimes.git synced 2025-12-20 17:26:01 +08:00
Code Issues Packages Projects Releases Wiki Activity

[unity] Fixed URP shaders compile error on Unity 2023.1 since Unity changed the OUTPUT_SH() signature back again in the same URP package patch version 15.0.6. See #2311. See commit 5635f31.

Browse Source
This commit is contained in:
Harald Csaszar 2023-08-29 21:00:26 +02:00
parent 062303a419
commit c9fb1c372c
3 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
spine-unity/Modules/com.esotericsoftware.spine.urp-shaders/Shaders/Include/Spine-SkeletonLit-ForwardPass-URP.hlsl
View File

@ -148,7 +148,11 @@ VertexOutput vert(appdata v) {
// Note: ambient light is also handled via SH. // Note: ambient light is also handled via SH.
half3 vertexSH; half3 vertexSH;
#if IS_URP_15_OR_NEWER #if IS_URP_15_OR_NEWER
OUTPUT_SH(positionWS, normalWS.xyz, GetWorldSpaceNormalizeViewDir(positionWS), vertexSH); #ifdef OUTPUT_SH4
OUTPUT_SH4(positionWS, normalWS.xyz, GetWorldSpaceNormalizeViewDir(positionWS), vertexSH);
#else
OUTPUT_SH(positionWS, normalWS.xyz, GetWorldSpaceNormalizeViewDir(positionWS), vertexSH);
#endif
#else #else
OUTPUT_SH(normalWS.xyz, vertexSH); OUTPUT_SH(normalWS.xyz, vertexSH);
#endif #endif

6
spine-unity/Modules/com.esotericsoftware.spine.urp-shaders/Shaders/Include/Spine-Sprite-ForwardPass-URP.hlsl
View File

@ -312,7 +312,11 @@ VertexOutputLWRP ForwardPassVertexSprite(VertexInput input)
#endif #endif
#if IS_URP_15_OR_NEWER #if IS_URP_15_OR_NEWER
OUTPUT_SH(positionWS, normalWS.xyz, GetWorldSpaceNormalizeViewDir(positionWS), output.vertexSH); #ifdef OUTPUT_SH4
OUTPUT_SH4(positionWS, normalWS.xyz, GetWorldSpaceNormalizeViewDir(positionWS), output.vertexSH);
#else
OUTPUT_SH(positionWS, normalWS.xyz, GetWorldSpaceNormalizeViewDir(positionWS), output.vertexSH);
#endif
#else #else
OUTPUT_SH(normalWS.xyz, output.vertexSH); OUTPUT_SH(normalWS.xyz, output.vertexSH);
#endif #endif

2
spine-unity/Modules/com.esotericsoftware.spine.urp-shaders/package.json
View File

@ -2,7 +2,7 @@
"name": "com.esotericsoftware.spine.urp-shaders", "name": "com.esotericsoftware.spine.urp-shaders",
"displayName": "Spine Universal RP Shaders", "displayName": "Spine Universal RP Shaders",
"description": "This plugin provides universal render pipeline (URP) shaders for the spine-unity runtime.\n\nPrerequisites:\nIt requires a working installation of the spine-unity runtime, version 4.1.\n(See http://esotericsoftware.com/git/spine-runtimes/spine-unity)", "description": "This plugin provides universal render pipeline (URP) shaders for the spine-unity runtime.\n\nPrerequisites:\nIt requires a working installation of the spine-unity runtime, version 4.1.\n(See http://esotericsoftware.com/git/spine-runtimes/spine-unity)",
"version": "4.1.20", "version": "4.1.21",
"unity": "2019.3", "unity": "2019.3",
"author": { "author": {
"name": "Esoteric Software", "name": "Esoteric Software",