Skip to content

Commit 51242a1

Browse files
author
Liis Kivistik
committed
Squash merge from master
1 parent 1534619 commit 51242a1

File tree

2,276 files changed

+173891
-72277
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

2,276 files changed

+173891
-72277
lines changed

.github/CODEOWNERS

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
/com.unity.render-pipelines.universal/Editor/ShaderGraph/MasterNodes @Unity-Technologies/2d-graphics
1111

1212
# Shader Graph
13-
/com.unity.shadergraph/ @Unity-Technologies/shader-graph @Unity-Technologies/gfx-qa-bellevue
13+
/com.unity.shadergraph/ @Unity-Technologies/shader-graph
1414

1515
# Test systems
1616
/.yamato/ @Unity-Technologies/gfx-sdets

.github/PULL_REQUEST_TEMPLATE.md

Lines changed: 14 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -1,42 +1,21 @@
1-
### **Please read**
2-
**PR workflow guidelines**
3-
* SRP ABV will start automatically on Yamato when you open your PR
4-
* Changes to docs and md files will **not** trigger ABV jobs
5-
* Consider making use of **draft PRs** if you are not 100% sure that your PR is ready for review
6-
* ABV will restart if you add a new commit to a branch with an open PR (hence why you should consider using draft PRs)
7-
* Adding [skip ci] (case insensitive) to the title of PRs will stop any jobs being trigger automatically - you will need to open Yamato and find your branch to run ABV
8-
* You can also add [skip ci] to commit messages to prevent CI from running on that push
9-
* Add [cancel old ci] to your commit message if you've made changes you want to test and no longer need the previous jobs
1+
**Guide** : https://github.com/Unity-Technologies/Graphics/blob/master/.github/pr-read.png.md
102

11-
### Checklist for PR maker
12-
- [ ] Have you added a backport label (if needed)? For example, the `need-backport-*` label. After you backport the PR, the label changes to `backported-*`.
13-
- [ ] Have you updated the changelog? Each package has a `CHANGELOG.md` file.
14-
- [ ] Have you updated or added the documentation for your PR? When you add a new feature, change a property name, or change the behavior of a feature, it's best practice to include related documentation changes in the same PR.
15-
- [ ] Have you added a graphic test for your PR (if needed)? When you add a new feature, or discover a bug that tests don't cover, please add a graphic test.
3+
**Display Addon** : https://userstyles.org/styles/182991/unity-graphics-pr-readme
164

17-
---
18-
### Purpose of this PR
19-
Why is this PR needed, what hard problem is it solving/fixing?
5+
# Purpose of this PR
206

21-
---
22-
### Testing status
7+
> Why is this PR needed, what hard problem is it solving/fixing?
238
24-
**Manual Tests**: What did you do?
25-
- [ ] Opened test project + Run graphic tests locally
26-
- [ ] Built a player
27-
- [ ] Checked new UI names with UX convention
28-
- [ ] Tested UI multi-edition + Undo/Redo + Prefab overrides + Alignment in Preset
29-
- [ ] C# and shader warnings (supress shader cache to see them)
30-
- [ ] Checked new resources path for the reloader (in developer mode, you have a button at end of resources that check the paths)
31-
- Other:
9+
# Testing status
10+
## Manual Tests
11+
> What have you tested?
3212
33-
**Automated Tests**: What did you setup? (Add a screenshot or the reference image of the test please)
13+
## Automated Tests
14+
> What did you setup? (Add a screenshot or the reference image of the test please)
3415
35-
**Yamato**: (Select your branch):
36-
https://yamato.prd.cds.internal.unity3d.com/jobs/902-Graphics
16+
## Links
17+
**Yamato**: (Select your branch) https://yamato.prd.cds.internal.unity3d.com/jobs/902-Graphics
18+
> Any test projects or documents to go with this to help reviewers?
3719
38-
Any test projects to go with this to help reviewers?
39-
40-
---
41-
### Comments to reviewers
42-
Notes for the reviewers you have assigned.
20+
# Comments to reviewers
21+
> Notes for the reviewers you have assigned.

.github/pr-read-override.css

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
.pull-discussion-timeline>div:first-child>div:first-child .js-previewable-comment-form::before, .new-pr-form .js-previewable-comment-form::before
2+
{
3+
display:block;
4+
content: url("https://github.com/Unity-Technologies/Graphics/blob/master/.github/pr-read.png?raw=true");
5+
height: auto;
6+
}

.github/pr-read.png

Lines changed: 3 additions & 0 deletions
Loading

.github/pr-read.png.css

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,26 @@
1+
@import "github.css";
2+
3+
#write{
4+
max-width: none;
5+
width: 709px;
6+
margin: 0 auto;
7+
padding: 5px;
8+
border: 20px solid #bda668;
9+
min-height: auto !important;
10+
}
11+
#write > ul:first-child,
12+
#write > ol:first-child{
13+
margin-top: 0px;
14+
}
15+
16+
body > *:first-child {
17+
margin-top: 0 !important;
18+
}
19+
body > *:last-child {
20+
margin-bottom: 0 !important;
21+
}
22+
23+
h1, h2, h3, h4, h5, h6
24+
{
25+
width: auto !important;
26+
}

