Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@ Shader "Custom/StencilShowShader"
HLSLINCLUDE

#pragma target 4.5
#pragma only_renderers d3d11 ps4 xboxone vulkan metal switch
#pragma only_renderers d3d11 playstation xboxone vulkan metal switch

//-------------------------------------------------------------------------------------
// Variant
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@ Shader "Custom/StencilWriteShader"
HLSLINCLUDE

#pragma target 4.5
#pragma only_renderers d3d11 ps4 xboxone vulkan metal switch
#pragma only_renderers d3d11 playstation xboxone vulkan metal switch

//-------------------------------------------------------------------------------------
// Variant
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
HLSLINCLUDE

#pragma target 4.5
#pragma only_renderers d3d11 ps4 xboxone vulkan metal switch
#pragma only_renderers d3d11 playstation xboxone vulkan metal switch

#include "Packages/com.unity.render-pipelines.core/ShaderLibrary/Common.hlsl"
#include "Packages/com.unity.render-pipelines.core/ShaderLibrary/Color.hlsl"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
HLSLINCLUDE

#pragma target 4.5
#pragma only_renderers d3d11 ps4 xboxone vulkan metal switch
#pragma only_renderers d3d11 playstation xboxone vulkan metal switch

#include "Packages/com.unity.render-pipelines.core/ShaderLibrary/Common.hlsl"
#include "Packages/com.unity.render-pipelines.core/ShaderLibrary/Color.hlsl"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
HLSLINCLUDE

#pragma target 4.5
#pragma only_renderers d3d11 ps4 xboxone vulkan metal switch
#pragma only_renderers d3d11 playstation xboxone vulkan metal switch

#include "Packages/com.unity.render-pipelines.core/ShaderLibrary/Common.hlsl"
#include "Packages/com.unity.render-pipelines.core/ShaderLibrary/Color.hlsl"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
#pragma vertex Vert

#pragma target 4.5
#pragma only_renderers d3d11 ps4 xboxone vulkan metal switch
#pragma only_renderers d3d11 playstation xboxone vulkan metal switch

#include "Packages/com.unity.render-pipelines.high-definition/Runtime/RenderPipeline/RenderPass/CustomPass/CustomPassCommon.hlsl"

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
#pragma vertex Vert

#pragma target 4.5
#pragma only_renderers d3d11 ps4 xboxone vulkan metal switch
#pragma only_renderers d3d11 playstation xboxone vulkan metal switch

#include "Packages/com.unity.render-pipelines.high-definition/Runtime/RenderPipeline/RenderPass/CustomPass/CustomPassCommon.hlsl"

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
HLSLINCLUDE

#pragma target 4.5
#pragma only_renderers d3d11 ps4 xboxone vulkan metal switch
#pragma only_renderers d3d11 playstation xboxone vulkan metal switch

// #pragma enable_d3d11_debug_symbols

Expand Down
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ Shader "Hidden/HDRP/Sky/ProceduralSky"

#pragma editor_sync_compilation
#pragma target 4.5
#pragma only_renderers d3d11 ps4 xboxone vulkan metal switch
#pragma only_renderers d3d11 playstation xboxone vulkan metal switch

#pragma multi_compile _ _ENABLE_SUN_DISK

Expand Down
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ Shader "Hidden/HDRP/Sky/ProceduralSky"

#pragma editor_sync_compilation
#pragma target 4.5
#pragma only_renderers d3d11 ps4 xboxone vulkan metal switch
#pragma only_renderers d3d11 playstation xboxone vulkan metal switch

#pragma multi_compile _ _ENABLE_SUN_DISK

Expand Down
1 change: 1 addition & 0 deletions Tools/check-shader-includes-exclusions.txt
Original file line number Diff line number Diff line change
@@ -1,2 +1,3 @@
com.unity.render-pipelines.xboxone/ShaderLibrary/API/XBoxOne.hlsl
com.unity.render-pipelines.ps4/ShaderLibrary/API/PSSL.hlsl
com.unity.render-pipelines.ps5/ShaderLibrary/API/PSSL.hlsl
4 changes: 2 additions & 2 deletions com.unity.render-pipelines.core/CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.

## [7.6.0] - 2021-03-25

Version Updated
The version number for this package has increased due to a version update of a related graphics package.
### Added
- Support for the PlayStation 5 platform has been added.

