Skip to content

Commit ff249c2

Browse files
seanstolberg-unityseanstolberg-unity
committed
Small updates and minor refactors, cleanup
1 parent 86908a5 commit ff249c2

10 files changed

+44
-352
lines changed

‎PerformanceTests/UnityPerformanceBenchmark/Assets/Prebuild/RenderPerformancePrebuildStep.cs‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -40,8 +40,6 @@ public void Setup()
4040

4141
var unprocessedArgs = optionSet.Parse(args);
4242

43-
// Performance tests always need to be run as development build in order to capture performance profiler data
44-
EditorUserBuildSettings.development = true;
4543
PlayerSettings.SplashScreen.showUnityLogo = false;
4644

4745
// Setup all-inclusive player settings

‎PerformanceTests/UnityPerformanceBenchmark/Assets/Scripts/RenderPerformanceMonoBehaviourTestBase.cs‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
public abstract class RenderPerformanceMonoBehaviourTestBase : MonoBehaviour, IMonoBehaviourTest
1515
{
1616
// Number of frames we capture and calculate metrics from
17-
private readonly int numCaptureFrames = 200;
17+
private readonly int numCaptureFrames = 100;
1818
protected static readonly string FpsName = "FPS";
1919
private static readonly string ObjectCountName = "ObjectCount";
2020
private static readonly string VerticesName = "Vertices";
@@ -146,7 +146,8 @@ private void Update()
146146
FrameCount++;
147147
SampleFps();
148148
#if ENABLE_VR
149-
if (XRSettings.enabled)
149+
// Currently XRStats.TryGetGPUTimeLastFrame only works on OculusRift and OpenVR on Windows
150+
if (XRSettings.enabled && Application.platform == RuntimePlatform.WindowsPlayer)
150151
{
151152
SampleGpuTimeLastFrame();
152153
}

‎PerformanceTests/UnityPerformanceBenchmark/Assets/Tests/DynamicScene_RenderPerformanceTests.cs‎

Lines changed: 27 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@
99
using UnityEngine.XR;
1010
#endif
1111

12-
[Category("Performance")]
1312
public class DynamicScene_RenderPerfTests : RenderPerformanceTestsBase
1413
{
1514
private readonly string basicSceneName = "RenderPerformance";
@@ -53,14 +52,14 @@ public IEnumerator Terrain()
5352
var renderPerformanceTest = SetupPerfTest<DynamicRenderPerformanceMonoBehaviourTest>();
5453

5554
// allow time to settle before taking measurements
56-
yield return new WaitForSecondsRealtime(SettleTime);
55+
yield return new WaitForSecondsRealtime(SettleTimeSeconds);
5756

5857
// use ProfilerMarkers API from Performance Test Extension
5958
using (Measure.ProfilerMarkers(SamplerNames))
6059
{
6160
// Set CaptureMetrics flag to TRUE; let's start capturing metrics
6261
renderPerformanceTest.component.CaptureMetrics = true;
63-
62+
6463
// Run the MonoBehaviour Test
6564
yield return renderPerformanceTest;
6665
}
@@ -79,14 +78,14 @@ public IEnumerator RealtimeLighting_Directional()
7978
var renderPerformanceTest = SetupPerfTest<DynamicRenderPerformanceMonoBehaviourTest>();
8079

8180
// allow time to settle before taking measurements
82-
yield return new WaitForSecondsRealtime(SettleTime);
81+
yield return new WaitForSecondsRealtime(SettleTimeSeconds);
8382

8483
// use ProfilerMarkers API from Performance Test Extension
8584
using (Measure.ProfilerMarkers(SamplerNames))
8685
{
8786
// Set CaptureMetrics flag to TRUE; let's start capturing metrics
8887
renderPerformanceTest.component.CaptureMetrics = true;
89-
88+
9089
// Run the MonoBehaviour Test
9190
yield return renderPerformanceTest;
9291
}
@@ -105,14 +104,14 @@ public IEnumerator RealtimeLighting_Point()
105104
var renderPerformanceTest = SetupPerfTest<DynamicRenderPerformanceMonoBehaviourTest>();
106105

107106
// allow time to settle before taking measurements
108-
yield return new WaitForSecondsRealtime(SettleTime);
107+
yield return new WaitForSecondsRealtime(SettleTimeSeconds);
109108

110109
// use ProfilerMarkers API from Performance Test Extension
111-
using(Measure.ProfilerMarkers(SamplerNames))
110+
using (Measure.ProfilerMarkers(SamplerNames))
112111
{
113112
// Set CaptureMetrics flag to TRUE; let's start capturing metrics
114113
renderPerformanceTest.component.CaptureMetrics = true;
115-
114+
116115
// Run the MonoBehaviour Test
117116
yield return renderPerformanceTest;
118117
}
@@ -131,14 +130,14 @@ public IEnumerator RealtimeLighting_Spot()
131130
var renderPerformanceTest = SetupPerfTest<DynamicRenderPerformanceMonoBehaviourTest>();
132131

133132
// allow time to settle before taking measurements
134-
yield return new WaitForSecondsRealtime(SettleTime);
133+
yield return new WaitForSecondsRealtime(SettleTimeSeconds);
135134

136135
// use ProfilerMarkers API from Performance Test Extension
137136
using (Measure.ProfilerMarkers(SamplerNames))
138137
{
139138
// Set CaptureMetrics flag to TRUE; let's start capturing metrics
140139
renderPerformanceTest.component.CaptureMetrics = true;
141-
140+
142141
// Run the MonoBehaviour Test
143142
yield return renderPerformanceTest;
144143
}
@@ -157,11 +156,12 @@ public IEnumerator SpiralFlame_RenderPerformance()
157156
var renderPerformanceTest = SetupPerfTest<DynamicRenderPerformanceMonoBehaviourTest>();
158157

159158
// allow time to settle before taking measurements
160-
yield return new WaitForSecondsRealtime(SettleTime);
159+
yield return new WaitForSecondsRealtime(SettleTimeSeconds);
161160

162161
// use ProfilerMarkers API from Performance Test Extension
163162
using (Measure.ProfilerMarkers(SamplerNames))
164163
{
164+
165165
// Set CaptureMetrics flag to TRUE; let's start capturing metrics
166166
renderPerformanceTest.component.CaptureMetrics = true;
167167

@@ -183,14 +183,14 @@ public IEnumerator SetTargetBufferMaterial()
183183
var renderPerformanceTest = SetupPerfTest<DynamicRenderPerformanceMonoBehaviourTest>();
184184

185185
// allow time to settle before taking measurements
186-
yield return new WaitForSecondsRealtime(SettleTime);
186+
yield return new WaitForSecondsRealtime(SettleTimeSeconds);
187187

188188
// use ProfilerMarkers API from Performance Test Extension
189189
using (Measure.ProfilerMarkers(SamplerNames))
190190
{
191191
// Set CaptureMetrics flag to TRUE; let's start capturing metrics
192192
renderPerformanceTest.component.CaptureMetrics = true;
193-
193+
194194
// Run the MonoBehaviour Test
195195
yield return renderPerformanceTest;
196196
}
@@ -209,14 +209,14 @@ public IEnumerator RenderTextureMaterial()
209209
var renderPerformanceTest = SetupPerfTest<DynamicRenderPerformanceMonoBehaviourTest>();
210210

211211
// allow time to settle before taking measurements
212-
yield return new WaitForSecondsRealtime(SettleTime);
212+
yield return new WaitForSecondsRealtime(SettleTimeSeconds);
213213

214214
// use ProfilerMarkers API from Performance Test Extension
215215
using (Measure.ProfilerMarkers(SamplerNames))
216216
{
217217
// Set CaptureMetrics flag to TRUE; let's start capturing metrics
218218
renderPerformanceTest.component.CaptureMetrics = true;
219-
219+
220220
// Run the MonoBehaviour Test
221221
yield return renderPerformanceTest;
222222
}
@@ -235,14 +235,14 @@ public IEnumerator StencilMaterial()
235235
var renderPerformanceTest = SetupPerfTest<DynamicRenderPerformanceMonoBehaviourTest>();
236236

237237
// allow time to settle before taking measurements
238-
yield return new WaitForSecondsRealtime(SettleTime);
238+
yield return new WaitForSecondsRealtime(SettleTimeSeconds);
239239

240240
// use ProfilerMarkers API from Performance Test Extension
241241
using (Measure.ProfilerMarkers(SamplerNames))
242242
{
243243
// Set CaptureMetrics flag to TRUE; let's start capturing metrics
244244
renderPerformanceTest.component.CaptureMetrics = true;
245-
245+
246246
// Run the MonoBehaviour Test
247247
yield return renderPerformanceTest;
248248
}
@@ -261,14 +261,14 @@ public IEnumerator TransparentMaterial()
261261
var renderPerformanceTest = SetupPerfTest<DynamicRenderPerformanceMonoBehaviourTest>();
262262

263263
// allow time to settle before taking measurements
264-
yield return new WaitForSecondsRealtime(SettleTime);
264+
yield return new WaitForSecondsRealtime(SettleTimeSeconds);
265265

266266
// use ProfilerMarkers API from Performance Test Extension
267267
using (Measure.ProfilerMarkers(SamplerNames))
268268
{
269269
// Set CaptureMetrics flag to TRUE; let's start capturing metrics
270270
renderPerformanceTest.component.CaptureMetrics = true;
271-
271+
272272
// Run the MonoBehaviour Test
273273
yield return renderPerformanceTest;
274274
}
@@ -287,14 +287,14 @@ public IEnumerator GpuInstacingMaterial()
287287
var renderPerformanceTest = SetupPerfTest<DynamicRenderPerformanceMonoBehaviourTest>();
288288

289289
// allow time to settle before taking measurements
290-
yield return new WaitForSecondsRealtime(SettleTime);
290+
yield return new WaitForSecondsRealtime(SettleTimeSeconds);
291291

292292
// use ProfilerMarkers API from Performance Test Extension
293293
using (Measure.ProfilerMarkers(SamplerNames))
294294
{
295295
// Set CaptureMetrics flag to TRUE; let's start capturing metrics
296296
renderPerformanceTest.component.CaptureMetrics = true;
297-
297+
298298
// Run the MonoBehaviour Test
299299
yield return renderPerformanceTest;
300300
}
@@ -313,14 +313,14 @@ public IEnumerator StandardMaterial()
313313
var renderPerformanceTest = SetupPerfTest<DynamicRenderPerformanceMonoBehaviourTest>();
314314

315315
// allow time to settle before taking measurements
316-
yield return new WaitForSecondsRealtime(SettleTime);
316+
yield return new WaitForSecondsRealtime(SettleTimeSeconds);
317317

318318
// use ProfilerMarkers API from Performance Test Extension
319319
using (Measure.ProfilerMarkers(SamplerNames))
320320
{
321321
// Set CaptureMetrics flag to TRUE; let's start capturing metrics
322322
renderPerformanceTest.component.CaptureMetrics = true;
323-
323+
324324
// Run the MonoBehaviour Test
325325
yield return renderPerformanceTest;
326326
}
@@ -343,14 +343,14 @@ public IEnumerator SpiralFlame_RenderPerformance_RenderViewPortScale_90_Percent(
343343
XRSettings.renderViewportScale = .9f;
344344

345345
// allow time to settle before taking measurements
346-
yield return new WaitForSecondsRealtime(SettleTime);
346+
yield return new WaitForSecondsRealtime(SettleTimeSeconds);
347347

348348
// use ProfilerMarkers API from Performance Test Extension
349349
using (Measure.ProfilerMarkers(SamplerNames))
350350
{
351351
// Set CaptureMetrics flag to TRUE; let's start capturing metrics
352352
renderPerformanceTest.component.CaptureMetrics = true;
353-
353+
354354
// Run the MonoBehaviour Test
355355
yield return renderPerformanceTest;
356356
}
@@ -375,14 +375,14 @@ public IEnumerator SpiralFlame_RenderPerformance_RenderViewPortScale_50_Percent(
375375
XRSettings.renderViewportScale = .5f;
376376

377377
// allow time to settle before taking measurements
378-
yield return new WaitForSecondsRealtime(SettleTime);
378+
yield return new WaitForSecondsRealtime(SettleTimeSeconds);
379379

380380
// use ProfilerMarkers API from Performance Test Extension
381381
using (Measure.ProfilerMarkers(SamplerNames))
382382
{
383383
// Set CaptureMetrics flag to TRUE; let's start capturing metrics
384384
renderPerformanceTest.component.CaptureMetrics = true;
385-
385+
386386
// Run the MonoBehaviour Test
387387
yield return renderPerformanceTest;
388388
}

0 commit comments

Comments
 (0)