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
1 change: 1 addition & 0 deletions com.unity.render-pipelines.universal/CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
- Fix for rendering thumbnails. [case 1348209](https://issuetracker.unity3d.com/issues/preview-of-assets-do-not-show-in-the-project-window)
- Fixed a regression bug where XR camera postion can not be modified in beginCameraRendering [case 1365000]
- Fixed an issue in where installing the Adaptive Performance package caused errors to the inspector UI [1368161](https://issuetracker.unity3d.com/issues/urp-package-throws-compilation-error-cs1525-when-imported-together-with-adaptive-performance-package)
- Fixed disabled debug lighting modes on Vulkan and OpenGL following a shader compiler fix. [case 1334240]
- Fixed an issue in where the Convert Renderering Settings would cause a freeze. [case 1353885](https://issuetracker.unity3d.com/issues/urp-builtin-to-urp-render-pipeline-converter-freezes-the-editor-when-converting-rendering-settings)
- Fixed decals to work with native render pass [case 1353141](https://issuetracker.unity3d.com/issues/urp-decals-are-not-visible-in-game-view-after-modifying-urp-asset-properties)
- Fixed decals to work with render scale [1353885](https://issuetracker.unity3d.com/issues/urp-builtin-to-urp-render-pipeline-converter-freezes-the-editor-when-converting-rendering-settings)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -31,61 +31,55 @@ void SetupDebugDataBrdf(inout InputData inputData, half3 brdfDiffuse, half3 brdf

bool UpdateSurfaceAndInputDataForDebug(inout SurfaceData surfaceData, inout InputData inputData)
{
#if SHADER_API_VULKAN || SHADER_API_GLES || SHADER_API_GLES3 || SHADER_API_GLCORE
// Something about this function is problematic for HLSLcc (generates forbidden 'uintBitsToFloat' intrinsics).
// Re-enable when this is fixed.
return false;
#else
bool changed = false;
bool changed = false;

if (_DebugLightingMode == DEBUGLIGHTINGMODE_LIGHTING_WITHOUT_NORMAL_MAPS || _DebugLightingMode == DEBUGLIGHTINGMODE_LIGHTING_WITH_NORMAL_MAPS)
if (_DebugLightingMode == DEBUGLIGHTINGMODE_LIGHTING_WITHOUT_NORMAL_MAPS || _DebugLightingMode == DEBUGLIGHTINGMODE_LIGHTING_WITH_NORMAL_MAPS)
{
surfaceData.albedo = 1;
surfaceData.emission = 0;
surfaceData.specular = 0;
surfaceData.occlusion = 1;
surfaceData.clearCoatMask = 0;
surfaceData.clearCoatSmoothness = 1;
surfaceData.metallic = 0;
surfaceData.smoothness = 0;
changed = true;
}
else if (_DebugLightingMode == DEBUGLIGHTINGMODE_REFLECTIONS || _DebugLightingMode == DEBUGLIGHTINGMODE_REFLECTIONS_WITH_SMOOTHNESS)
{
surfaceData.albedo = 0;
surfaceData.emission = 0;
surfaceData.occlusion = 1;
surfaceData.clearCoatMask = 0;
surfaceData.clearCoatSmoothness = 1;
if (_DebugLightingMode == DEBUGLIGHTINGMODE_REFLECTIONS)
{
surfaceData.albedo = 1;
surfaceData.emission = 0;
surfaceData.specular = 0;
surfaceData.occlusion = 1;
surfaceData.clearCoatMask = 0;
surfaceData.clearCoatSmoothness = 1;
surfaceData.specular = 1;
surfaceData.metallic = 0;
surfaceData.smoothness = 0;
changed = true;
surfaceData.smoothness = 1;
}
else if (_DebugLightingMode == DEBUGLIGHTINGMODE_REFLECTIONS || _DebugLightingMode == DEBUGLIGHTINGMODE_REFLECTIONS_WITH_SMOOTHNESS)
else if (_DebugLightingMode == DEBUGLIGHTINGMODE_REFLECTIONS_WITH_SMOOTHNESS)
{
surfaceData.albedo = 0;
surfaceData.emission = 0;
surfaceData.occlusion = 1;
surfaceData.clearCoatMask = 0;
surfaceData.clearCoatSmoothness = 1;
if (_DebugLightingMode == DEBUGLIGHTINGMODE_REFLECTIONS)
{
surfaceData.specular = 1;
surfaceData.metallic = 0;
surfaceData.smoothness = 1;
}
else if (_DebugLightingMode == DEBUGLIGHTINGMODE_REFLECTIONS_WITH_SMOOTHNESS)
{
surfaceData.specular = 0;
surfaceData.metallic = 1;
surfaceData.smoothness = 0;
}
changed = true;
surfaceData.specular = 0;
surfaceData.metallic = 1;
surfaceData.smoothness = 0;
}
changed = true;
}

if (_DebugLightingMode == DEBUGLIGHTINGMODE_LIGHTING_WITHOUT_NORMAL_MAPS || _DebugLightingMode == DEBUGLIGHTINGMODE_REFLECTIONS)
{
const half3 normalTS = half3(0, 0, 1);
#if defined(_NORMALMAP)
inputData.normalWS = TransformTangentToWorld(normalTS, inputData.tangentToWorld);
#else
inputData.normalWS = inputData.normalWS;
#endif
surfaceData.normalTS = normalTS;
changed = true;
}
if (_DebugLightingMode == DEBUGLIGHTINGMODE_LIGHTING_WITHOUT_NORMAL_MAPS || _DebugLightingMode == DEBUGLIGHTINGMODE_REFLECTIONS)
{
const half3 normalTS = half3(0, 0, 1);
#if defined(_NORMALMAP)
inputData.normalWS = TransformTangentToWorld(normalTS, inputData.tangentToWorld);
#else
inputData.normalWS = inputData.normalWS;
#endif
surfaceData.normalTS = normalTS;
changed = true;
}

return changed;
#endif
return changed;
}

bool CalculateValidationMetallic(half3 albedo, half metallic, inout half4 debugColor)
Expand Down