Skip to content
Draft
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
34 changes: 18 additions & 16 deletions src/core/renderers/webgl/WebGlRenderOp.ts
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ type ReqQuad =
| 'height'
| 'width'
| 'time';
type RenderOpQuadOptions = Pick<QuadOptions, ReqQuad> &
export type RenderOpQuadOptions = Pick<QuadOptions, ReqQuad> &
Partial<Omit<QuadOptions, ReqQuad>> & {
sdfShaderProps?: Record<string, unknown>;
sdfBuffers?: BufferCollection;
Expand All @@ -53,27 +53,29 @@ export class WebGlRenderOp extends CoreRenderOp {
/**
* need to improve this when TextRenderers are refactored
*/
readonly sdfShaderProps: Record<string, unknown> | undefined;
readonly sdfNode: CoreTextNode | undefined;
readonly maxTextures: number;
readonly buffers: BufferCollection;
readonly shader: WebGlShaderNode;
readonly width: number;
readonly height: number;
readonly clippingRect: RectWithValid;
readonly rtt: boolean;
readonly parentHasRenderTexture: boolean;
readonly framebufferDimensions: Dimensions | null;
readonly alpha: number;
readonly pixelRatio: number;
readonly time?: number | null;
sdfShaderProps: Record<string, unknown> | undefined;
sdfNode: CoreTextNode | undefined;
maxTextures: number;
buffers: BufferCollection;
shader: WebGlShaderNode;
width: number;
height: number;
clippingRect: RectWithValid;
rtt: boolean;
parentHasRenderTexture: boolean;
framebufferDimensions: Dimensions | null;
alpha: number;
pixelRatio: number;
bufferIdx: number;
time?: number | null;

constructor(
readonly renderer: WebGlRenderer,
quad: RenderOpQuadOptions,
readonly bufferIdx: number,
bufferIdx: number,
) {
super();
this.bufferIdx = bufferIdx;
this.buffers = quad.sdfBuffers || renderer.quadBufferCollection;
this.shader = quad.shader as WebGlShaderNode;
this.width = quad.width;
Expand Down
44 changes: 39 additions & 5 deletions src/core/renderers/webgl/WebGlRenderer.ts
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ import {
type CoreRendererOptions,
type QuadOptions,
} from '../CoreRenderer.js';
import { WebGlRenderOp } from './WebGlRenderOp.js';
import { WebGlRenderOp, type RenderOpQuadOptions } from './WebGlRenderOp.js';
import type { CoreContextTexture } from '../CoreContextTexture.js';
import {
createIndexBuffer,
Expand Down Expand Up @@ -71,6 +71,7 @@ export class WebGlRenderer extends CoreRenderer {
fQuadBuffer: Float32Array;
uiQuadBuffer: Uint32Array;
renderOps: WebGlRenderOp[] = [];
renderOpPool: WebGlRenderOp[] = [];

//// Render Op / Buffer Filling State
curBufferIdx = 0;
Expand Down Expand Up @@ -188,6 +189,7 @@ export class WebGlRenderer extends CoreRenderer {
const { glw } = this;
this.curBufferIdx = 0;
this.curRenderOp = null;
this.renderOpPool.push(...this.renderOps);
this.renderOps.length = 0;
glw.setScissorTest(false);
glw.clear();
Expand Down Expand Up @@ -260,7 +262,7 @@ export class WebGlRenderer extends CoreRenderer {

const reuse = this.reuseRenderOp(params);
if (reuse === false) {
this.newRenderOp(params, i);
this.createRenderOp(params, i);
}

let tx = params.texture!;
Expand Down Expand Up @@ -329,10 +331,42 @@ export class WebGlRenderer extends CoreRenderer {
* @param shader
* @param bufferIdx
*/
private newRenderOp(quad: QuadOptions | WebGlRenderOp, bufferIdx: number) {
const curRenderOp = new WebGlRenderOp(this, quad, bufferIdx);
public createRenderOp(
quad: RenderOpQuadOptions | WebGlRenderOp,
bufferIdx: number,
): WebGlRenderOp {
let curRenderOp = this.renderOpPool.pop();
if (curRenderOp) {
curRenderOp.bufferIdx = bufferIdx;
curRenderOp.buffers =
(quad as RenderOpQuadOptions).sdfBuffers || this.quadBufferCollection;
curRenderOp.shader = quad.shader as WebGlShaderNode;
curRenderOp.width = quad.width;
curRenderOp.height = quad.height;
curRenderOp.clippingRect = quad.clippingRect;
curRenderOp.parentHasRenderTexture = quad.parentHasRenderTexture || false;
curRenderOp.framebufferDimensions = quad.framebufferDimensions || null;
curRenderOp.rtt = quad.rtt || false;
curRenderOp.alpha = quad.alpha;
curRenderOp.pixelRatio =
curRenderOp.parentHasRenderTexture === true ? 1 : this.stage.pixelRatio;
curRenderOp.sdfShaderProps = (quad as RenderOpQuadOptions).sdfShaderProps;
curRenderOp.maxTextures = curRenderOp.shader.program
.supportsIndexedTextures
? (this.glw.getParameter(
this.glw.MAX_VERTEX_TEXTURE_IMAGE_UNITS,
) as number)
: 1;

curRenderOp.numQuads = 0;
curRenderOp.textures.length = 0;
} else {
curRenderOp = new WebGlRenderOp(this, quad, bufferIdx);
}

this.curRenderOp = curRenderOp;
this.renderOps.push(curRenderOp);
return curRenderOp;
}

/**
Expand All @@ -358,7 +392,7 @@ export class WebGlRenderer extends CoreRenderer {
if (recursive) {
throw new Error('Unable to add texture to render op');
}
this.newRenderOp(this.curRenderOp!, bufferIdx);
this.createRenderOp(this.curRenderOp!, bufferIdx);
return this.addTexture(texture, bufferIdx, true);
}
return textureIdx;
Expand Down
7 changes: 2 additions & 5 deletions src/core/text-rendering/SdfTextRenderer.ts
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ import { hasZeroWidthSpace } from './Utils.js';
import * as SdfFontHandler from './SdfFontHandler.js';
import type { CoreRenderer } from '../renderers/CoreRenderer.js';
import { WebGlRenderer } from '../renderers/webgl/WebGlRenderer.js';
import { WebGlRenderOp } from '../renderers/webgl/WebGlRenderOp.js';

import { Sdf, type SdfShaderProps } from '../shaders/webgl/SdfShader.js';
import { BufferCollection } from '../renderers/webgl/internal/BufferCollection.js';
import type { WebGlCtxTexture } from '../renderers/webgl/WebGlCtxTexture.js';
Expand Down Expand Up @@ -238,8 +238,7 @@ const renderQuads = (
glw.arrayBufferData(buffer, vertexBuffer, glw.STATIC_DRAW as number);
}

const renderOp = new WebGlRenderOp(
renderer as WebGlRenderer,
const renderOp = (renderer as WebGlRenderer).createRenderOp(
{
sdfShaderProps: {
transform: globalTransform,
Expand All @@ -265,8 +264,6 @@ const renderQuads = (
// Add atlas texture and set quad count
renderOp.addTexture(atlasTexture.ctxTexture as WebGlCtxTexture);
renderOp.numQuads = layout.glyphs.length;

(renderer as WebGlRenderer).addRenderOp(renderOp);
};

/**
Expand Down