Remove cycling dep in editor gpu code

Author: Tyriar

src/vs/editor/browser/gpu/atlas/textureAtlas.ts

@@ -12,6 +12,7 @@ import { NKeyMap } from '../../../../base/common/map.js';
 import { IInstantiationService } from '../../../../platform/instantiation/common/instantiation.js';
 import { IThemeService } from '../../../../platform/theme/common/themeService.js';
 import { MetadataConsts } from '../../../common/encodedTokenAttributes.js';
+import type { DecorationStyleCache } from '../css/decorationStyleCache.js';
 import { GlyphRasterizer } from '../raster/glyphRasterizer.js';
 import type { IGlyphRasterizer } from '../raster/raster.js';
 import { IdleTaskQueue, type ITaskQueue } from '../taskQueue.js';
@@ -59,6 +60,7 @@ export class TextureAtlas extends Disposable {
 		/** The maximum texture size supported by the GPU. */
 		private readonly _maxTextureSize: number,
 		options: ITextureAtlasOptions | undefined,
+		private readonly _decorationStyleCache: DecorationStyleCache,
 		@IThemeService private readonly _themeService: IThemeService,
 		@IInstantiationService private readonly _instantiationService: IInstantiationService
 	) {
@@ -88,7 +90,7 @@ export class TextureAtlas extends Disposable {
 		// IMPORTANT: The first glyph on the first page must be an empty glyph such that zeroed out
 		// cells end up rendering nothing
 		// TODO: This currently means the first slab is for 0x0 glyphs and is wasted
-		const nullRasterizer = new GlyphRasterizer(1, '', 1);
+		const nullRasterizer = new GlyphRasterizer(1, '', 1, this._decorationStyleCache);
 		firstPage.getGlyph(nullRasterizer, '', 0, 0);
 		nullRasterizer.dispose();
 	}

src/vs/editor/browser/gpu/raster/glyphRasterizer.ts

@@ -8,8 +8,8 @@ import { Disposable } from '../../../../base/common/lifecycle.js';
 import { isMacintosh } from '../../../../base/common/platform.js';
 import { StringBuilder } from '../../../common/core/stringBuilder.js';
 import { FontStyle, TokenMetadata } from '../../../common/encodedTokenAttributes.js';
+import type { DecorationStyleCache } from '../css/decorationStyleCache.js';
 import { ensureNonNullable } from '../gpuUtils.js';
-import { ViewGpuContext } from '../viewGpuContext.js';
 import { type IBoundingBox, type IGlyphRasterizer, type IRasterizedGlyph } from './raster.js';
 
 let nextId = 0;
@@ -50,7 +50,8 @@ export class GlyphRasterizer extends Disposable implements IGlyphRasterizer {
 	constructor(
 		readonly fontSize: number,
 		readonly fontFamily: string,
-		readonly devicePixelRatio: number
+		readonly devicePixelRatio: number,
+		private readonly _decorationStyleCache: DecorationStyleCache,
 	) {
 		super();
 
@@ -119,7 +120,7 @@ export class GlyphRasterizer extends Disposable implements IGlyphRasterizer {
 		const bgId = TokenMetadata.getBackground(tokenMetadata);
 		const bg = colorMap[bgId];
 
-		const decorationStyleSet = ViewGpuContext.decorationStyleCache.getStyleSet(decorationStyleSetId);
+		const decorationStyleSet = this._decorationStyleCache.getStyleSet(decorationStyleSetId);
 
 		// When SPAA is used, the background color must be present to get the right glyph
 		if (this._antiAliasing === 'subpixel') {

src/vs/editor/browser/gpu/viewGpuContext.ts

@@ -24,13 +24,12 @@ import { Event } from '../../../base/common/event.js';
 import { EditorOption, type IEditorOptions } from '../../common/config/editorOptions.js';
 import { InlineDecorationType } from '../../common/viewModel.js';
 import { DecorationStyleCache } from './css/decorationStyleCache.js';
-import { ViewportRenderStrategy } from './renderStrategy/viewportRenderStrategy.js';
 
 export class ViewGpuContext extends Disposable {
 	/**
 	 * The hard cap for line columns rendered by the GPU renderer.
 	 */
-	readonly maxGpuCols = ViewportRenderStrategy.maxSupportedColumns;
+	readonly maxGpuCols = 2000;
 
 	readonly canvas: FastDomNode<HTMLCanvasElement>;
 	readonly ctx: GPUCanvasContext;
@@ -111,7 +110,7 @@ export class ViewGpuContext extends Disposable {
 			}).then(ref => {
 				ViewGpuContext.deviceSync = ref.object;
 				if (!ViewGpuContext._atlas) {
-					ViewGpuContext._atlas = this._instantiationService.createInstance(TextureAtlas, ref.object.limits.maxTextureDimension2D, undefined);
+					ViewGpuContext._atlas = this._instantiationService.createInstance(TextureAtlas, ref.object.limits.maxTextureDimension2D, undefined, ViewGpuContext.decorationStyleCache);
 				}
 				return ref.object;
 			});

src/vs/editor/browser/viewParts/viewLinesGpu/viewLinesGpu.ts

@@ -196,7 +196,7 @@ export class ViewLinesGpu extends ViewPart implements IViewLines {
 
 		const fontFamily = this._context.configuration.options.get(EditorOption.fontFamily);
 		const fontSize = this._context.configuration.options.get(EditorOption.fontSize);
-		this._glyphRasterizer.value = this._register(new GlyphRasterizer(fontSize, fontFamily, this._viewGpuContext.devicePixelRatio.get()));
+		this._glyphRasterizer.value = this._register(new GlyphRasterizer(fontSize, fontFamily, this._viewGpuContext.devicePixelRatio.get(), ViewGpuContext.decorationStyleCache));
 		this._register(runOnChange(this._viewGpuContext.devicePixelRatio, () => {
 			this._refreshGlyphRasterizer();
 		}));
@@ -454,7 +454,7 @@ export class ViewLinesGpu extends ViewPart implements IViewLines {
 			glyphRasterizer.fontSize !== fontSize ||
 			glyphRasterizer.devicePixelRatio !== devicePixelRatio
 		) {
-			this._glyphRasterizer.value = new GlyphRasterizer(fontSize, fontFamily, devicePixelRatio);
+			this._glyphRasterizer.value = new GlyphRasterizer(fontSize, fontFamily, devicePixelRatio, ViewGpuContext.decorationStyleCache);
 		}
 	}
 

src/vs/editor/contrib/gpu/browser/gpuActions.ts

@@ -105,7 +105,7 @@ class DebugEditorGpuRendererAction extends EditorAction {
 					const atlas = ViewGpuContext.atlas;
 					const fontFamily = configurationService.getValue<string>('editor.fontFamily');
 					const fontSize = configurationService.getValue<number>('editor.fontSize');
-					const rasterizer = new GlyphRasterizer(fontSize, fontFamily, getActiveWindow().devicePixelRatio);
+					const rasterizer = new GlyphRasterizer(fontSize, fontFamily, getActiveWindow().devicePixelRatio, ViewGpuContext.decorationStyleCache);
 					let chars = await quickInputService.input({
 						prompt: 'Enter a character to draw (prefix with 0x for code point))'
 					});

src/vs/editor/test/browser/gpu/atlas/textureAtlas.test.ts

@@ -12,6 +12,7 @@ import { TextureAtlas } from '../../../../browser/gpu/atlas/textureAtlas.js';
 import { createCodeEditorServices } from '../../testCodeEditor.js';
 import { assertIsValidGlyph } from './testUtil.js';
 import { TextureAtlasSlabAllocator } from '../../../../browser/gpu/atlas/textureAtlasSlabAllocator.js';
+import { DecorationStyleCache } from '../../../../browser/gpu/css/decorationStyleCache.js';
 
 const blackInt = 0x000000FF;
 const nullCharMetadata = 0x0;
@@ -79,7 +80,7 @@ suite('TextureAtlas', () => {
 
 	setup(() => {
 		instantiationService = createCodeEditorServices(store);
-		atlas = store.add(instantiationService.createInstance(TextureAtlas, 2, undefined));
+		atlas = store.add(instantiationService.createInstance(TextureAtlas, 2, undefined, new DecorationStyleCache()));
 		glyphRasterizer = new TestGlyphRasterizer();
 		glyphRasterizer.nextGlyphDimensions = [1, 1];
 		glyphRasterizer.nextGlyphColor = [0, 0, 0, 0xFF];
@@ -90,7 +91,7 @@ suite('TextureAtlas', () => {
 	});
 
 	test('get multiple glyphs', () => {
-		atlas = store.add(instantiationService.createInstance(TextureAtlas, 32, undefined));
+		atlas = store.add(instantiationService.createInstance(TextureAtlas, 32, undefined, new DecorationStyleCache()));
 		for (let i = 0; i < 10; i++) {
 			assertIsValidGlyph(atlas.getGlyph(glyphRasterizer, ...getUniqueGlyphId()), atlas);
 		}
@@ -119,14 +120,14 @@ suite('TextureAtlas', () => {
 		glyphRasterizer.nextGlyphDimensions = [2, 2];
 		atlas = store.add(instantiationService.createInstance(TextureAtlas, 32, {
 			allocatorType: (canvas, textureIndex) => new TextureAtlasSlabAllocator(canvas, textureIndex, { slabW: 1, slabH: 1 })
-		}));
+		}, new DecorationStyleCache()));
 		assertIsValidGlyph(atlas.getGlyph(glyphRasterizer, ...getUniqueGlyphId()), atlas);
 	});
 
 	test('adding a non-first glyph larger than the standard slab size, causing an overflow to a new page', () => {
 		atlas = store.add(instantiationService.createInstance(TextureAtlas, 2, {
 			allocatorType: (canvas, textureIndex) => new TextureAtlasSlabAllocator(canvas, textureIndex, { slabW: 1, slabH: 1 })
-		}));
+		}, new DecorationStyleCache()));
 		assertIsValidGlyph(atlas.getGlyph(glyphRasterizer, ...getUniqueGlyphId()), atlas);
 		strictEqual(atlas.pages.length, 1);
 		glyphRasterizer.nextGlyphDimensions = [2, 2];