Skip to content

Commit

Permalink
com.unity.render-pipelines.core@7.7.0
Browse files Browse the repository at this point in the history
## [7.7.0] - 2021-04-28

### Added
- Support for the XboxSeries platform has been added.
  • Loading branch information
Unity Technologies committed Apr 28, 2021
1 parent 74ae897 commit 984d5a1
Show file tree
Hide file tree
Showing 19 changed files with 124 additions and 11 deletions.
5 changes: 5 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,11 @@ All notable changes to this package will be documented in this file.
The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/)
and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html).

## [7.7.0] - 2021-04-28

### Added
- Support for the XboxSeries platform has been added.

## [7.6.0] - 2021-03-25

### Added
Expand Down
4 changes: 2 additions & 2 deletions Runtime/Documentation.cs
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ public class DocumentationInfo
/// </summary>
///
[Obsolete("Can not be used anymore, use Documentation.releaseVersion", false)]
public const string version = "7.6";
public const string version = "7.7";
}

//Need to live in Runtime as Attribute of documentation is on Runtime classes \o/
Expand All @@ -35,7 +35,7 @@ class Documentation : DocumentationInfo
internal const string endURL = ".html";


internal const string releaseVersion = "7.6";
internal const string releaseVersion = "7.7";

//Temporary for now, there is several part of the Core documentation that are misplaced in HDRP documentation.
//use this base url for them:
Expand Down
8 changes: 8 additions & 0 deletions ShaderLibrary/ACES.hlsl
Original file line number Diff line number Diff line change
@@ -1,6 +1,10 @@
#ifndef __ACES__
#define __ACES__

#if SHADER_API_MOBILE || SHADER_API_GLES || SHADER_API_GLES3
#pragma warning (disable : 3205) // conversion of larger type to smaller
#endif