## [7.5.3] - 2021-01-11

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,7 @@ public static bool useTexArray
case GraphicsDeviceType.Direct3D11:
case GraphicsDeviceType.Direct3D12:
case GraphicsDeviceType.PlayStation4:
case GraphicsDeviceType.PlayStation5:
case GraphicsDeviceType.Vulkan:
return true;

Expand Down
4 changes: 3 additions & 1 deletion com.unity.render-pipelines.core/ShaderLibrary/Common.hlsl
Original file line number Diff line number Diff line change
Expand Up @@ -158,8 +158,10 @@
// Include language header
#if defined(SHADER_API_XBOXONE)
#include "Packages/com.unity.render-pipelines.xboxone/ShaderLibrary/API/XBoxOne.hlsl"
#elif defined(SHADER_API_PSSL)
#elif defined(SHADER_API_PS4)
#include "Packages/com.unity.render-pipelines.ps4/ShaderLibrary/API/PSSL.hlsl"
#elif defined(SHADER_API_PS5)
#include "Packages/com.unity.render-pipelines.ps5/ShaderLibrary/API/PSSL.hlsl"
#elif defined(SHADER_API_D3D11)
#include "Packages/com.unity.render-pipelines.core/ShaderLibrary/API/D3D11.hlsl"
#elif defined(SHADER_API_METAL)
Expand Down
11 changes: 11 additions & 0 deletions com.unity.render-pipelines.core/ValidationExceptions.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@

{
"Exceptions":
[
{
"ValidationTest": "API Validation",
"ExceptionError": "Breaking changes require a new major version.",
"PackageVersion": "7.6.0"
}
]
}

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 3 additions & 0 deletions com.unity.render-pipelines.high-definition/CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,9 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.

## [7.6.0] - 2021-03-25

### Added
- Support for the PlayStation 5 platform has been added.

### Fixed
- Fixed light layer issue when performing editing on multiple lights.

Expand Down
Original file line number Diff line number Diff line change
@@ -1,8 +1,9 @@
# Building your Project for consoles

To build a Project for the **PlayStation 4** or **Xbox One**, you need to install an additional package for each platform you want to support. The packages for each platform are:
To build a Project for the **PlayStation 4**, **PlayStation 5** or **Xbox One**, you need to install an additional package for each platform you want to support. The packages for each platform are:

- **PlayStation 4**: com.unity.render-pipelines.ps4
- **PlayStation 5**: com.unity.render-pipelines.ps5
- **Xbox One**: com.unity.render-pipelines.xboxone

## Platform package installation
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -185,7 +185,7 @@ Shader "Hidden/HDRP/Sky/NewSky"

#pragma editor_sync_compilation
#pragma target 4.5
#pragma only_renderers d3d11 ps4 xboxone vulkan metal switch
#pragma only_renderers d3d11 playstation xboxone vulkan metal switch


#include "Packages/com.unity.render-pipelines.core/ShaderLibrary/Common.hlsl"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -466,7 +466,7 @@ Shader "Hidden/Outline"
#pragma vertex Vert

#pragma target 4.5
#pragma only_renderers d3d11 ps4 xboxone vulkan metal switch
#pragma only_renderers d3d11 playstation xboxone vulkan metal switch

#include "Packages/com.unity.render-pipelines.high-definition/Runtime/RenderPipeline/RenderPass/CustomPass/CustomPassCommon.hlsl"

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -123,7 +123,7 @@ Shader "Hidden/Shader/GrayScale"

#pragma target 4.5

#pragma only_renderers d3d11 ps4 xboxone vulkan metal switch
#pragma only_renderers d3d11 playstation xboxone vulkan metal switch

#include "Packages/com.unity.render-pipelines.core/ShaderLibrary/Common.hlsl"

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ Pass
HLSLPROGRAM

#pragma target 4.5
#pragma only_renderers d3d11 ps4 xboxone vulkan metal switch
#pragma only_renderers d3d11 playstation xboxone vulkan metal switch
//#pragma enable_d3d11_debug_symbols

#pragma multi_compile_instancing
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ Shader "Hidden/HDRP/DrawDiffusionProfile"
HLSLPROGRAM
#pragma editor_sync_compilation
#pragma target 4.5
#pragma only_renderers d3d11 ps4 xboxone vulkan metal switch
#pragma only_renderers d3d11 playstation xboxone vulkan metal switch

