diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 73aa32e025..50b99add26 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -1,30 +1,29 @@ repos: - repo: https://github.com/pre-commit/pre-commit-hooks - rev: v5.0.0 + rev: v6.0.0 hooks: - id: trailing-whitespace args: [--markdown-linebreak-ext=md] - id: check-yaml - repo: https://github.com/pre-commit/mirrors-clang-format - rev: v20.1.5 + rev: v21.1.8 hooks: - id: clang-format args: [--style=file] types_or: [file] files: \.(h|hpp|c|cpp|hlsl|hlsli)$ - additional_dependencies: ["clang-format==20.1.5"] exclude: ^(extern|include)/ - repo: https://github.com/pre-commit/mirrors-prettier - rev: v3.1.0 + rev: v4.0.0-alpha.8 hooks: - id: prettier additional_dependencies: ["prettier@3.1.0"] files: \.(json|md|yml|yaml)$ exclude: ^(\.\/)?(extern|include|build|dist)\/ - repo: https://github.com/BlankSpruce/gersemi - rev: 0.22.3 + rev: 0.26.0 hooks: - id: gersemi files: '(^CMakeLists.txt$|.*\\.cmake$)' diff --git a/CMakeLists.txt b/CMakeLists.txt index 94692dd46c..8422fc0fee 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -169,8 +169,7 @@ foreach(FEATURE_PATH ${FEATURE_CONFIG_FILES}) string(STRIP "${CONFIG_VALUE}" CONFIG_VALUE) if(CONFIG_VALUE) string( - REGEX MATCH - "Version = ([0-9]+)-([0-9]+)-([0-9]+)" + REGEX MATCH "Version = ([0-9]+)-([0-9]+)-([0-9]+)" _ "${CONFIG_VALUE}" ) @@ -183,8 +182,7 @@ foreach(FEATURE_PATH ${FEATURE_CONFIG_FILES}) set(ver_minor ${CMAKE_MATCH_2}) set(ver_patch ${CMAKE_MATCH_3}) list( - APPEND - FEATURE_VERSIONS + APPEND FEATURE_VERSIONS "\t\t{\"${FEATURE}\"sv, {${ver_major},${ver_minor},${ver_patch}}}" ) else() @@ -318,8 +316,7 @@ set(AIO_DIR "${CMAKE_CURRENT_BINARY_DIR}/aio") if(WIN32) set(ROBOCOPY_WRAPPER "${CMAKE_BINARY_DIR}/robocopy_wrapper.cmd") file( - WRITE - ${ROBOCOPY_WRAPPER} + WRITE ${ROBOCOPY_WRAPPER} "@echo off\r\nrem Robocopy wrapper: forwards all args to robocopy and normalizes exit codes\r\nrobocopy %*\r\nset rc=%ERRORLEVEL%\r\nif %rc% GEQ 8 exit /b %rc%\r\nexit /b 0\r\n" ) endif() @@ -377,8 +374,7 @@ if(AUTO_PLUGIN_DEPLOYMENT OR AIO_ZIP_TO_DIST) # Ensure SKSE/Plugins dir exists # Note: DLL and PDB are copied via POST_BUILD command to avoid race conditions list( - APPEND - _prepare_aio_cmds + APPEND _prepare_aio_cmds COMMAND ${CMAKE_COMMAND} -E @@ -398,8 +394,7 @@ if(AUTO_PLUGIN_DEPLOYMENT OR AIO_ZIP_TO_DIST) set(_dst "${AIO_DIR}/${_rel}") get_filename_component(_dst_dir "${_dst}" DIRECTORY) list( - APPEND - _prepare_aio_cmds + APPEND _prepare_aio_cmds COMMAND ${CMAKE_COMMAND} -E @@ -427,8 +422,7 @@ if(AUTO_PLUGIN_DEPLOYMENT OR AIO_ZIP_TO_DIST) set(_dst "${AIO_DIR}/${_rel}") get_filename_component(_dst_dir "${_dst}" DIRECTORY) list( - APPEND - _prepare_aio_cmds + APPEND _prepare_aio_cmds COMMAND ${CMAKE_COMMAND} -E @@ -447,8 +441,7 @@ if(AUTO_PLUGIN_DEPLOYMENT OR AIO_ZIP_TO_DIST) # Remove CORE from AIO if it exists (keep rest intact) list( - APPEND - _prepare_aio_cmds + APPEND _prepare_aio_cmds COMMAND ${CMAKE_COMMAND} -E @@ -456,8 +449,7 @@ if(AUTO_PLUGIN_DEPLOYMENT OR AIO_ZIP_TO_DIST) "${AIO_DIR}/CORE" ) list( - APPEND - _prepare_aio_cmds + APPEND _prepare_aio_cmds COMMAND ${CMAKE_COMMAND} -E @@ -511,8 +503,7 @@ if(AUTO_PLUGIN_DEPLOYMENT OR AIO_ZIP_TO_DIST) set(_dst "${AIO_DIR}/Shaders/${_rel}") get_filename_component(_dst_dir "${_dst}" DIRECTORY) list( - APPEND - _shader_copy_cmds + APPEND _shader_copy_cmds COMMAND ${CMAKE_COMMAND} -E @@ -543,8 +534,7 @@ if(AUTO_PLUGIN_DEPLOYMENT OR AIO_ZIP_TO_DIST) set(_dst "${AIO_DIR}/Shaders/${_rel}") get_filename_component(_dst_dir "${_dst}" DIRECTORY) list( - APPEND - _shader_copy_cmds + APPEND _shader_copy_cmds COMMAND ${CMAKE_COMMAND} -E @@ -656,8 +646,7 @@ if(AUTO_PLUGIN_DEPLOYMENT) ) list( - APPEND - SHADER_ONLY_HASHES + APPEND SHADER_ONLY_HASHES ${DEPLOY_TARGET_HASH}_shaders_only.stamp ) @@ -684,8 +673,7 @@ if(AUTO_PLUGIN_DEPLOYMENT) list(APPEND DEPLOY_TARGET_HASHES ${DEPLOY_TARGET_HASH}_deploy.stamp) list( - APPEND - DEPLOY_TARGET_HASHES + APPEND DEPLOY_TARGET_HASHES ${DEPLOY_TARGET_HASH}_shaders_full.stamp ) endforeach() diff --git a/features/Upscaling/Shaders/Upscaling/DepthRefractionUpscalePS.hlsl b/features/Upscaling/Shaders/Upscaling/DepthRefractionUpscalePS.hlsl index 4184f0e297..2c0073daac 100644 --- a/features/Upscaling/Shaders/Upscaling/DepthRefractionUpscalePS.hlsl +++ b/features/Upscaling/Shaders/Upscaling/DepthRefractionUpscalePS.hlsl @@ -8,9 +8,9 @@ typedef VS_OUTPUT PS_INPUT; struct PS_OUTPUT { - float4 RefractionNormals : SV_TARGET0; - float SAOCameraZ : SV_TARGET1; - float Depth : SV_Depth; + float4 RefractionNormals: SV_TARGET0; + float SAOCameraZ: SV_TARGET1; + float Depth: SV_Depth; }; SamplerState LinearSampler : register(s0); diff --git a/features/Upscaling/Shaders/Upscaling/UnderwaterMaskUpscalePS.hlsl b/features/Upscaling/Shaders/Upscaling/UnderwaterMaskUpscalePS.hlsl index c7529b8391..a99569ee39 100644 --- a/features/Upscaling/Shaders/Upscaling/UnderwaterMaskUpscalePS.hlsl +++ b/features/Upscaling/Shaders/Upscaling/UnderwaterMaskUpscalePS.hlsl @@ -8,7 +8,7 @@ typedef VS_OUTPUT PS_INPUT; struct PS_OUTPUT { - float UnderwaterMask : SV_TARGET; + float UnderwaterMask: SV_TARGET; }; SamplerState LinearSampler : register(s0); diff --git a/features/Upscaling/Shaders/Upscaling/UpscaleVS.hlsl b/features/Upscaling/Shaders/Upscaling/UpscaleVS.hlsl index 1058c4e963..ffb818a4a1 100644 --- a/features/Upscaling/Shaders/Upscaling/UpscaleVS.hlsl +++ b/features/Upscaling/Shaders/Upscaling/UpscaleVS.hlsl @@ -1,7 +1,7 @@ struct VS_OUTPUT { - float4 Position : SV_POSITION; - float2 TexCoord : TEXCOORD; + float4 Position: SV_POSITION; + float2 TexCoord: TEXCOORD; }; #if defined(VSHADER) diff --git a/package/Shaders/BloodSplatter.hlsl b/package/Shaders/BloodSplatter.hlsl index 31fed90def..d9cdc13bee 100644 --- a/package/Shaders/BloodSplatter.hlsl +++ b/package/Shaders/BloodSplatter.hlsl @@ -1,16 +1,16 @@ struct VS_INPUT { - float4 Position : POSITION0; - float2 TexCoord : TEXCOORD0; + float4 Position: POSITION0; + float2 TexCoord: TEXCOORD0; }; struct VS_OUTPUT { - float4 Position : SV_POSITION0; - float3 TexCoordColor : TEXCOORD0; + float4 Position: SV_POSITION0; + float3 TexCoordColor: TEXCOORD0; #if defined(SPLATTER) - float2 TexCoordAlpha : TEXCOORD1; + float2 TexCoordAlpha: TEXCOORD1; #endif }; @@ -46,7 +46,7 @@ typedef VS_OUTPUT PS_INPUT; struct PS_OUTPUT { - float4 Color : SV_Target0; + float4 Color: SV_Target0; }; #ifdef PSHADER diff --git a/package/Shaders/Common/DummyVS.hlsl b/package/Shaders/Common/DummyVS.hlsl index b4ae91f923..7585412438 100644 --- a/package/Shaders/Common/DummyVS.hlsl +++ b/package/Shaders/Common/DummyVS.hlsl @@ -1,11 +1,11 @@ struct VS_INPUT { - float4 Position : POSITION0; + float4 Position: POSITION0; }; struct VS_OUTPUT { - float4 Position : SV_POSITION0; + float4 Position: SV_POSITION0; }; #ifdef VSHADER diff --git a/package/Shaders/Common/DummyVSTexCoord.hlsl b/package/Shaders/Common/DummyVSTexCoord.hlsl index 7a1fb4249c..c56d5f8db0 100644 --- a/package/Shaders/Common/DummyVSTexCoord.hlsl +++ b/package/Shaders/Common/DummyVSTexCoord.hlsl @@ -1,13 +1,13 @@ struct VS_INPUT { - float4 Position : POSITION0; - float2 TexCoord : TEXCOORD0; + float4 Position: POSITION0; + float2 TexCoord: TEXCOORD0; }; struct VS_OUTPUT { - float4 Position : SV_POSITION0; - float2 TexCoord : TEXCOORD0; + float4 Position: SV_POSITION0; + float2 TexCoord: TEXCOORD0; }; #ifdef VSHADER diff --git a/package/Shaders/DistantTree.hlsl b/package/Shaders/DistantTree.hlsl index 140e01846a..3c338350a5 100644 --- a/package/Shaders/DistantTree.hlsl +++ b/package/Shaders/DistantTree.hlsl @@ -12,34 +12,34 @@ struct VS_INPUT { - float3 Position : POSITION0; - float2 TexCoord0 : TEXCOORD0; - float4 InstanceData1 : TEXCOORD4; - float4 InstanceData2 : TEXCOORD5; - float4 InstanceData3 : TEXCOORD6; - float4 InstanceData4 : TEXCOORD7; + float3 Position: POSITION0; + float2 TexCoord0: TEXCOORD0; + float4 InstanceData1: TEXCOORD4; + float4 InstanceData2: TEXCOORD5; + float4 InstanceData3: TEXCOORD6; + float4 InstanceData4: TEXCOORD7; #if defined(VR) - uint InstanceID : SV_INSTANCEID; + uint InstanceID: SV_INSTANCEID; #endif // VR }; struct VS_OUTPUT { - float4 Position : SV_POSITION0; - float3 TexCoord : TEXCOORD0; + float4 Position: SV_POSITION0; + float3 TexCoord: TEXCOORD0; #if defined(RENDER_DEPTH) - float4 Depth : TEXCOORD3; + float4 Depth: TEXCOORD3; #else - float4 WorldPosition : POSITION1; - float4 PreviousWorldPosition : POSITION2; + float4 WorldPosition: POSITION1; + float4 PreviousWorldPosition: POSITION2; #endif // RENDER_DEPTH - float4 ViewPosition : POSITION3; + float4 ViewPosition: POSITION3; #if defined(VR) - float ClipDistance : SV_ClipDistance0; // o11 - float CullDistance : SV_CullDistance0; // p11 - uint EyeIndex : EYEIDX0; + float ClipDistance: SV_ClipDistance0; // o11 + float CullDistance: SV_CullDistance0; // p11 + uint EyeIndex: EYEIDX0; #endif // VR }; @@ -107,14 +107,14 @@ typedef VS_OUTPUT PS_INPUT; struct PS_OUTPUT { - float4 Diffuse : SV_Target0; + float4 Diffuse: SV_Target0; #if !defined(RENDER_DEPTH) # if defined(DEFERRED) - float2 MotionVector : SV_Target1; - float4 Normal : SV_Target2; - float4 Albedo : SV_Target3; - float4 Masks : SV_Target6; + float2 MotionVector: SV_Target1; + float4 Normal: SV_Target2; + float4 Albedo: SV_Target3; + float4 Masks: SV_Target6; # endif // DEFERRED #endif // !RENDER_DEPTH }; diff --git a/package/Shaders/Effect.hlsl b/package/Shaders/Effect.hlsl index ec344a6486..f42f82188d 100644 --- a/package/Shaders/Effect.hlsl +++ b/package/Shaders/Effect.hlsl @@ -17,80 +17,80 @@ struct VS_INPUT { - float4 Position : POSITION0; + float4 Position: POSITION0; #if defined(TEXCOORD) # if defined(STRIP_PARTICLES) float3 # else float2 # endif - TexCoord0 : TEXCOORD0; + TexCoord0: TEXCOORD0; #endif #if defined(NORMALS) || defined(MOTIONVECTORS_NORMALS) - float4 Normal : NORMAL0; + float4 Normal: NORMAL0; #endif #if defined(BINORMAL_TANGENT) - float4 Bitangent : BINORMAL0; + float4 Bitangent: BINORMAL0; #endif #if defined(VC) - float4 Color : COLOR0; + float4 Color: COLOR0; #endif #if defined(SKINNED) - float4 BoneWeights : BLENDWEIGHT0; - float4 BoneIndices : BLENDINDICES0; + float4 BoneWeights: BLENDWEIGHT0; + float4 BoneIndices: BLENDINDICES0; #endif #if defined(VR) - uint InstanceID : SV_INSTANCEID; + uint InstanceID: SV_INSTANCEID; #endif // VR }; struct VS_OUTPUT { - float4 Position : SV_POSITION0; - float4 TexCoord0 : TEXCOORD0; - float4 WorldPosition : POSITION1; + float4 Position: SV_POSITION0; + float4 TexCoord0: TEXCOORD0; + float4 WorldPosition: POSITION1; #if defined(VC) - float4 Color : COLOR0; + float4 Color: COLOR0; #endif #if !defined(MOTIONVECTORS_NORMALS) - float4 FogParam : COLOR1; + float4 FogParam: COLOR1; #endif #if defined(MOTIONVECTORS_NORMALS) && defined(MEMBRANE) && !defined(SKINNED) && defined(NORMALS) - float3 ScreenSpaceNormal : TEXCOORD1; + float3 ScreenSpaceNormal: TEXCOORD1; #elif (defined(MEMBRANE) && (defined(SKINNED) || defined(NORMALS))) || (defined(PROJECTED_UV) && defined(NORMALS)) - float3 TBN0 : TEXCOORD1; + float3 TBN0: TEXCOORD1; #endif #if defined(MEMBRANE) && (defined(SKINNED) || defined(NORMALS)) - float FogAlpha : TEXCOORD5; + float FogAlpha: TEXCOORD5; #endif #if (defined(MEMBRANE) && defined(SKINNED) && !defined(NORMALS)) || (defined(PROJECTED_UV) && defined(NORMALS) && !defined(MEMBRANE)) - float3 TBN1 : TEXCOORD2; + float3 TBN1: TEXCOORD2; #endif #if (defined(MEMBRANE) && defined(SKINNED) && !defined(NORMALS)) - float3 TBN2 : TEXCOORD3; + float3 TBN2: TEXCOORD3; #endif #if defined(MEMBRANE) - float4 ViewVector : TEXCOORD4; + float4 ViewVector: TEXCOORD4; #endif #if defined(LIGHTING) - float3 MSPosition : TEXCOORD6; + float3 MSPosition: TEXCOORD6; #endif #if !(defined(MEMBRANE) && (defined(SKINNED) || defined(NORMALS))) - float FogAlpha : TEXCOORD5; + float FogAlpha: TEXCOORD5; #endif #if defined(MOTIONVECTORS_NORMALS) # if !defined(LIGHTING) && !(defined(MEMBRANE) && defined(SKINNED)) && !(defined(MEMBRANE) && !defined(SKINNED) && defined(NORMALS)) - float3 ScreenSpaceNormal : TEXCOORD7; + float3 ScreenSpaceNormal: TEXCOORD7; # endif - float4 PreviousWorldPosition : POSITION2; + float4 PreviousWorldPosition: POSITION2; # if (defined(LIGHTING) || (defined(MEMBRANE) && defined(SKINNED))) && !(defined(MEMBRANE) && defined(NORMALS)) - float3 ScreenSpaceNormal : TEXCOORD7; + float3 ScreenSpaceNormal: TEXCOORD7; # endif #endif #if defined(VR) - float ClipDistance : SV_ClipDistance0; // o11 - float CullDistance : SV_CullDistance0; // p11 - uint EyeIndex : EYEIDX0; + float ClipDistance: SV_ClipDistance0; // o11 + float CullDistance: SV_CullDistance0; // p11 + uint EyeIndex: EYEIDX0; #endif // VR }; @@ -424,28 +424,28 @@ Texture2D TexGrayscaleSampler : register(t4); #if defined(DEFERRED) struct PS_OUTPUT { - float4 Diffuse : SV_Target0; + float4 Diffuse: SV_Target0; # if defined(MOTIONVECTORS_NORMALS) - float4 MotionVectors : SV_Target1; - float4 NormalGlossiness : SV_Target2; + float4 MotionVectors: SV_Target1; + float4 NormalGlossiness: SV_Target2; # elif defined(NORMALS) - float4 NormalGlossiness : SV_Target2; + float4 NormalGlossiness: SV_Target2; # endif - float4 Albedo : SV_Target3; - float4 Specular : SV_Target4; - float4 Reflectance : SV_Target5; - float4 Masks : SV_Target6; + float4 Albedo: SV_Target3; + float4 Specular: SV_Target4; + float4 Reflectance: SV_Target5; + float4 Masks: SV_Target6; }; #else struct PS_OUTPUT { - float4 Diffuse : SV_Target0; + float4 Diffuse: SV_Target0; # if defined(MOTIONVECTORS_NORMALS) - float2 MotionVectors : SV_Target1; - float4 ScreenSpaceNormals : SV_Target2; + float2 MotionVectors: SV_Target1; + float4 ScreenSpaceNormals: SV_Target2; # else - float4 Normal : SV_Target1; - float4 Color2 : SV_Target2; + float4 Normal: SV_Target1; + float4 Color2: SV_Target2; # endif }; #endif diff --git a/package/Shaders/ISAlphaBlend.hlsl b/package/Shaders/ISAlphaBlend.hlsl index cb8fdb35c6..9971fc30c8 100644 --- a/package/Shaders/ISAlphaBlend.hlsl +++ b/package/Shaders/ISAlphaBlend.hlsl @@ -4,7 +4,7 @@ typedef VS_OUTPUT PS_INPUT; struct PS_OUTPUT { - float4 Color : SV_Target0; + float4 Color: SV_Target0; }; #if defined(PSHADER) diff --git a/package/Shaders/ISApplyReflections.hlsl b/package/Shaders/ISApplyReflections.hlsl index a66f9f0b5a..7209cba177 100644 --- a/package/Shaders/ISApplyReflections.hlsl +++ b/package/Shaders/ISApplyReflections.hlsl @@ -5,7 +5,7 @@ typedef VS_OUTPUT PS_INPUT; struct PS_OUTPUT { - float3 Color : SV_Target0; + float3 Color: SV_Target0; }; #if defined(PSHADER) diff --git a/package/Shaders/ISApplyVolumetricLighting.hlsl b/package/Shaders/ISApplyVolumetricLighting.hlsl index 5a5dc114ef..8f7e2ab52d 100644 --- a/package/Shaders/ISApplyVolumetricLighting.hlsl +++ b/package/Shaders/ISApplyVolumetricLighting.hlsl @@ -6,7 +6,7 @@ typedef VS_OUTPUT PS_INPUT; struct PS_OUTPUT { - float VL : SV_Target0; + float VL: SV_Target0; }; #if defined(PSHADER) diff --git a/package/Shaders/ISBasicCopy.hlsl b/package/Shaders/ISBasicCopy.hlsl index 6c90726e8b..8fb311b0de 100644 --- a/package/Shaders/ISBasicCopy.hlsl +++ b/package/Shaders/ISBasicCopy.hlsl @@ -4,7 +4,7 @@ typedef VS_OUTPUT PS_INPUT; struct PS_OUTPUT { - float4 Color : SV_Target0; + float4 Color: SV_Target0; }; #if defined(PSHADER) diff --git a/package/Shaders/ISBlur.hlsl b/package/Shaders/ISBlur.hlsl index c956135e1c..26f447d342 100644 --- a/package/Shaders/ISBlur.hlsl +++ b/package/Shaders/ISBlur.hlsl @@ -6,7 +6,7 @@ typedef VS_OUTPUT PS_INPUT; struct PS_OUTPUT { - float4 Color : SV_Target0; + float4 Color: SV_Target0; }; #if defined(PSHADER) diff --git a/package/Shaders/ISCompositeLensFlareVolumetricLighting.hlsl b/package/Shaders/ISCompositeLensFlareVolumetricLighting.hlsl index 37a759be25..29f37eecb1 100644 --- a/package/Shaders/ISCompositeLensFlareVolumetricLighting.hlsl +++ b/package/Shaders/ISCompositeLensFlareVolumetricLighting.hlsl @@ -7,7 +7,7 @@ typedef VS_OUTPUT PS_INPUT; struct PS_OUTPUT { - float3 Color : SV_Target0; + float3 Color: SV_Target0; }; #if defined(PSHADER) diff --git a/package/Shaders/ISCopy.hlsl b/package/Shaders/ISCopy.hlsl index 99513da82f..98df384bd0 100644 --- a/package/Shaders/ISCopy.hlsl +++ b/package/Shaders/ISCopy.hlsl @@ -6,9 +6,9 @@ typedef VS_OUTPUT PS_INPUT; struct PS_OUTPUT { #if defined(DEPTHBUFFER_COPY) - float Depth : SV_Depth; + float Depth: SV_Depth; #else - float4 Color : SV_Target0; + float4 Color: SV_Target0; #endif }; diff --git a/package/Shaders/ISDebugSnow.hlsl b/package/Shaders/ISDebugSnow.hlsl index a867bcebb9..f0f87aa699 100644 --- a/package/Shaders/ISDebugSnow.hlsl +++ b/package/Shaders/ISDebugSnow.hlsl @@ -4,7 +4,7 @@ typedef VS_OUTPUT PS_INPUT; struct PS_OUTPUT { - float4 Color : SV_Target0; + float4 Color: SV_Target0; }; #if defined(PSHADER) diff --git a/package/Shaders/ISDepthOfField.hlsl b/package/Shaders/ISDepthOfField.hlsl index 7e88dfea68..37518bdbb6 100644 --- a/package/Shaders/ISDepthOfField.hlsl +++ b/package/Shaders/ISDepthOfField.hlsl @@ -6,7 +6,7 @@ typedef VS_OUTPUT PS_INPUT; struct PS_OUTPUT { - float4 Color : SV_Target0; + float4 Color: SV_Target0; }; #if defined(PSHADER) diff --git a/package/Shaders/ISDoubleVision.hlsl b/package/Shaders/ISDoubleVision.hlsl index d71ea2f520..1f45033919 100644 --- a/package/Shaders/ISDoubleVision.hlsl +++ b/package/Shaders/ISDoubleVision.hlsl @@ -5,7 +5,7 @@ typedef VS_OUTPUT PS_INPUT; struct PS_OUTPUT { - float4 Color : SV_Target0; + float4 Color: SV_Target0; }; #if defined(PSHADER) diff --git a/package/Shaders/ISDownsample.hlsl b/package/Shaders/ISDownsample.hlsl index ba3e1042ce..05f287355e 100644 --- a/package/Shaders/ISDownsample.hlsl +++ b/package/Shaders/ISDownsample.hlsl @@ -6,7 +6,7 @@ typedef VS_OUTPUT PS_INPUT; struct PS_OUTPUT { - float4 Color : SV_Target0; + float4 Color: SV_Target0; }; #if defined(PSHADER) diff --git a/package/Shaders/ISExp.hlsl b/package/Shaders/ISExp.hlsl index 0866d69e81..c1237a6e01 100644 --- a/package/Shaders/ISExp.hlsl +++ b/package/Shaders/ISExp.hlsl @@ -4,7 +4,7 @@ typedef VS_OUTPUT PS_INPUT; struct PS_OUTPUT { - float4 Color : SV_Target0; + float4 Color: SV_Target0; }; #if defined(PSHADER) diff --git a/package/Shaders/ISFullScreenVR.hlsl b/package/Shaders/ISFullScreenVR.hlsl index 404fde27a0..455602e3c9 100644 --- a/package/Shaders/ISFullScreenVR.hlsl +++ b/package/Shaders/ISFullScreenVR.hlsl @@ -5,7 +5,7 @@ typedef VS_OUTPUT PS_INPUT; struct PS_OUTPUT { - float4 Color : SV_Target0; // Final color output for the pixel shader. + float4 Color: SV_Target0; // Final color output for the pixel shader. }; #if defined(PSHADER) diff --git a/package/Shaders/ISHDR.hlsl b/package/Shaders/ISHDR.hlsl index 24322bc8be..c187e149f8 100644 --- a/package/Shaders/ISHDR.hlsl +++ b/package/Shaders/ISHDR.hlsl @@ -7,7 +7,7 @@ typedef VS_OUTPUT PS_INPUT; struct PS_OUTPUT { - float4 Color : SV_Target0; + float4 Color: SV_Target0; }; #if defined(PSHADER) diff --git a/package/Shaders/ISIBLensFlare.hlsl b/package/Shaders/ISIBLensFlare.hlsl index 3fb31d6c9f..5986752081 100644 --- a/package/Shaders/ISIBLensFlare.hlsl +++ b/package/Shaders/ISIBLensFlare.hlsl @@ -5,7 +5,7 @@ typedef VS_OUTPUT PS_INPUT; struct PS_OUTPUT { - float4 Color : SV_Target0; + float4 Color: SV_Target0; }; #if defined(PSHADER) diff --git a/package/Shaders/ISLightingComposite.hlsl b/package/Shaders/ISLightingComposite.hlsl index 44665d4a78..985b3ecd01 100644 --- a/package/Shaders/ISLightingComposite.hlsl +++ b/package/Shaders/ISLightingComposite.hlsl @@ -4,7 +4,7 @@ typedef VS_OUTPUT PS_INPUT; struct PS_OUTPUT { - float4 Color : SV_Target0; + float4 Color: SV_Target0; }; #if defined(PSHADER) diff --git a/package/Shaders/ISLocalMap.hlsl b/package/Shaders/ISLocalMap.hlsl index 3cfde83d51..2da206ee60 100644 --- a/package/Shaders/ISLocalMap.hlsl +++ b/package/Shaders/ISLocalMap.hlsl @@ -5,7 +5,7 @@ typedef VS_OUTPUT PS_INPUT; struct PS_OUTPUT { - float4 Color : SV_Target0; + float4 Color: SV_Target0; }; #if defined(PSHADER) diff --git a/package/Shaders/ISMap.hlsl b/package/Shaders/ISMap.hlsl index 631f056fca..1fd4acf696 100644 --- a/package/Shaders/ISMap.hlsl +++ b/package/Shaders/ISMap.hlsl @@ -4,7 +4,7 @@ typedef VS_OUTPUT PS_INPUT; struct PS_OUTPUT { - float4 Color : SV_Target0; + float4 Color: SV_Target0; }; #if defined(PSHADER) diff --git a/package/Shaders/ISNoise.hlsl b/package/Shaders/ISNoise.hlsl index 74db0528e1..187e519dbc 100644 --- a/package/Shaders/ISNoise.hlsl +++ b/package/Shaders/ISNoise.hlsl @@ -1,13 +1,13 @@ struct VS_INPUT { - float4 Position : POSITION0; - float2 TexCoord : TEXCOORD0; + float4 Position: POSITION0; + float2 TexCoord: TEXCOORD0; }; struct VS_OUTPUT { - float4 Position : POSITION0; - float2 TexCoord : TEXCOORD0; + float4 Position: POSITION0; + float2 TexCoord: TEXCOORD0; }; #ifdef VSHADER @@ -32,7 +32,7 @@ typedef VS_OUTPUT PS_INPUT; struct PS_OUTPUT { - float4 Color : SV_Target0; + float4 Color: SV_Target0; }; #if defined(PSHADER) diff --git a/package/Shaders/ISRadialBlur.hlsl b/package/Shaders/ISRadialBlur.hlsl index b46fa80819..2499019b7b 100644 --- a/package/Shaders/ISRadialBlur.hlsl +++ b/package/Shaders/ISRadialBlur.hlsl @@ -5,7 +5,7 @@ typedef VS_OUTPUT PS_INPUT; struct PS_OUTPUT { - float4 Color : SV_Target0; + float4 Color: SV_Target0; }; #if defined(PSHADER) diff --git a/package/Shaders/ISReflectionsRayTracing.hlsl b/package/Shaders/ISReflectionsRayTracing.hlsl index 64f8ef7ec6..0f9c45d397 100644 --- a/package/Shaders/ISReflectionsRayTracing.hlsl +++ b/package/Shaders/ISReflectionsRayTracing.hlsl @@ -8,7 +8,7 @@ typedef VS_OUTPUT PS_INPUT; struct PS_OUTPUT { - float4 Color : SV_Target0; + float4 Color: SV_Target0; }; #if defined(PSHADER) diff --git a/package/Shaders/ISRefraction.hlsl b/package/Shaders/ISRefraction.hlsl index c2538afa6a..97e2568ba7 100644 --- a/package/Shaders/ISRefraction.hlsl +++ b/package/Shaders/ISRefraction.hlsl @@ -7,7 +7,7 @@ typedef VS_OUTPUT PS_INPUT; struct PS_OUTPUT { - float4 Color : SV_Target0; + float4 Color: SV_Target0; }; #if defined(PSHADER) diff --git a/package/Shaders/ISSAOBlur.hlsl b/package/Shaders/ISSAOBlur.hlsl index 9e4190ed38..aecb9fa4b9 100644 --- a/package/Shaders/ISSAOBlur.hlsl +++ b/package/Shaders/ISSAOBlur.hlsl @@ -5,7 +5,7 @@ typedef VS_OUTPUT PS_INPUT; struct PS_OUTPUT { - float4 Color : SV_Target0; + float4 Color: SV_Target0; }; #if defined(PSHADER) diff --git a/package/Shaders/ISSAOCameraZ.hlsl b/package/Shaders/ISSAOCameraZ.hlsl index 9742ac891f..054dd8ef26 100644 --- a/package/Shaders/ISSAOCameraZ.hlsl +++ b/package/Shaders/ISSAOCameraZ.hlsl @@ -5,7 +5,7 @@ typedef VS_OUTPUT PS_INPUT; struct PS_OUTPUT { - float ClippedDepth : SV_Target0; + float ClippedDepth: SV_Target0; }; #if defined(PSHADER) diff --git a/package/Shaders/ISSAOComposite.hlsl b/package/Shaders/ISSAOComposite.hlsl index a1843d0974..478e677b40 100644 --- a/package/Shaders/ISSAOComposite.hlsl +++ b/package/Shaders/ISSAOComposite.hlsl @@ -7,7 +7,7 @@ typedef VS_OUTPUT PS_INPUT; struct PS_OUTPUT { - float4 Color : SV_Target0; + float4 Color: SV_Target0; }; #if defined(PSHADER) diff --git a/package/Shaders/ISSAOMinify.hlsl b/package/Shaders/ISSAOMinify.hlsl index 64e4c66d56..e82377f61c 100644 --- a/package/Shaders/ISSAOMinify.hlsl +++ b/package/Shaders/ISSAOMinify.hlsl @@ -5,7 +5,7 @@ typedef VS_OUTPUT PS_INPUT; struct PS_OUTPUT { - float4 Color : SV_Target0; + float4 Color: SV_Target0; }; #if defined(PSHADER) diff --git a/package/Shaders/ISSILComposite.hlsl b/package/Shaders/ISSILComposite.hlsl index bcb24c64d8..81944356e6 100644 --- a/package/Shaders/ISSILComposite.hlsl +++ b/package/Shaders/ISSILComposite.hlsl @@ -5,7 +5,7 @@ typedef VS_OUTPUT PS_INPUT; struct PS_OUTPUT { - float4 Color : SV_Target0; + float4 Color: SV_Target0; }; #if defined(PSHADER) diff --git a/package/Shaders/ISSimpleColor.hlsl b/package/Shaders/ISSimpleColor.hlsl index dbd1897d89..2ef3fbaf35 100644 --- a/package/Shaders/ISSimpleColor.hlsl +++ b/package/Shaders/ISSimpleColor.hlsl @@ -8,7 +8,7 @@ typedef VS_OUTPUT PS_INPUT; struct PS_OUTPUT { - float4 Color : SV_Target0; + float4 Color: SV_Target0; }; #if defined(PSHADER) diff --git a/package/Shaders/ISSnowSSS.hlsl b/package/Shaders/ISSnowSSS.hlsl index 225ac81621..253898e6c1 100644 --- a/package/Shaders/ISSnowSSS.hlsl +++ b/package/Shaders/ISSnowSSS.hlsl @@ -6,7 +6,7 @@ typedef VS_OUTPUT PS_INPUT; struct PS_OUTPUT { - float3 Color : SV_Target0; + float3 Color: SV_Target0; }; #if defined(PSHADER) diff --git a/package/Shaders/ISUpsampleDynamicResolution.hlsl b/package/Shaders/ISUpsampleDynamicResolution.hlsl index 6e69cabdd1..8224e9eb7e 100644 --- a/package/Shaders/ISUpsampleDynamicResolution.hlsl +++ b/package/Shaders/ISUpsampleDynamicResolution.hlsl @@ -4,7 +4,7 @@ typedef VS_OUTPUT PS_INPUT; struct PS_OUTPUT { - float4 Color : SV_Target0; + float4 Color: SV_Target0; }; #if defined(PSHADER) diff --git a/package/Shaders/ISVolumetricLighting.hlsl b/package/Shaders/ISVolumetricLighting.hlsl index 1f1c9362ed..8e0d831e3d 100644 --- a/package/Shaders/ISVolumetricLighting.hlsl +++ b/package/Shaders/ISVolumetricLighting.hlsl @@ -4,7 +4,7 @@ typedef VS_OUTPUT PS_INPUT; struct PS_OUTPUT { - float4 Color : SV_Target0; + float4 Color: SV_Target0; }; #if defined(PSHADER) diff --git a/package/Shaders/ISWaterBlend.hlsl b/package/Shaders/ISWaterBlend.hlsl index 427d4cf17b..5ae303af10 100644 --- a/package/Shaders/ISWaterBlend.hlsl +++ b/package/Shaders/ISWaterBlend.hlsl @@ -6,8 +6,8 @@ typedef VS_OUTPUT PS_INPUT; struct PS_OUTPUT { - float3 Color : SV_Target0; - float4 Color1 : SV_Target1; + float3 Color: SV_Target0; + float4 Color1: SV_Target1; }; #if defined(PSHADER) diff --git a/package/Shaders/ISWaterDisplacement.hlsl b/package/Shaders/ISWaterDisplacement.hlsl index 9853d10b36..e7ea0924b9 100644 --- a/package/Shaders/ISWaterDisplacement.hlsl +++ b/package/Shaders/ISWaterDisplacement.hlsl @@ -4,19 +4,19 @@ struct VS_INPUT { - float4 Position : POSITION0; - float2 TexCoord : TEXCOORD0; + float4 Position: POSITION0; + float2 TexCoord: TEXCOORD0; }; struct VS_OUTPUT { - float4 Position : SV_POSITION0; - float2 TexCoord : TEXCOORD0; + float4 Position: SV_POSITION0; + float2 TexCoord: TEXCOORD0; #if defined(HEIGHTMAP) - float2 TexCoord1 : TEXCOORD1; - float2 TexCoord2 : TEXCOORD2; - float2 TexCoord3 : TEXCOORD3; - float2 TexCoord4 : TEXCOORD4; + float2 TexCoord1: TEXCOORD1; + float2 TexCoord2: TEXCOORD2; + float2 TexCoord3: TEXCOORD3; + float2 TexCoord4: TEXCOORD4; #endif }; @@ -42,7 +42,7 @@ typedef VS_OUTPUT PS_INPUT; struct PS_OUTPUT { - float4 Color : SV_Target0; + float4 Color: SV_Target0; }; #if defined(PSHADER) diff --git a/package/Shaders/ISWaterFlow.hlsl b/package/Shaders/ISWaterFlow.hlsl index abdf41ec46..9b0a0a7f7c 100644 --- a/package/Shaders/ISWaterFlow.hlsl +++ b/package/Shaders/ISWaterFlow.hlsl @@ -4,7 +4,7 @@ typedef VS_OUTPUT PS_INPUT; struct PS_OUTPUT { - float4 Color : SV_Target0; + float4 Color: SV_Target0; }; #if defined(PSHADER) diff --git a/package/Shaders/ISWorldMap.hlsl b/package/Shaders/ISWorldMap.hlsl index 3fa5f5e665..a3acfbaabb 100644 --- a/package/Shaders/ISWorldMap.hlsl +++ b/package/Shaders/ISWorldMap.hlsl @@ -5,7 +5,7 @@ typedef VS_OUTPUT PS_INPUT; struct PS_OUTPUT { - float4 Color : SV_Target0; + float4 Color: SV_Target0; }; #if defined(PSHADER) diff --git a/package/Shaders/Lighting.hlsl b/package/Shaders/Lighting.hlsl index 7c2a00e1b8..0e2587f52b 100644 --- a/package/Shaders/Lighting.hlsl +++ b/package/Shaders/Lighting.hlsl @@ -29,71 +29,71 @@ struct VS_INPUT { - float4 Position : POSITION0; - float2 TexCoord0 : TEXCOORD0; + float4 Position: POSITION0; + float2 TexCoord0: TEXCOORD0; #if !defined(MODELSPACENORMALS) - float4 Normal : NORMAL0; - float4 Bitangent : BINORMAL0; + float4 Normal: NORMAL0; + float4 Bitangent: BINORMAL0; #endif // !MODELSPACENORMALS #if defined(VC) - float4 Color : COLOR0; + float4 Color: COLOR0; # if defined(LANDSCAPE) - float4 LandBlendWeights1 : TEXCOORD2; - float4 LandBlendWeights2 : TEXCOORD3; + float4 LandBlendWeights1: TEXCOORD2; + float4 LandBlendWeights2: TEXCOORD3; # endif // LANDSCAPE #endif // VC #if defined(SKINNED) - float4 BoneWeights : BLENDWEIGHT0; - float4 BoneIndices : BLENDINDICES0; + float4 BoneWeights: BLENDWEIGHT0; + float4 BoneIndices: BLENDINDICES0; #endif // SKINNED #if defined(EYE) - float EyeParameter : TEXCOORD2; + float EyeParameter: TEXCOORD2; #endif // EYE #if defined(VR) - uint InstanceID : SV_INSTANCEID; + uint InstanceID: SV_INSTANCEID; #endif // VR }; struct VS_OUTPUT { - float4 Position : SV_POSITION0; + float4 Position: SV_POSITION0; #if (defined(PROJECTED_UV) && !defined(SKINNED)) || defined(LANDSCAPE) float4 #else float2 #endif // (defined (PROJECTED_UV) && !defined(SKINNED)) || defined(LANDSCAPE) - TexCoord0 : TEXCOORD0; + TexCoord0: TEXCOORD0; #if defined(WORLD_MAP) - float3 InputPosition : TEXCOORD4; + float3 InputPosition: TEXCOORD4; #endif #if defined(SKINNED) || !defined(MODELSPACENORMALS) - float3 TBN0 : TEXCOORD1; - float3 TBN1 : TEXCOORD2; - float3 TBN2 : TEXCOORD3; + float3 TBN0: TEXCOORD1; + float3 TBN1: TEXCOORD2; + float3 TBN2: TEXCOORD3; #endif // defined(SKINNED) || !defined(MODELSPACENORMALS) #if defined(EYE) - float3 EyeNormal : TEXCOORD6; + float3 EyeNormal: TEXCOORD6; #elif defined(LANDSCAPE) - float4 LandBlendWeights1 : TEXCOORD6; - float4 LandBlendWeights2 : TEXCOORD7; + float4 LandBlendWeights1: TEXCOORD6; + float4 LandBlendWeights2: TEXCOORD7; #elif defined(PROJECTED_UV) && !defined(SKINNED) - float3 TexProj : TEXCOORD7; + float3 TexProj: TEXCOORD7; #endif // EYE - float4 WorldPosition : POSITION1; - float4 PreviousWorldPosition : POSITION2; - float4 Color : COLOR0; - float4 FogParam : COLOR1; + float4 WorldPosition: POSITION1; + float4 PreviousWorldPosition: POSITION2; + float4 Color: COLOR0; + float4 FogParam: COLOR1; #if defined(VR) - float ClipDistance : SV_ClipDistance0; // o11 - float CullDistance : SV_CullDistance0; // p11 + float ClipDistance: SV_ClipDistance0; // o11 + float CullDistance: SV_CullDistance0; // p11 #endif - float3 ModelPosition : TEXCOORD12; + float3 ModelPosition: TEXCOORD12; }; #ifdef VSHADER @@ -335,22 +335,22 @@ typedef VS_OUTPUT PS_INPUT; #if defined(DEFERRED) struct PS_OUTPUT { - float4 Diffuse : SV_Target0; - float4 MotionVectors : SV_Target1; - float4 NormalGlossiness : SV_Target2; - float4 Albedo : SV_Target3; - float4 Specular : SV_Target4; - float4 Reflectance : SV_Target5; - float4 Masks : SV_Target6; + float4 Diffuse: SV_Target0; + float4 MotionVectors: SV_Target1; + float4 NormalGlossiness: SV_Target2; + float4 Albedo: SV_Target3; + float4 Specular: SV_Target4; + float4 Reflectance: SV_Target5; + float4 Masks: SV_Target6; # if defined(SNOW) - float4 Parameters : SV_Target7; + float4 Parameters: SV_Target7; # endif }; #else struct PS_OUTPUT { - float4 Diffuse : SV_Target0; - float4 MotionVectors : SV_Target1; + float4 Diffuse: SV_Target0; + float4 MotionVectors: SV_Target1; }; #endif diff --git a/package/Shaders/Menu/BackgroundBlurComposite.hlsl b/package/Shaders/Menu/BackgroundBlurComposite.hlsl index 1424143f5e..3326a63dd3 100644 --- a/package/Shaders/Menu/BackgroundBlurComposite.hlsl +++ b/package/Shaders/Menu/BackgroundBlurComposite.hlsl @@ -17,8 +17,8 @@ static const float CLIP_EPSILON = 0.001f; struct VS_OUTPUT { - float4 Position : SV_POSITION; - float2 TexCoord : TEXCOORD0; + float4 Position: SV_POSITION; + float2 TexCoord: TEXCOORD0; }; VS_OUTPUT VS_Main(uint vertexID : SV_VertexID) diff --git a/package/Shaders/Menu/BackgroundBlurHorizontal.hlsl b/package/Shaders/Menu/BackgroundBlurHorizontal.hlsl index 4b4cea6e2d..b9447f4334 100644 --- a/package/Shaders/Menu/BackgroundBlurHorizontal.hlsl +++ b/package/Shaders/Menu/BackgroundBlurHorizontal.hlsl @@ -12,8 +12,8 @@ Texture2D InputTexture : register(t0); struct VS_OUTPUT { - float4 Position : SV_POSITION; - float2 TexCoord : TEXCOORD0; + float4 Position: SV_POSITION; + float2 TexCoord: TEXCOORD0; }; VS_OUTPUT VS_Main(uint vertexID : SV_VertexID) diff --git a/package/Shaders/Menu/BackgroundBlurVertical.hlsl b/package/Shaders/Menu/BackgroundBlurVertical.hlsl index 6461cabf3b..13b5b580bb 100644 --- a/package/Shaders/Menu/BackgroundBlurVertical.hlsl +++ b/package/Shaders/Menu/BackgroundBlurVertical.hlsl @@ -12,8 +12,8 @@ Texture2D InputTexture : register(t0); struct VS_OUTPUT { - float4 Position : SV_POSITION; - float2 TexCoord : TEXCOORD0; + float4 Position: SV_POSITION; + float2 TexCoord: TEXCOORD0; }; VS_OUTPUT VS_Main(uint vertexID : SV_VertexID) diff --git a/package/Shaders/Particle.hlsl b/package/Shaders/Particle.hlsl index 02da4388a6..bc8074bc18 100644 --- a/package/Shaders/Particle.hlsl +++ b/package/Shaders/Particle.hlsl @@ -5,34 +5,34 @@ struct VS_INPUT { - float4 Position : POSITION0; + float4 Position: POSITION0; #if !defined(ENVCUBE) - float4 Normal : NORMAL0; + float4 Normal: NORMAL0; #endif - float4 TexCoord0 : TEXCOORD0; + float4 TexCoord0: TEXCOORD0; #if defined(ENVCUBE) float4 #else int4 #endif - TexCoord1 : TEXCOORD1; + TexCoord1: TEXCOORD1; #if defined(VR) - uint InstanceID : SV_INSTANCEID; + uint InstanceID: SV_INSTANCEID; #endif // VR }; struct VS_OUTPUT { - float4 Position : SV_POSITION0; - float4 Color : COLOR0; - float2 TexCoord0 : TEXCOORD0; + float4 Position: SV_POSITION0; + float4 Color: COLOR0; + float2 TexCoord0: TEXCOORD0; #if defined(ENVCUBE) - float4 PrecipitationOcclusionTexCoord : TEXCOORD1; + float4 PrecipitationOcclusionTexCoord: TEXCOORD1; #endif #if defined(VR) - float ClipDistance : SV_ClipDistance0; // o11 - float CullDistance : SV_CullDistance0; // p11 - uint EyeIndex : EYEIDX0; + float ClipDistance: SV_ClipDistance0; // o11 + float CullDistance: SV_CullDistance0; // p11 + uint EyeIndex: EYEIDX0; #endif // VR }; @@ -209,8 +209,8 @@ typedef VS_OUTPUT PS_INPUT; struct PS_OUTPUT { - float4 Color : SV_Target0; - float4 Normal : SV_Target1; + float4 Color: SV_Target0; + float4 Normal: SV_Target1; }; #ifdef PSHADER diff --git a/package/Shaders/RunGrass.hlsl b/package/Shaders/RunGrass.hlsl index 270901da61..e85b3c917c 100644 --- a/package/Shaders/RunGrass.hlsl +++ b/package/Shaders/RunGrass.hlsl @@ -19,65 +19,65 @@ struct VS_INPUT { - float4 Position : POSITION0; - float2 TexCoord : TEXCOORD0; - float4 Normal : NORMAL0; - float4 Color : COLOR0; - float4 InstanceData1 : TEXCOORD4; - float4 InstanceData2 : TEXCOORD5; - float4 InstanceData3 : TEXCOORD6; - float4 InstanceData4 : TEXCOORD7; + float4 Position: POSITION0; + float2 TexCoord: TEXCOORD0; + float4 Normal: NORMAL0; + float4 Color: COLOR0; + float4 InstanceData1: TEXCOORD4; + float4 InstanceData2: TEXCOORD5; + float4 InstanceData3: TEXCOORD6; + float4 InstanceData4: TEXCOORD7; #ifdef VR - uint InstanceID : SV_INSTANCEID; + uint InstanceID: SV_INSTANCEID; #endif // VR }; #ifdef GRASS_LIGHTING struct VS_OUTPUT { - float4 HPosition : SV_POSITION0; - float4 VertexColor : COLOR0; - float VertexMult : COLOR1; - float3 TexCoord : TEXCOORD0; - float3 ViewSpacePosition : + float4 HPosition: SV_POSITION0; + float4 VertexColor: COLOR0; + float VertexMult: COLOR1; + float3 TexCoord: TEXCOORD0; + float3 ViewSpacePosition: # if !defined(VR) TEXCOORD1; # else TEXCOORD2; # endif # if defined(RENDER_DEPTH) - float2 Depth : + float2 Depth: # if !defined(VR) TEXCOORD2; # else TEXCOORD3; # endif # endif // RENDER_DEPTH - float4 WorldPosition : POSITION1; - float4 PreviousWorldPosition : POSITION2; - float4 VertexNormal : POSITION4; + float4 WorldPosition: POSITION1; + float4 PreviousWorldPosition: POSITION2; + float4 VertexNormal: POSITION4; # ifdef VR - float ClipDistance : SV_ClipDistance0; - float CullDistance : SV_CullDistance0; + float ClipDistance: SV_ClipDistance0; + float CullDistance: SV_CullDistance0; # endif // VR }; #else struct VS_OUTPUT { - float4 HPosition : SV_POSITION0; - float4 VertexColor : COLOR0; - float VertexMult : COLOR1; - float3 TexCoord : TEXCOORD0; - float4 AmbientColor : TEXCOORD1; - float3 ViewSpacePosition : TEXCOORD2; + float4 HPosition: SV_POSITION0; + float4 VertexColor: COLOR0; + float VertexMult: COLOR1; + float3 TexCoord: TEXCOORD0; + float4 AmbientColor: TEXCOORD1; + float3 ViewSpacePosition: TEXCOORD2; # if defined(RENDER_DEPTH) - float2 Depth : TEXCOORD3; + float2 Depth: TEXCOORD3; # endif // RENDER_DEPTH - float4 WorldPosition : POSITION1; - float4 PreviousWorldPosition : POSITION2; + float4 WorldPosition: POSITION1; + float4 PreviousWorldPosition: POSITION2; # ifdef VR - float ClipDistance : SV_ClipDistance0; - float CullDistance : SV_CullDistance0; + float ClipDistance: SV_ClipDistance0; + float CullDistance: SV_CullDistance0; # endif // VR }; #endif @@ -347,19 +347,19 @@ typedef VS_OUTPUT PS_INPUT; struct PS_OUTPUT { # if defined(RENDER_DEPTH) - float4 PS : SV_Target0; + float4 PS: SV_Target0; # else - float4 Diffuse : SV_Target0; - float2 MotionVectors : SV_Target1; - float4 NormalGlossiness : SV_Target2; - float4 Albedo : SV_Target3; - float4 Specular : SV_Target4; + float4 Diffuse: SV_Target0; + float2 MotionVectors: SV_Target1; + float4 NormalGlossiness: SV_Target2; + float4 Albedo: SV_Target3; + float4 Specular: SV_Target4; # if defined(TRUE_PBR) - float4 Reflectance : SV_Target5; + float4 Reflectance: SV_Target5; # endif // TRUE_PBR - float4 Masks : SV_Target6; + float4 Masks: SV_Target6; # if defined(TRUE_PBR) - float4 Parameters : SV_Target7; + float4 Parameters: SV_Target7; # endif // TRUE_PBR # endif // RENDER_DEPTH }; @@ -367,13 +367,13 @@ struct PS_OUTPUT struct PS_OUTPUT { # if defined(RENDER_DEPTH) - float4 PS : SV_Target0; + float4 PS: SV_Target0; # else - float4 Diffuse : SV_Target0; - float2 MotionVectors : SV_Target1; - float4 Normal : SV_Target2; - float4 Albedo : SV_Target3; - float4 Masks : SV_Target6; + float4 Diffuse: SV_Target0; + float2 MotionVectors: SV_Target1; + float4 Normal: SV_Target2; + float4 Albedo: SV_Target3; + float4 Masks: SV_Target6; # endif }; #endif diff --git a/package/Shaders/Sky.hlsl b/package/Shaders/Sky.hlsl index 0c76946a87..0a1731841d 100644 --- a/package/Shaders/Sky.hlsl +++ b/package/Shaders/Sky.hlsl @@ -4,48 +4,48 @@ struct VS_INPUT { - float4 Position : POSITION0; + float4 Position: POSITION0; #if defined(TEX) || defined(HORIZFADE) - float2 TexCoord : TEXCOORD0; + float2 TexCoord: TEXCOORD0; #endif - float4 Color : COLOR0; + float4 Color: COLOR0; #if defined(VR) - uint InstanceID : SV_INSTANCEID; + uint InstanceID: SV_INSTANCEID; #endif // VR }; struct VS_OUTPUT { - float4 Position : SV_POSITION0; + float4 Position: SV_POSITION0; #if defined(DITHER) && defined(TEX) - float4 TexCoord0 : TEXCOORD0; + float4 TexCoord0: TEXCOORD0; #elif defined(DITHER) - float2 TexCoord0 : TEXCOORD3; + float2 TexCoord0: TEXCOORD3; #elif defined(TEX) || defined(HORIZFADE) - float2 TexCoord0 : TEXCOORD0; + float2 TexCoord0: TEXCOORD0; #endif #if defined(TEXLERP) - float2 TexCoord1 : TEXCOORD1; + float2 TexCoord1: TEXCOORD1; #endif #if defined(HORIZFADE) - float TexCoord2 : TEXCOORD2; + float TexCoord2: TEXCOORD2; #endif #if defined(TEX) || defined(DITHER) || defined(HORIZFADE) - float4 Color : COLOR0; + float4 Color: COLOR0; #endif - float4 WorldPosition : POSITION1; - float4 PreviousWorldPosition : POSITION2; + float4 WorldPosition: POSITION1; + float4 PreviousWorldPosition: POSITION2; #if defined(VR) - float ClipDistance : SV_ClipDistance0; // o11 - float CullDistance : SV_CullDistance0; // p11 - uint EyeIndex : EYEIDX0; + float ClipDistance: SV_ClipDistance0; // o11 + float CullDistance: SV_CullDistance0; // p11 + uint EyeIndex: EYEIDX0; #endif // VR }; @@ -152,11 +152,11 @@ typedef VS_OUTPUT PS_INPUT; struct PS_OUTPUT { - float4 Color : SV_Target0; - float4 MotionVectors : SV_Target1; - float4 Normal : SV_Target2; + float4 Color: SV_Target0; + float4 MotionVectors: SV_Target1; + float4 Normal: SV_Target2; #if defined(CLOUD_SHADOWS) && defined(CLOUDS) && !defined(DEFERRED) - float4 CloudShadows : SV_Target3; + float4 CloudShadows: SV_Target3; #endif }; diff --git a/package/Shaders/Utility.hlsl b/package/Shaders/Utility.hlsl index 6afc0ef572..f48892d0a7 100644 --- a/package/Shaders/Utility.hlsl +++ b/package/Shaders/Utility.hlsl @@ -12,71 +12,71 @@ struct VS_INPUT { - float4 PositionMS : POSITION0; + float4 PositionMS: POSITION0; #if defined(TEXTURE) - float2 TexCoord : TEXCOORD0; + float2 TexCoord: TEXCOORD0; #endif #if defined(NORMALS) - float4 Normal : NORMAL0; - float4 Bitangent : BINORMAL0; + float4 Normal: NORMAL0; + float4 Bitangent: BINORMAL0; #endif #if defined(VC) - float4 Color : COLOR0; + float4 Color: COLOR0; #endif #if defined(SKINNED) - float4 BoneWeights : BLENDWEIGHT0; - float4 BoneIndices : BLENDINDICES0; + float4 BoneWeights: BLENDWEIGHT0; + float4 BoneIndices: BLENDINDICES0; #endif #if defined(VR) - uint InstanceID : SV_INSTANCEID; + uint InstanceID: SV_INSTANCEID; #endif // VR }; struct VS_OUTPUT { - float4 PositionCS : SV_POSITION0; + float4 PositionCS: SV_POSITION0; #if !(defined(RENDER_DEPTH) && defined(RENDER_SHADOWMASK_ANY)) && SHADOWFILTER != 2 # if (defined(ALPHA_TEST) && ((!defined(RENDER_DEPTH) && !defined(RENDER_SHADOWMAP)) || defined(RENDER_SHADOWMAP_PB))) || defined(RENDER_NORMAL) || defined(DEBUG_SHADOWSPLIT) || defined(RENDER_BASE_TEXTURE) - float4 TexCoord0 : TEXCOORD0; + float4 TexCoord0: TEXCOORD0; # endif # if defined(RENDER_NORMAL) - float4 Normal : TEXCOORD1; + float4 Normal: TEXCOORD1; # endif # if defined(RENDER_SHADOWMAP_PB) - float3 TexCoord1 : TEXCOORD2; + float3 TexCoord1: TEXCOORD2; # elif defined(ALPHA_TEST) && (defined(RENDER_DEPTH) || defined(RENDER_SHADOWMAP)) - float4 TexCoord1 : TEXCOORD2; + float4 TexCoord1: TEXCOORD2; # elif defined(ADDITIONAL_ALPHA_MASK) - float2 TexCoord1 : TEXCOORD2; + float2 TexCoord1: TEXCOORD2; # endif # if defined(LOCALMAP_FOGOFWAR) - float Alpha : TEXCOORD3; + float Alpha: TEXCOORD3; # endif # if defined(RENDER_SHADOWMASK_ANY) - float4 PositionMS : TEXCOORD5; + float4 PositionMS: TEXCOORD5; # endif # if defined(ALPHA_TEST) && defined(VC) && defined(RENDER_SHADOWMASK_ANY) - float2 Alpha : TEXCOORD4; + float2 Alpha: TEXCOORD4; # elif (defined(ALPHA_TEST) && defined(VC) && !defined(TREE_ANIM)) || defined(RENDER_SHADOWMASK_ANY) - float Alpha : TEXCOORD4; + float Alpha: TEXCOORD4; # endif # if defined(DEBUG_SHADOWSPLIT) - float Depth : TEXCOORD2; + float Depth: TEXCOORD2; # endif #endif #if defined(VR) - float ClipDistance : SV_ClipDistance0; // o11 - float CullDistance : SV_CullDistance0; // p11 - uint EyeIndex : EYEIDX0; + float ClipDistance: SV_ClipDistance0; // o11 + float CullDistance: SV_CullDistance0; // p11 + uint EyeIndex: EYEIDX0; #endif // VR }; @@ -288,7 +288,7 @@ typedef VS_OUTPUT PS_INPUT; struct PS_OUTPUT { - float4 Color : SV_Target0; + float4 Color: SV_Target0; }; #ifdef PSHADER diff --git a/package/Shaders/VR/InSceneOverlay.ps.hlsl b/package/Shaders/VR/InSceneOverlay.ps.hlsl index 71e0914ef2..7638542c53 100644 --- a/package/Shaders/VR/InSceneOverlay.ps.hlsl +++ b/package/Shaders/VR/InSceneOverlay.ps.hlsl @@ -6,8 +6,8 @@ SamplerState sampleType : register(s0); struct PS_INPUT { - float4 pos : SV_POSITION; - float2 uv : TEXCOORD0; + float4 pos: SV_POSITION; + float2 uv: TEXCOORD0; }; float4 main(PS_INPUT input) : diff --git a/package/Shaders/VR/InSceneOverlay.vs.hlsl b/package/Shaders/VR/InSceneOverlay.vs.hlsl index ea5cba5d4b..b8d2d09308 100644 --- a/package/Shaders/VR/InSceneOverlay.vs.hlsl +++ b/package/Shaders/VR/InSceneOverlay.vs.hlsl @@ -8,14 +8,14 @@ cbuffer MatrixBuffer : register(b0) struct VS_INPUT { - float3 pos : POSITION; - float2 uv : TEXCOORD0; + float3 pos: POSITION; + float2 uv: TEXCOORD0; }; struct PS_INPUT { - float4 pos : SV_POSITION; - float2 uv : TEXCOORD0; + float4 pos: SV_POSITION; + float2 uv: TEXCOORD0; }; PS_INPUT main(VS_INPUT input) diff --git a/package/Shaders/Water.hlsl b/package/Shaders/Water.hlsl index 06e0902430..6bbe453f75 100644 --- a/package/Shaders/Water.hlsl +++ b/package/Shaders/Water.hlsl @@ -2,12 +2,12 @@ struct VS_INPUT { - float4 Position : POSITION0; + float4 Position: POSITION0; }; struct VS_OUTPUT { - float4 Position : SV_POSITION0; + float4 Position: SV_POSITION0; }; # ifdef VSHADER @@ -27,7 +27,7 @@ typedef VS_OUTPUT PS_INPUT; struct PS_OUTPUT { - float4 Color : SV_Target0; + float4 Color: SV_Target0; }; # ifdef PSHADER @@ -56,73 +56,73 @@ PS_OUTPUT main(PS_INPUT input) struct VS_INPUT { # if defined(SPECULAR) || defined(UNDERWATER) || defined(STENCIL) || defined(SIMPLE) - float4 Position : POSITION0; + float4 Position: POSITION0; # if defined(NORMAL_TEXCOORD) - float2 TexCoord0 : TEXCOORD0; + float2 TexCoord0: TEXCOORD0; # endif # if defined(VC) - float4 Color : COLOR0; + float4 Color: COLOR0; # endif # endif # if defined(LOD) - float4 Position : POSITION0; + float4 Position: POSITION0; # if defined(VC) - float4 Color : COLOR0; + float4 Color: COLOR0; # endif # endif # if defined(VR) - uint InstanceID : SV_INSTANCEID; + uint InstanceID: SV_INSTANCEID; # endif // VR }; struct VS_OUTPUT { # if defined(SPECULAR) || defined(UNDERWATER) - float4 HPosition : SV_POSITION0; + float4 HPosition: SV_POSITION0; # if !defined(UNIFIED_WATER) - float4 FogParam : COLOR0; + float4 FogParam: COLOR0; # endif - float4 WPosition : TEXCOORD0; - float4 TexCoord1 : TEXCOORD1; - float4 TexCoord2 : TEXCOORD2; + float4 WPosition: TEXCOORD0; + float4 TexCoord1: TEXCOORD1; + float4 TexCoord2: TEXCOORD2; # if defined(WADING) || (defined(FLOWMAP) && (defined(REFRACTIONS) || defined(BLEND_NORMALS))) || (defined(VERTEX_ALPHA_DEPTH) && defined(VC)) || ((defined(SPECULAR) && NUM_SPECULAR_LIGHTS == 0) && defined(FLOWMAP) /*!defined(NORMAL_TEXCOORD) && !defined(BLEND_NORMALS) && !defined(VC)*/) - float4 TexCoord3 : TEXCOORD3; + float4 TexCoord3: TEXCOORD3; # endif # if defined(FLOWMAP) - nointerpolation float2 TexCoord4 : TEXCOORD4; + nointerpolation float2 TexCoord4: TEXCOORD4; # endif # if NUM_SPECULAR_LIGHTS == 0 - float4 MPosition : TEXCOORD5; + float4 MPosition: TEXCOORD5; # endif # endif # if defined(SIMPLE) - float4 HPosition : SV_POSITION0; - float4 FogParam : COLOR0; - float4 WPosition : TEXCOORD0; - float4 TexCoord1 : TEXCOORD1; - float4 TexCoord2 : TEXCOORD2; - float4 MPosition : TEXCOORD5; + float4 HPosition: SV_POSITION0; + float4 FogParam: COLOR0; + float4 WPosition: TEXCOORD0; + float4 TexCoord1: TEXCOORD1; + float4 TexCoord2: TEXCOORD2; + float4 MPosition: TEXCOORD5; # endif # if defined(LOD) - float4 HPosition : SV_POSITION0; - float4 FogParam : COLOR0; - float4 WPosition : TEXCOORD0; - float4 TexCoord1 : TEXCOORD1; + float4 HPosition: SV_POSITION0; + float4 FogParam: COLOR0; + float4 WPosition: TEXCOORD0; + float4 TexCoord1: TEXCOORD1; # endif # if defined(STENCIL) - float4 HPosition : SV_POSITION0; - float4 WorldPosition : POSITION1; - float4 PreviousWorldPosition : POSITION2; + float4 HPosition: SV_POSITION0; + float4 WorldPosition: POSITION1; + float4 PreviousWorldPosition: POSITION2; # endif - float4 NormalsScale : TEXCOORD8; + float4 NormalsScale: TEXCOORD8; # if defined(VR) - float ClipDistance : SV_ClipDistance0; // o11 - float CullDistance : SV_CullDistance0; // p11 + float ClipDistance: SV_ClipDistance0; // o11 + float CullDistance: SV_CullDistance0; // p11 # endif // VR }; @@ -312,12 +312,12 @@ typedef VS_OUTPUT PS_INPUT; struct PS_OUTPUT { # if defined(UNDERWATER) || defined(SIMPLE) || defined(LOD) || defined(SPECULAR) - float4 Lighting : SV_Target0; + float4 Lighting: SV_Target0; # endif # if defined(STENCIL) - float4 WaterMask : SV_Target0; - float2 MotionVector : SV_Target1; + float4 WaterMask: SV_Target0; + float2 MotionVector: SV_Target1; # endif };