Comfy-Org/ComfyUI_frontend
1
0
Fork 0
mirror of https://github.com/Comfy-Org/ComfyUI_frontend.git synced 2026-04-19 22:09:37 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: address remaining review feedback on GLSL renderer

Browse Source 
- Replace non-null assertions with explicit null checks in
  initPingPongFBOs, getFallbackTexture, readPixels, and toBlob
- Fix drawBuffers logic: use gl.COLOR_ATTACHMENT0 for intermediate
  single-output passes, gl.BACK only for default framebuffer

Amp-Thread-ID: https://ampcode.com/threads/T-019cbaf9-b1e8-702a-8fa8-bd83cb01adcc
This commit is contained in:
bymyself
2026-03-04 14:37:24 -08:00
parent ca10d7d9e3
commit b4b6c4f565
1 changed files with 25 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

41
src/renderer/glsl/useGLSLRenderer.ts
View File

@@ -86,7 +86,8 @@ export function useGLSLRenderer(config: GLSLRendererConfig = DEFAULT_CONFIG) {
const textures: WebGLTexture[] = []
for (let i = 0; i < 2; i++) {
const tex = ctx.createTexture()!
const tex = ctx.createTexture()
if (!tex) throw new Error('Failed to create ping-pong texture')
ctx.bindTexture(ctx.TEXTURE_2D, tex)
ctx.texImage2D(
ctx.TEXTURE_2D,
@@ -104,7 +105,8 @@ export function useGLSLRenderer(config: GLSLRendererConfig = DEFAULT_CONFIG) {
ctx.texParameteri(ctx.TEXTURE_2D, ctx.TEXTURE_WRAP_S, ctx.CLAMP_TO_EDGE)
ctx.texParameteri(ctx.TEXTURE_2D, ctx.TEXTURE_WRAP_T, ctx.CLAMP_TO_EDGE)
const fbo = ctx.createFramebuffer()!
const fbo = ctx.createFramebuffer()
if (!fbo) throw new Error('Failed to create ping-pong framebuffer')
ctx.bindFramebuffer(ctx.FRAMEBUFFER, fbo)
ctx.framebufferTexture2D(
ctx.FRAMEBUFFER,
@@ -145,18 +147,21 @@ export function useGLSLRenderer(config: GLSLRendererConfig = DEFAULT_CONFIG) {
}
function getFallbackTexture(): WebGLTexture {
if (!gl) throw new Error('Renderer not initialized')
if (!fallbackTexture) {
fallbackTexture = gl!.createTexture()!
gl!.bindTexture(gl!.TEXTURE_2D, fallbackTexture)
gl!.texImage2D(
gl!.TEXTURE_2D,
const tex = gl.createTexture()
if (!tex) throw new Error('Failed to create fallback texture')
fallbackTexture = tex
gl.bindTexture(gl.TEXTURE_2D, fallbackTexture)
gl.texImage2D(
gl.TEXTURE_2D,
0,
gl!.RGBA,
gl.RGBA,
1,
1,
0,
gl!.RGBA,
gl!.UNSIGNED_BYTE,
gl.RGBA,
gl.UNSIGNED_BYTE,
new Uint8Array([0, 0, 0, 255])
)
}
@@ -319,14 +324,16 @@ export function useGLSLRenderer(config: GLSLRendererConfig = DEFAULT_CONFIG) {
gl.uniform1i(prevPassLoc, prevPassUnit)
}
if (outputCount > 1 && !isLastPass) {
if (isLastPass) {
gl.drawBuffers([gl.BACK])
} else if (outputCount > 1) {
const buffers = Array.from(
{ length: outputCount },
(_, i) => gl!.COLOR_ATTACHMENT0 + i
)
gl.drawBuffers(buffers)
} else {
gl.drawBuffers([gl.BACK])
gl.drawBuffers([gl.COLOR_ATTACHMENT0])
}
gl.drawArrays(gl.TRIANGLES, 0, 3)
@@ -334,18 +341,20 @@ export function useGLSLRenderer(config: GLSLRendererConfig = DEFAULT_CONFIG) {
}
function readPixels(): ImageData {
const w = canvas!.width
const h = canvas!.height
if (!gl || !canvas) throw new Error('Renderer not initialized')
const w = canvas.width
const h = canvas.height
const pixels = new Uint8ClampedArray(w * h * 4)
gl!.pixelStorei(gl!.PACK_ROW_LENGTH, 0)
gl!.readPixels(0, 0, w, h, gl!.RGBA, gl!.UNSIGNED_BYTE, pixels)
gl.pixelStorei(gl.PACK_ROW_LENGTH, 0)
gl.readPixels(0, 0, w, h, gl.RGBA, gl.UNSIGNED_BYTE, pixels)
return new ImageData(pixels, w, h)
}
async function toBlob(): Promise<Blob> {
return canvas!.convertToBlob({ type: 'image/jpeg', quality: 0.92 })
if (!canvas) throw new Error('Renderer not initialized')
return canvas.convertToBlob({ type: 'image/jpeg', quality: 0.92 })
}
function dispose(): void {