Fix test apps

test-apps/display-performance-test-app/src/frontend/TestRunner.ts

@@ -12,12 +12,11 @@ import {
 } from "@itwin/core-common";
 import {
   CheckpointConnection,
-  DisplayStyle3dState, DisplayStyleState, EntityState, FeatureSymbology, GLTimerResult, GLTimerResultCallback, IModelApp, IModelConnection,
+  DisplayStyle3dState, DisplayStyleState, EntityState, FeatureSymbology, GLTimerResult, IModelApp, IModelConnection,
   ModelDisplayTransform,
   ModelDisplayTransformProvider,
   PerformanceMetrics, Pixel, RenderMemory, RenderSystem, ScreenViewport, Target, TileAdmin, ToolAdmin, ViewRect, ViewState,
 } from "@itwin/core-frontend";
-import { System } from "@itwin/core-frontend/lib/cjs/webgl";
 import { HyperModeling } from "@itwin/hypermodeling-frontend";
 import { TestFrontendAuthorizationClient } from "@itwin/oidc-signin-tool/lib/cjs/TestFrontendAuthorizationClient";
 import DisplayPerfRpcInterface from "../common/DisplayPerfRpcInterface";
@@ -28,6 +27,7 @@ import {
 import { SavedViewsFetcher } from "./SavedViewsFetcher";
 import { Transform } from "@itwin/core-geometry";
 import { TestSnapshotConnection } from "./TestSnapshotConnection";
+import { GLTimerResultCallback } from "@itwin/core-frontend/lib/cjs/internal/render/RenderSystemDebugControl";
 
 /** JSON representation of a set of tests. Each test in the set inherits the test set's configuration. */
 export interface TestSetProps extends TestConfigProps {
@@ -460,7 +460,7 @@ export class TestRunner {
         if (++frameCount === numFrames)
           target.performanceMetrics = undefined;
 
-        if (timings.gpuFramesCollected >= numFrames || (frameCount >= numFrames && !(IModelApp.renderSystem as System).isGLTimerSupported)) {
+        if (timings.gpuFramesCollected >= numFrames || (frameCount >= numFrames && !IModelApp.renderSystem.debugControl?.isGLTimerSupported)) {
           removeListener();
           IModelApp.viewManager.dropViewport(vp, false);
           vp.continuousRendering = false;

test-apps/display-test-app/src/frontend/DisplayScale.ts

@@ -4,14 +4,14 @@
 *--------------------------------------------------------------------------------------------*/
 
 import { Matrix3d, Point3d, Transform } from "@itwin/core-geometry";
-import { IModelApp, ModelDisplayTransformProvider, Tool } from "@itwin/core-frontend";
+import { IModelApp, ModelDisplayTransform, ModelDisplayTransformProvider, Tool } from "@itwin/core-frontend";
 import { parseArgs } from "@itwin/frontend-devtools";
 
 class DisplayScaleTransformProvider implements ModelDisplayTransformProvider {
   public constructor(private readonly _models: Set<string>, private readonly _scaleTransform: Transform) { }
 
-  public getModelDisplayTransform(modelId: string): Transform | undefined {
-    return this._models.has(modelId) ? this._scaleTransform.clone() : undefined;
+  public getModelDisplayTransform(modelId: string): ModelDisplayTransform | undefined {
+    return this._models.has(modelId) ? { transform: this._scaleTransform.clone() } : undefined;
   }
 
   public get transform(): Transform { return this._scaleTransform.clone(); }

test-apps/display-test-app/src/frontend/DisplayTestApp.ts

@@ -186,7 +186,7 @@ const dtaFrontendMain = async () => {
   [renderSystemOptions, tileAdminProps] = setConfigurationResults();
   await DisplayTestApp.startup(configuration, renderSystemOptions, tileAdminProps);
   if (false !== configuration.enableDiagnostics)
-    IModelApp.renderSystem.enableDiagnostics();
+    IModelApp.renderSystem.debugControl?.enableDiagnostics(undefined);
 
   if (!configuration.standalone && !configuration.customOrchestratorUri) {
     alert("Standalone iModel required. Set IMJS_STANDALONE_FILENAME in environment");
@@ -207,7 +207,7 @@ const dtaFrontendMain = async () => {
     [renderSystemOptions, tileAdminProps] = setConfigurationResults();
     await DisplayTestApp.startup(configuration, renderSystemOptions, tileAdminProps);
     if (false !== configuration.enableDiagnostics)
-      IModelApp.renderSystem.enableDiagnostics();
+      IModelApp.renderSystem.debugControl?.enableDiagnostics(undefined);
 
     if (!configuration.standalone && !configuration.customOrchestratorUri) {
       alert("Standalone iModel required. Set IMJS_STANDALONE_FILENAME in environment");

test-apps/display-test-app/src/frontend/OutputShadersTool.ts

@@ -2,8 +2,9 @@
 * Copyright (c) Bentley Systems, Incorporated. All rights reserved.
 * See LICENSE.md in the project root for license terms and full copyright notice.
 *--------------------------------------------------------------------------------------------*/
-import { DebugShaderFile, IModelApp, NotifyMessageDetails, OutputMessagePriority, Tool } from "@itwin/core-frontend";
+import { IModelApp, NotifyMessageDetails, OutputMessagePriority, Tool } from "@itwin/core-frontend";
 import { DtaRpcInterface } from "../common/DtaRpcInterface";
+import { DebugShaderFile } from "@itwin/core-frontend/lib/cjs/internal/render/RenderSystemDebugControl";
 
 // cspell:disable
 

test-apps/display-test-app/src/frontend/TileContentTool.ts

@@ -8,6 +8,7 @@ import { PersistentGraphicsRequestProps } from "@itwin/core-common";
 import {
   ImdlReader, IModelApp, IModelConnection, Tool,
 } from "@itwin/core-frontend";
+import { IModelTileTree } from "@itwin/core-frontend/lib/cjs/internal/tile/IModelTileTree";
 import { parseArgs } from "@itwin/frontend-devtools";
 
 export class GenerateTileContentTool extends Tool {
@@ -55,7 +56,7 @@ export class GenerateTileContentTool extends Tool {
       return false;
 
     for (const owner of iModel.tiles) {
-      const tree = owner.owner.tileTree;
+      const tree = owner.owner.tileTree instanceof IModelTileTree ? owner.owner.tileTree : undefined;
       if (tree && "modelId" in tree && tree.modelId === modelId)
         return this.run({ tree, contentId });
     }

test-apps/display-test-app/src/frontend/TileSizeRecorder.ts

@@ -5,7 +5,8 @@
 
 import { assert, Id64String } from "@itwin/core-bentley";
 import { iModelTileTreeIdToString } from "@itwin/core-common";
-import { IModelApp, IModelTileTree, TileAdmin, Tool } from "@itwin/core-frontend";
+import { IModelApp, TileAdmin, Tool } from "@itwin/core-frontend";
+import { IModelTileTree } from "@itwin/core-frontend/lib/cjs/internal/tile/IModelTileTree";
 import { copyStringToClipboard, parseToggle } from "@itwin/frontend-devtools";
 
 interface ContentId {

test-apps/display-test-app/src/frontend/TiledGraphics.ts

@@ -56,10 +56,7 @@ class Provider implements TiledGraphicsProvider {
     // Any symbology overrides applied to the viewport are ignored.
     this.ovrs = new FeatureSymbology.Overrides(view);
 
-    this._refs = [];
-    view.forEachModelTreeRef((ref) => {
-      this._refs.push(new Reference(ref, this));
-    });
+    this._refs = Array.from(view.getModelTreeRefs()).map((ref) => new Reference(ref, this));
   }
 
   public forEachTileTreeRef(_vp: Viewport, func: (ref: TileTreeReference) => void): void {