refactor(unreal): main branch compatability (#12440) 66dbcd05f3 * builds for ue 5.8.0 * header and syntax Co-authored-by: Jonathon Copeland <jcopela4@gmail.com>
diff --git a/.rive_head b/.rive_head index 3eabe30..7f27b58 100644 --- a/.rive_head +++ b/.rive_head
@@ -1 +1 @@ -0a621bb32044dd09570ae7aafb07648a391e4da2 +66dbcd05f3fc8360f2180867e7f69ab920dfef82
diff --git a/build/setup_windows_dev.ps1 b/build/setup_windows_dev.ps1 index 257fa20..30964cd 100644 --- a/build/setup_windows_dev.ps1 +++ b/build/setup_windows_dev.ps1
@@ -11,12 +11,17 @@ if (Test-Path "C:\Program Files\Microsoft Visual Studio\2022\Enterprise\Common7\Tools\Launch-VsDevShell.ps1" -PathType Leaf) { & "C:\Program Files\Microsoft Visual Studio\2022\Enterprise\Common7\Tools\Launch-VsDevShell.ps1" } else { - if ("C:\Program Files\Microsoft Visual Studio\2022\Community\Common7\Tools\Launch-VsDevShell.ps1") { + if (Test-Path "C:\Program Files\Microsoft Visual Studio\2022\Community\Common7\Tools\Launch-VsDevShell.ps1") { & 'C:\Program Files\Microsoft Visual Studio\2022\Community\Common7\Tools\Launch-VsDevShell.ps1' } else { - Write-Error "Visual Studio 2022 does not appear to be installed, please install visual studio to C:\Program Files\Microsoft Visual Studio" - exit + if (Test-Path "C:\Program Files\Microsoft Visual Studio\2022\Professional\Common7\Tools\Launch-VsDevShell.ps1") { + & 'C:\Program Files\Microsoft Visual Studio\2022\Professional\Common7\Tools\Launch-VsDevShell.ps1' + } + else { + Write-Error "Visual Studio 2022 does not appear to be installed, please install visual studio to C:\Program Files\Microsoft Visual Studio" + exit + } } } }
diff --git a/renderer/src/shaders/tessellate.glsl b/renderer/src/shaders/tessellate.glsl index 31cfb70..63a838f 100644 --- a/renderer/src/shaders/tessellate.glsl +++ b/renderer/src/shaders/tessellate.glsl
@@ -14,10 +14,9 @@ #ifdef @VERTEX ATTR_BLOCK_BEGIN(Attrs) -ATTR( - 0, - float4, - @a_p0p1_); // End in '_' because D3D interprets the '1' as a semantic index. +// RHI Version > 5.8 failes to parse this when it's multi line +// End in '_' because D3D interprets the '1' as a semantic index. +ATTR(0, float4, @a_p0p1_); ATTR(1, float4, @a_p2p3_); ATTR(2, float4, @a_joinTan_and_ys); // [joinTangent, y, reflectionY] #ifdef SPLIT_UINT4_ATTRIBUTES