.github/pr-read.png.md

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
# Please read
2+
## PR workflow guidelines
3+
- Consider making use of **draft PRs** if you are not 100% sure that your PR is ready for review
4+
- Adding [skip ci] (case insensitive) to the title of PRs will stop any jobs being triggered automatically - you will need to open Yamato and find your branch to run ABV
5+
- You can also add [skip ci] to commit messages to prevent CI from running on that push
6+
- Add [cancel old ci] to your commit message if you've made changes you want to test and no longer need the previous jobs
7+
8+
## Reminders
9+
- Have you added a backport label (if needed)?
10+
11+
> *For example, the `need-backport-*` label. After you backport the PR, the label changes to `backported-*`.*
12+
- Have you updated the changelog?
13+
14+
> *Each package has a `CHANGELOG.md` file.*
15+
- Have you updated or added the documentation for your PR?
16+
17+
> *When you add a new feature, change a property name, or change the behavior of a feature, it's best practice to include related documentation changes in the same PR.*
18+
- Have you added a graphic test for your PR (if needed)?
19+
20+
> *When you add a new feature, or discover a bug that tests don't cover, please add a graphic test.*

TestProjects/HDRP_DXR_Tests/Assets/Common/HDRenderPipelineAssetDeferred.asset

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -159,7 +159,7 @@ MonoBehaviour:
159159
m_RenderingPathDefaultCameraFrameSettings:
160160
bitDatas:
161161
data1: 136268574097245
162-
data2: 4539628425396027392
162+
data2: 4539628428617252864
163163
lodBias: 1
164164
lodBiasMode: 0
165165
lodBiasQualityLevel: 0
@@ -201,15 +201,15 @@ MonoBehaviour:
201201
m_RenderPipelineSettings:
202202
supportShadowMask: 1
203203
supportSSR: 1
204-
supportSSRTransparent: 0
204+
supportSSRTransparent: 1
205205
supportSSAO: 1
206+
supportSSGI: 1
206207
supportSubsurfaceScattering: 1
207208
sssSampleBudget:
208209
m_Values: 140000002800000050000000
209210
m_SchemaId:
210211
m_Id: With3Levels
211212
supportVolumetrics: 1
212-
increaseResolutionOfVolumetrics: 0
213213
supportLightLayers: 0
214214
lightLayerName0: Light Layer default
215215
lightLayerName1: Light Layer 1
@@ -235,6 +235,7 @@ MonoBehaviour:
235235
supportTerrainHole: 0
236236
supportProbeVolume: 0
237237
supportRayTracing: 1
238+
supportedRayTracingMode: 3
238239
probeVolumeSettings:
239240
atlasWidth: 128
240241
atlasHeight: 128
@@ -248,9 +249,9 @@ MonoBehaviour:
248249
cubeCookieTexArraySize: 16
249250
cookieAtlasLastValidMip: 0
250251
cookieTexArraySize: 16
251-
planarReflectionAtlasSize: 8192
252+
planarReflectionAtlasSize: 1024
252253
reflectionProbeCacheSize: 64
253-
reflectionCubemapSize: 256
254+
reflectionCubemapSize: 128
254255
reflectionCacheCompressed: 0
255256
planarReflectionCacheCompressed: 0
256257
skyReflectionSize: 256
@@ -261,7 +262,7 @@ MonoBehaviour:
261262
maxDirectionalLightsOnScreen: 16
262263
maxPunctualLightsOnScreen: 512
263264
maxAreaLightsOnScreen: 64
264-
maxEnvLightsOnScreen: 64
265+
maxEnvLightsOnScreen: 32
265266
maxDecalsOnScreen: 512
266267
maxPlanarReflectionOnScreen: 16
267268
hdShadowInitParams:

TestProjects/HDRP_DXR_Tests/Assets/Common/HDRenderPipelineAssetForward.asset