#pragma vertex Vert
#pragma fragment Frag
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ Shader "Hidden/HDRP/DrawTransmittanceGraph"
HLSLPROGRAM
#pragma editor_sync_compilation
#pragma target 4.5
#pragma only_renderers d3d11 ps4 xboxone vulkan metal switch
#pragma only_renderers d3d11 playstation xboxone vulkan metal switch

#pragma vertex Vert
#pragma fragment Frag
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ Pass
HLSLPROGRAM

#pragma target 4.5
#pragma only_renderers d3d11 ps4 xboxone vulkan metal switch
#pragma only_renderers d3d11 playstation xboxone vulkan metal switch
//#pragma enable_d3d11_debug_symbols

$splice(InstancingOptions)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ class FabricSubShader : IFabricSubShader
ShaderStages = HDSubShaderUtilities.s_ShaderStagesRasterization,
ExtraDefines = new List<string>()
{
"#pragma only_renderers d3d11 ps4 xboxone vulkan metal switch"
"#pragma only_renderers d3d11 playstation xboxone vulkan metal switch"
},
Includes = new List<string>()
{
Expand Down Expand Up @@ -74,7 +74,7 @@ class FabricSubShader : IFabricSubShader
ShaderStages = HDSubShaderUtilities.s_ShaderStagesRasterization,
ExtraDefines = new List<string>()
{
"#pragma only_renderers d3d11 ps4 xboxone vulkan metal switch"
"#pragma only_renderers d3d11 playstation xboxone vulkan metal switch"
},
Includes = new List<string>()
{
Expand Down Expand Up @@ -106,7 +106,7 @@ class FabricSubShader : IFabricSubShader
ShaderStages = HDSubShaderUtilities.s_ShaderStagesRasterization,
ExtraDefines = new List<string>()
{
"#pragma only_renderers d3d11 ps4 xboxone vulkan metal switch",
"#pragma only_renderers d3d11 playstation xboxone vulkan metal switch",
"#define SCENESELECTIONPASS",
"#pragma editor_sync_compilation",
},
Expand Down Expand Up @@ -494,7 +494,7 @@ class FabricSubShader : IFabricSubShader
},
Includes = new List<string>()
{
"#include \"Packages/com.unity.render-pipelines.high-definition/Runtime/RenderPipeline/ShaderPass/ShaderpassRaytracingGBuffer.hlsl\"",
"#include \"Packages/com.unity.render-pipelines.high-definition/Runtime/RenderPipeline/ShaderPass/ShaderPassRaytracingGBuffer.hlsl\"",
},
PixelShaderSlots = new List<int>()
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ Pass
HLSLPROGRAM

#pragma target 4.5
#pragma only_renderers d3d11 ps4 xboxone vulkan metal switch
#pragma only_renderers d3d11 playstation xboxone vulkan metal switch
//#pragma enable_d3d11_debug_symbols

$splice(InstancingOptions)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ internal static string DefineRaytracingKeyword(RayTracingNode.RaytracingVariant
ShaderStages = HDSubShaderUtilities.s_ShaderStagesRasterization,
ExtraDefines = new List<string>()
{
"#pragma only_renderers d3d11 ps4 xboxone vulkan metal switch",
"#pragma only_renderers d3d11 playstation xboxone vulkan metal switch",
"#pragma multi_compile _ DEBUG_DISPLAY",
"#pragma multi_compile _ LIGHTMAP_ON",
"#pragma multi_compile _ DIRLIGHTMAP_COMBINED",
Expand Down Expand Up @@ -114,7 +114,7 @@ internal static string DefineRaytracingKeyword(RayTracingNode.RaytracingVariant
ShaderStages = HDSubShaderUtilities.s_ShaderStagesRasterization,
ExtraDefines = new List<string>()
{
"#pragma only_renderers d3d11 ps4 xboxone vulkan metal switch",
"#pragma only_renderers d3d11 playstation xboxone vulkan metal switch",
DefineRaytracingKeyword(RayTracingNode.RaytracingVariant.High),
},
RequiredFields = new List<string>()
Expand Down Expand Up @@ -174,7 +174,7 @@ internal static string DefineRaytracingKeyword(RayTracingNode.RaytracingVariant
ShaderStages = HDSubShaderUtilities.s_ShaderStagesRasterization,
ExtraDefines = new List<string>()
{
"#pragma only_renderers d3d11 ps4 xboxone vulkan metal switch",
"#pragma only_renderers d3d11 playstation xboxone vulkan metal switch",
DefineRaytracingKeyword(RayTracingNode.RaytracingVariant.High),
},
Includes = new List<string>()
Expand Down Expand Up @@ -208,7 +208,7 @@ internal static string DefineRaytracingKeyword(RayTracingNode.RaytracingVariant
ShaderStages = HDSubShaderUtilities.s_ShaderStagesRasterization,
ExtraDefines = new List<string>()
{
"#pragma only_renderers d3d11 ps4 xboxone vulkan metal switch",
"#pragma only_renderers d3d11 playstation xboxone vulkan metal switch",
"#define SCENESELECTIONPASS",
"#pragma editor_sync_compilation",
DefineRaytracingKeyword(RayTracingNode.RaytracingVariant.High),
Expand Down Expand Up @@ -357,7 +357,7 @@ internal static string DefineRaytracingKeyword(RayTracingNode.RaytracingVariant
ShaderStages = HDSubShaderUtilities.s_ShaderStagesRasterization,
ExtraDefines = new List<string>()
{
"#pragma only_renderers d3d11 ps4 xboxone vulkan metal switch",
"#pragma only_renderers d3d11 playstation xboxone vulkan metal switch",
DefineRaytracingKeyword(RayTracingNode.RaytracingVariant.High),
},
Includes = new List<string>()
Expand Down Expand Up @@ -424,7 +424,7 @@ internal static string DefineRaytracingKeyword(RayTracingNode.RaytracingVariant
ShaderStages = HDSubShaderUtilities.s_ShaderStagesRasterization,
ExtraDefines = new List<string>()
{
"#pragma only_renderers d3d11 ps4 xboxone vulkan metal switch",
"#pragma only_renderers d3d11 playstation xboxone vulkan metal switch",
"#define CUTOFF_TRANSPARENT_DEPTH_PREPASS",
DefineRaytracingKeyword(RayTracingNode.RaytracingVariant.High),
},
Expand Down Expand Up @@ -530,7 +530,7 @@ internal static string DefineRaytracingKeyword(RayTracingNode.RaytracingVariant
ShaderStages = HDSubShaderUtilities.s_ShaderStagesRasterization,
ExtraDefines = new List<string>()
{
"#pragma only_renderers d3d11 ps4 xboxone vulkan metal switch",
"#pragma only_renderers d3d11 playstation xboxone vulkan metal switch",
DefineRaytracingKeyword(RayTracingNode.RaytracingVariant.High),
},
RequiredFields = new List<string>()
Expand Down Expand Up @@ -611,7 +611,7 @@ internal static string DefineRaytracingKeyword(RayTracingNode.RaytracingVariant
ShaderStages = HDSubShaderUtilities.s_ShaderStagesRasterization,
ExtraDefines = new List<string>()
{
"#pragma only_renderers d3d11 ps4 xboxone vulkan metal switch",
"#pragma only_renderers d3d11 playstation xboxone vulkan metal switch",
"#define CUTOFF_TRANSPARENT_DEPTH_POSTPASS",
DefineRaytracingKeyword(RayTracingNode.RaytracingVariant.High),
},
Expand Down Expand Up @@ -822,7 +822,7 @@ internal static string DefineRaytracingKeyword(RayTracingNode.RaytracingVariant
},
Includes = new List<string>()
{
"#include \"Packages/com.unity.render-pipelines.high-definition/Runtime/RenderPipeline/ShaderPass/ShaderpassRaytracingGBuffer.hlsl\"",
"#include \"Packages/com.unity.render-pipelines.high-definition/Runtime/RenderPipeline/ShaderPass/ShaderPassRaytracingGBuffer.hlsl\"",
},
PixelShaderSlots = new List<int>()
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ Pass
HLSLPROGRAM

#pragma target 4.5
#pragma only_renderers d3d11 ps4 xboxone vulkan metal switch
#pragma only_renderers d3d11 playstation xboxone vulkan metal switch
//#pragma enable_d3d11_debug_symbols

$splice(InstancingOptions)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ Pass
HLSLPROGRAM

#pragma target 4.5
#pragma only_renderers d3d11 ps4 xboxone vulkan metal switch
#pragma only_renderers d3d11 playstation xboxone vulkan metal switch
//#pragma enable_d3d11_debug_symbols

$splice(InstancingOptions)
Expand Down
Loading