/**
* https://github.com/ampas/aces-dev
*
Expand Down Expand Up @@ -1312,4 +1316,8 @@ half3 ODT_P3DCI_48nits(half3 oces)
return outputCV;
}

#if SHADER_API_MOBILE || SHADER_API_GLES || SHADER_API_GLES3
#pragma warning (enable : 3205) // conversion of larger type to smaller
#endif

#endif // __ACES__
9 changes: 9 additions & 0 deletions ShaderLibrary/BSDF.hlsl
Original file line number Diff line number Diff line change
@@ -1,6 +1,10 @@
#ifndef UNITY_BSDF_INCLUDED
#define UNITY_BSDF_INCLUDED

#if SHADER_API_MOBILE || SHADER_API_GLES || SHADER_API_GLES3
#pragma warning (disable : 3205) // conversion of larger type to smaller
#endif

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

// Note: All NDF and diffuse term have a version with and without divide by PI.
Expand Down Expand Up @@ -635,4 +639,9 @@ real3 D_KajiyaKay(real3 T, real3 H, real specularExponent)

return dirAttn * norm * PositivePow(sinTHSq, 0.5 * n);
}

#if SHADER_API_MOBILE || SHADER_API_GLES || SHADER_API_GLES3
#pragma warning (enable : 3205) // conversion of larger type to smaller
#endif

#endif // UNITY_BSDF_INCLUDED
8 changes: 8 additions & 0 deletions ShaderLibrary/Color.hlsl
Original file line number Diff line number Diff line change
@@ -1,6 +1,10 @@
#ifndef UNITY_COLOR_INCLUDED
#define UNITY_COLOR_INCLUDED

#if SHADER_API_MOBILE || SHADER_API_GLES || SHADER_API_GLES3
#pragma warning (disable : 3205) // conversion of larger type to smaller
#endif

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

//-----------------------------------------------------------------------------
Expand Down Expand Up @@ -722,4 +726,8 @@ half3 DecodeRGBM(half4 rgbm)
return rgbm.xyz * rgbm.w * kRGBMRange;
}

#if SHADER_API_MOBILE || SHADER_API_GLES || SHADER_API_GLES3
#pragma warning (enable : 3205) // conversion of larger type to smaller
#endif

#endif // UNITY_COLOR_INCLUDED
14 changes: 12 additions & 2 deletions ShaderLibrary/Common.hlsl
Original file line number Diff line number Diff line change
@@ -1,6 +1,10 @@
#ifndef UNITY_COMMON_INCLUDED
#define UNITY_COMMON_INCLUDED

#if SHADER_API_MOBILE || SHADER_API_GLES || SHADER_API_GLES3
#pragma warning (disable : 3205) // conversion of larger type to smaller
#endif

// Convention:

// Unity is Y up and left handed in world space
Expand Down Expand Up @@ -156,7 +160,9 @@
#endif

// Include language header
#if defined(SHADER_API_XBOXONE)
#if defined (SHADER_API_GAMECORE)
#include "Packages/com.unity.render-pipelines.gamecore/ShaderLibrary/API/GameCore.hlsl"
#elif defined(SHADER_API_XBOXONE)
#include "Packages/com.unity.render-pipelines.xboxone/ShaderLibrary/API/XBoxOne.hlsl"
#elif defined(SHADER_API_PS4)
#include "Packages/com.unity.render-pipelines.ps4/ShaderLibrary/API/PSSL.hlsl"
Expand Down Expand Up @@ -1167,11 +1173,15 @@ void LODDitheringTransition(uint2 fadeMaskSeed, float ditherFactor)
// while on other APIs is in the red channel. Note that on some platform, always using the green channel might work, but is not guaranteed.
uint GetStencilValue(uint2 stencilBufferVal)
{
#if defined(SHADER_API_D3D11) || defined(SHADER_API_XBOXONE)
#if defined(SHADER_API_D3D11) || defined(SHADER_API_XBOXONE) || defined(SHADER_API_GAMECORE)
return stencilBufferVal.y;
#else
return stencilBufferVal.x;
#endif
}

#if SHADER_API_MOBILE || SHADER_API_GLES || SHADER_API_GLES3
#pragma warning (enable : 3205) // conversion of larger type to smaller
#endif

#endif // UNITY_COMMON_INCLUDED
8 changes: 8 additions & 0 deletions ShaderLibrary/CommonLighting.hlsl
Original file line number Diff line number Diff line change
@@ -1,6 +1,10 @@
#ifndef UNITY_COMMON_LIGHTING_INCLUDED
#define UNITY_COMMON_LIGHTING_INCLUDED

#if SHADER_API_MOBILE || SHADER_API_GLES || SHADER_API_GLES3
#pragma warning (disable : 3205) // conversion of larger type to smaller
#endif

// These clamping function to max of floating point 16 bit are use to prevent INF in code in case of extreme value
TEMPLATE_1_REAL(ClampToFloat16Max, value, return min(value, HALF_MAX))

Expand Down Expand Up @@ -458,4 +462,8 @@ bool IsMatchingLightLayer(uint lightLayers, uint renderingLayers)
return (lightLayers & renderingLayers) != 0;
}

#if SHADER_API_MOBILE || SHADER_API_GLES || SHADER_API_GLES3
#pragma warning (enable : 3205) // conversion of larger type to smaller
#endif

#endif // UNITY_COMMON_LIGHTING_INCLUDED
8 changes: 8 additions & 0 deletions ShaderLibrary/CommonMaterial.hlsl
Original file line number Diff line number Diff line change
@@ -1,6 +1,10 @@
#ifndef UNITY_COMMON_MATERIAL_INCLUDED
#define UNITY_COMMON_MATERIAL_INCLUDED

#if SHADER_API_MOBILE || SHADER_API_GLES || SHADER_API_GLES3
#pragma warning (disable : 3205) // conversion of larger type to smaller
#endif

//-----------------------------------------------------------------------------
// Define constants
//-----------------------------------------------------------------------------
Expand Down Expand Up @@ -330,4 +334,8 @@ real3 LerpWhiteTo(real3 b, real t)
return real3(oneMinusT, oneMinusT, oneMinusT) + b * t;
}

#if SHADER_API_MOBILE || SHADER_API_GLES || SHADER_API_GLES3
#pragma warning (enable : 3205) // conversion of larger type to smaller
#endif

#endif // UNITY_COMMON_MATERIAL_INCLUDED
8 changes: 8 additions & 0 deletions ShaderLibrary/EntityLighting.hlsl
Original file line number Diff line number Diff line change
@@ -1,6 +1,10 @@
#ifndef UNITY_ENTITY_LIGHTING_INCLUDED
#define UNITY_ENTITY_LIGHTING_INCLUDED

#if SHADER_API_MOBILE || SHADER_API_GLES || SHADER_API_GLES3
#pragma warning (disable : 3205) // conversion of larger type to smaller
#endif

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

#define LIGHTMAP_RGBM_MAX_GAMMA real(5.0) // NB: Must match value in RGBMRanges.h
Expand Down Expand Up @@ -280,4 +284,8 @@ real3 SampleDirectionalLightmap(TEXTURE2D_PARAM(lightmapTex, lightmapSampler), T
return illuminance * halfLambert / max(1e-4, direction.w);
}

#if SHADER_API_MOBILE || SHADER_API_GLES || SHADER_API_GLES3
#pragma warning (enable : 3205) // conversion of larger type to smaller
#endif

#endif // UNITY_ENTITY_LIGHTING_INCLUDED
8 changes: 8 additions & 0 deletions ShaderLibrary/ImageBasedLighting.hlsl
Original file line number Diff line number Diff line change
@@ -1,6 +1,10 @@
#ifndef UNITY_IMAGE_BASED_LIGHTING_INCLUDED
#define UNITY_IMAGE_BASED_LIGHTING_INCLUDED

#if SHADER_API_MOBILE || SHADER_API_GLES || SHADER_API_GLES3
#pragma warning (disable : 3205) // conversion of larger type to smaller
#endif

#include "Packages/com.unity.render-pipelines.core/ShaderLibrary/CommonLighting.hlsl"
#include "Packages/com.unity.render-pipelines.core/ShaderLibrary/CommonMaterial.hlsl"
#include "Packages/com.unity.render-pipelines.core/ShaderLibrary/BSDF.hlsl"
Expand Down Expand Up @@ -761,4 +765,8 @@ float InfluenceFadeNormalWeight(float3 normal, float3 centerToPos)
return saturate((-1.0f / 0.4f) * dot(normal, centerToPos) + (0.6f / 0.4f));
}

#if SHADER_API_MOBILE || SHADER_API_GLES || SHADER_API_GLES3
#pragma warning (enable : 3205) // conversion of larger type to smaller
#endif

#endif // UNITY_IMAGE_BASED_LIGHTING_INCLUDED
8 changes: 8 additions & 0 deletions ShaderLibrary/Packing.hlsl
Original file line number Diff line number Diff line change
@@ -1,6 +1,10 @@
#ifndef UNITY_PACKING_INCLUDED
#define UNITY_PACKING_INCLUDED

#if SHADER_API_MOBILE || SHADER_API_GLES || SHADER_API_GLES3
#pragma warning (disable : 3205) // conversion of larger type to smaller
#endif

//-----------------------------------------------------------------------------
// Normal packing
//-----------------------------------------------------------------------------
Expand Down Expand Up @@ -545,4 +549,8 @@ float2 Unpack888ToFloat2(float3 x)
}
#endif // SHADER_API_GLES

#if SHADER_API_MOBILE || SHADER_API_GLES || SHADER_API_GLES3
#pragma warning (enable : 3205) // conversion of larger type to smaller
#endif

#endif // UNITY_PACKING_INCLUDED
8 changes: 8 additions & 0 deletions ShaderLibrary/Sampling/Fibonacci.hlsl
Original file line number Diff line number Diff line change
@@ -1,6 +1,10 @@
#ifndef UNITY_FIBONACCI_INCLUDED
#define UNITY_FIBONACCI_INCLUDED

#if SHADER_API_MOBILE || SHADER_API_GLES || SHADER_API_GLES3
#pragma warning (disable : 3205) // conversion of larger type to smaller
#endif

// Computes a point using the Fibonacci sequence of length N.
// Input: Fib[N - 1], Fib[N - 2], and the index 'i' of the point.
// Ref: Efficient Quadrature Rules for Illumination Integrals
Expand Down Expand Up @@ -289,4 +293,8 @@ real2 SampleSphereFibonacci(uint i, uint sampleCount)
return real2(1 - 2 * f.x, TWO_PI * f.y);
}

#if SHADER_API_MOBILE || SHADER_API_GLES || SHADER_API_GLES3
#pragma warning (enable : 3205) // conversion of larger type to smaller
#endif

#endif // UNITY_FIBONACCI_INCLUDED
8 changes: 8 additions & 0 deletions ShaderLibrary/Sampling/Hammersley.hlsl
Original file line number Diff line number Diff line change
@@ -1,6 +1,10 @@
#ifndef UNITY_HAMMERSLEY_INCLUDED
#define UNITY_HAMMERSLEY_INCLUDED

#if SHADER_API_MOBILE || SHADER_API_GLES || SHADER_API_GLES3
#pragma warning (disable : 3205) // conversion of larger type to smaller
#endif

// Ref: http://holger.dammertz.org/stuff/notes_HammersleyOnHemisphere.html
uint ReverseBits32(uint bits)
{
Expand Down Expand Up @@ -420,4 +424,8 @@ real2 Hammersley2d(uint i, uint sampleCount)
}
}

#if SHADER_API_MOBILE || SHADER_API_GLES || SHADER_API_GLES3
#pragma warning (enable : 3205) // conversion of larger type to smaller
#endif

#endif // UNITY_HAMMERSLEY_INCLUDED
8 changes: 8 additions & 0 deletions ShaderLibrary/Sampling/Sampling.hlsl
Original file line number Diff line number Diff line change
@@ -1,6 +1,10 @@
#ifndef UNITY_SAMPLING_INCLUDED
#define UNITY_SAMPLING_INCLUDED

#if SHADER_API_MOBILE || SHADER_API_GLES || SHADER_API_GLES3
#pragma warning (disable : 3205) // conversion of larger type to smaller
#endif

//-----------------------------------------------------------------------------
// Sample generator
//-----------------------------------------------------------------------------
Expand Down Expand Up @@ -290,4 +294,8 @@ void SampleCone(real2 u, real cosHalfAngle,
rcpPdf = TWO_PI * (1 - cosHalfAngle);
}

#if SHADER_API_MOBILE || SHADER_API_GLES || SHADER_API_GLES3
#pragma warning (enable : 3205) // conversion of larger type to smaller
#endif

#endif // UNITY_SAMPLING_INCLUDED
8 changes: 8 additions & 0 deletions ShaderLibrary/SpaceTransforms.hlsl
Original file line number Diff line number Diff line change
@@ -1,6 +1,10 @@
#ifndef UNITY_SPACE_TRANSFORMS_INCLUDED
#define UNITY_SPACE_TRANSFORMS_INCLUDED

#if SHADER_API_MOBILE || SHADER_API_GLES || SHADER_API_GLES3
#pragma warning (disable : 3205) // conversion of larger type to smaller
#endif

// Return the PreTranslated ObjectToWorld Matrix (i.e matrix with _WorldSpaceCameraPos apply to it if we use camera relative rendering)
float4x4 GetObjectToWorldMatrix()
{
Expand Down Expand Up @@ -218,4 +222,8 @@ real3 TransformObjectToTangent(real3 dirOS, real3x3 tangentToWorld)
return TransformWorldToTangent(normalWS, tangentToWorld);
}

#if SHADER_API_MOBILE || SHADER_API_GLES || SHADER_API_GLES3
#pragma warning (enable : 3205) // conversion of larger type to smaller
#endif

#endif
2 changes: 1 addition & 1 deletion ShaderLibrary/UnityInstancing.hlsl
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#ifndef UNITY_INSTANCING_INCLUDED
#define UNITY_INSTANCING_INCLUDED

#if SHADER_TARGET >= 35 && (defined(SHADER_API_D3D11) || defined(SHADER_API_GLES3) || defined(SHADER_API_GLCORE) || defined(SHADER_API_XBOXONE) || defined(SHADER_API_PSSL) || defined(SHADER_API_VULKAN) || defined(SHADER_API_METAL))
#if SHADER_TARGET >= 35 && (defined(SHADER_API_D3D11) || defined(SHADER_API_GLES3) || defined(SHADER_API_GLCORE) || defined(SHADER_API_XBOXONE) || defined(SHADER_API_GAMECORE) || defined(SHADER_API_PSSL) || defined(SHADER_API_VULKAN) || defined(SHADER_API_METAL))
#define UNITY_SUPPORT_INSTANCING
#endif

Expand Down
2 changes: 1 addition & 1 deletion ShaderLibrary/Version.hlsl
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#define SHADER_LIBRARY_VERSION_MAJOR 7
#define SHADER_LIBRARY_VERSION_MINOR 6
#define SHADER_LIBRARY_VERSION_MINOR 7

#define VERSION_GREATER_EQUAL(major, minor) ((SHADER_LIBRARY_VERSION_MAJOR > major) || ((SHADER_LIBRARY_VERSION_MAJOR == major) && (SHADER_LIBRARY_VERSION_MINOR >= minor)))
#define VERSION_LOWER(major, minor) ((SHADER_LIBRARY_VERSION_MAJOR < major) || ((SHADER_LIBRARY_VERSION_MAJOR == major) && (SHADER_LIBRARY_VERSION_MINOR < minor)))
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,5 +16,6 @@
"defineConstraints": [
"UNITY_INCLUDE_TESTS"
],
"versionDefines": []
"versionDefines": [],
"noEngineReferences": false
}
8 changes: 4 additions & 4 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,20 +1,20 @@
{
"name": "com.unity.render-pipelines.core",
"description": "SRP Core makes it easier to create or customize a Scriptable Render Pipeline (SRP). SRP Core contains reusable code, including boilerplate code for working with platform-specific graphics APIs, utility functions for common rendering operations, and shader libraries. The code in SRP Core is use by the High Definition Render Pipeline (HDRP) and Universal Render Pipeline (URP). If you are creating a custom SRP from scratch or customizing a prebuilt SRP, using SRP Core will save you time.",
"version": "7.6.0",
"version": "7.7.0",
"unity": "2019.4",
"unityRelease": "23f1",
"unityRelease": "28f1",
"displayName": "Core RP Library",
"dependencies": {
"com.unity.ugui": "1.0.0",
"com.unity.modules.physics": "1.0.0"
},
"upmCi": {
"footprint": "ead9a96e90e328ac99ad3f6e128368efc06fff57"
"footprint": "e4a66d01ba62de4db64e7a67c4e2eccf7ec7db94"
},
"repository": {
"url": "https://github.com/Unity-Technologies/Graphics.git",
"type": "git",
"revision": "b9e8ac45ef83cffce6a345c8b09ec7575fd0b713"
"revision": "4d52767af63b7baf9b146384ac726073b6b93edd"
}
}

0 comments on commit 984d5a1

Please sign in to comment.