Lines changed: 43 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ MonoBehaviour:
1212
m_Script: {fileID: 11500000, guid: 0cf1dab834d4ec34195b920ea7bbf9ec, type: 3}
1313
m_Name: HDRenderPipelineAssetForward
1414
m_EditorClassIdentifier:
15-
m_Version: 14
15+
m_Version: 15
1616
m_ObsoleteFrameSettings:
1717
overrides: 0
1818
enableShadow: 0
@@ -157,45 +157,58 @@ MonoBehaviour:
157157
m_DefaultLookDevProfile: {fileID: 0}
158158
m_RenderingPathDefaultCameraFrameSettings:
159159
bitDatas:
160-
data1: 65899829919581
160+
data1: 136268574097245
161161
data2: 4539628425396027392
162162
lodBias: 1
163163
lodBiasMode: 0
164164
lodBiasQualityLevel: 0
165165
maximumLODLevel: 0
166166
maximumLODLevelMode: 0
167167
maximumLODLevelQualityLevel: 0
168+
sssQualityMode: 0
169+
sssQualityLevel: 0
170+
sssCustomSampleBudget: 20
168171
materialQuality: 0
169172
m_RenderingPathDefaultBakedOrCustomReflectionFrameSettings:
170173
bitDatas:
171-
data1: 69344385302301
174+
data1: 139713129479965
172175
data2: 4539628424389459968
173176
lodBias: 1
174177
lodBiasMode: 0
175178
lodBiasQualityLevel: 0
176179
maximumLODLevel: 0
177180
maximumLODLevelMode: 0
178181
maximumLODLevelQualityLevel: 0
182+
sssQualityMode: 0
183+
sssQualityLevel: 0
184+
sssCustomSampleBudget: 20
179185
materialQuality: 0
180186
m_RenderingPathDefaultRealtimeReflectionFrameSettings:
181187
bitDatas:
182-
data1: 69696415080221
188+
data1: 140065159257885
183189
data2: 4539628424389459968
184190
lodBias: 1
185191
lodBiasMode: 0
186192
lodBiasQualityLevel: 0
187193
maximumLODLevel: 0
188194
maximumLODLevelMode: 0
189195
maximumLODLevelQualityLevel: 0
196+
sssQualityMode: 0
197+
sssQualityLevel: 0
198+
sssCustomSampleBudget: 20
190199
materialQuality: 0
191200
m_RenderPipelineSettings:
192201
supportShadowMask: 1
193202
supportSSR: 1
203+
supportSSRTransparent: 0
194204
supportSSAO: 1
205+
supportSSGI: 1
195206
supportSubsurfaceScattering: 1
196-
increaseSssSampleCount: 0
207+
sssSampleBudget:
208+
m_Values: 140000002800000050000000
209+
m_SchemaId:
210+
m_Id: With3Levels
197211
supportVolumetrics: 1
198-
increaseResolutionOfVolumetrics: 0
199212
supportLightLayers: 0
200213
lightLayerName0: Light Layer default
201214
lightLayerName1: Light Layer 1
@@ -219,17 +232,25 @@ MonoBehaviour:
219232
supportRuntimeDebugDisplay: 1
220233
supportDitheringCrossFade: 1
221234
supportTerrainHole: 0
235+
supportProbeVolume: 0
222236
supportRayTracing: 1
237+
supportedRayTracingMode: 3
238+
probeVolumeSettings:
239+
atlasWidth: 128
240+
atlasHeight: 128
241+
atlasDepth: 512
242+
atlasOctahedralDepthWidth: 2048
243+
atlasOctahedralDepthHeight: 2048
223244
lightLoopSettings:
224245
cookieAtlasSize: 2048
225246
cookieFormat: 74
226247
pointCookieSize: 128
227248
cubeCookieTexArraySize: 16
228249
cookieAtlasLastValidMip: 0
229250
cookieTexArraySize: 16
230-
planarReflectionAtlasSize: 8192
251+
planarReflectionAtlasSize: 1024
231252
reflectionProbeCacheSize: 64
232-
reflectionCubemapSize: 256
253+
reflectionCubemapSize: 128
233254
reflectionCacheCompressed: 0
234255
planarReflectionCacheCompressed: 0
235256
skyReflectionSize: 256
@@ -240,7 +261,7 @@ MonoBehaviour:
240261
maxDirectionalLightsOnScreen: 16
241262
maxPunctualLightsOnScreen: 512
242263
maxAreaLightsOnScreen: 64
243-
maxEnvLightsOnScreen: 64
264+
maxEnvLightsOnScreen: 32
244265
maxDecalsOnScreen: 512
245266
maxPlanarReflectionOnScreen: 16
246267
hdShadowInitParams:
@@ -297,6 +318,7 @@ MonoBehaviour:
297318
xrSettings:
298319
singlePass: 1
299320
occlusionMesh: 1
321+
cameraJitter: 0
300322
postProcessQualitySettings:
301323
NearBlurSampleCount: 030000000500000008000000
302324
NearBlurMaxRadius:
@@ -338,6 +360,18 @@ MonoBehaviour:
338360
AODirectionCount: 010000000200000004000000
339361
ContactShadowSampleCount: 060000000a00000010000000
340362
SSRMaxRaySteps: 100000002000000040000000
363+
SSGIRaySteps: 100000002000000040000000
364+
SSGIResolution: 000101
365+
SSGIRadius:
366+
- 2
367+
- 3
368+
- 10
369+
SSGIFullResolution: 000101
370+
SSGIClampValue:
371+
- 2
372+
- 2
373+
- 3
374+
SSGIFilterRadius: 020000000300000004000000
341375
allowShaderVariantStripping: 1
342376
enableSRPBatcher: 1
343377
shaderVariantLogLevel: 0

0 commit comments

Comments
 (0)