From 24b4fce326b3feb83d41a097cebe8d6fc130dba9 Mon Sep 17 00:00:00 2001
From: Alexander Rose <alexander.rose@weirdbyte.de>
Date: Sat, 10 Sep 2022 17:21:20 -0700
Subject: [PATCH] improve RG texture format handling
---
src/mol-canvas3d/passes/dpoit.ts | 21 +++++++++++++++------
src/mol-gl/webgl/texture.ts | 3 ++-
2 files changed, 17 insertions(+), 7 deletions(-)
diff --git a/src/mol-canvas3d/passes/dpoit.ts b/src/mol-canvas3d/passes/dpoit.ts
index 2c1ca032b..bdb060dd7 100644
--- a/src/mol-canvas3d/passes/dpoit.ts
+++ b/src/mol-canvas3d/passes/dpoit.ts
@@ -233,14 +233,13 @@ export class DpoitPass {
const { resources, extensions: { colorBufferHalfFloat, textureHalfFloat } } = webgl;
// textures
- this.depthTextures = [
- resources.texture('image-float32', 'rg', 'float', 'nearest'),
- resources.texture('image-float32', 'rg', 'float', 'nearest')
- ];
- this.depthTextures[0].define(width, height);
- this.depthTextures[1].define(width, height);
if (isWebGL2(webgl.gl)) {
+ this.depthTextures = [
+ resources.texture('image-float32', 'rg', 'float', 'nearest'),
+ resources.texture('image-float32', 'rg', 'float', 'nearest')
+ ];
+
this.colorFrontTextures = colorBufferHalfFloat && textureHalfFloat ? [
resources.texture('image-float16', 'rgba', 'fp16', 'nearest'),
resources.texture('image-float16', 'rgba', 'fp16', 'nearest')
@@ -259,6 +258,11 @@ export class DpoitPass {
} else {
// in webgl1 drawbuffers must be in the same format for some reason
+ this.depthTextures = [
+ resources.texture('image-float32', 'rgba', 'float', 'nearest'),
+ resources.texture('image-float32', 'rgba', 'float', 'nearest')
+ ];
+
this.colorFrontTextures = [
resources.texture('image-float32', 'rgba', 'float', 'nearest'),
resources.texture('image-float32', 'rgba', 'float', 'nearest')
@@ -270,6 +274,9 @@ export class DpoitPass {
];
}
+ this.depthTextures[0].define(width, height);
+ this.depthTextures[1].define(width, height);
+
this.colorFrontTextures[0].define(width, height);
this.colorFrontTextures[1].define(width, height);
@@ -277,10 +284,12 @@ export class DpoitPass {
this.colorBackTextures[1].define(width, height);
// framebuffers
+
this.depthFramebuffers = [resources.framebuffer(), resources.framebuffer()];
this.colorFramebuffers = [resources.framebuffer(), resources.framebuffer()];
// renderables
+
this.blendBackRenderable = getBlendBackDpoitRenderable(webgl, this.colorBackTextures[0]);
this.renderable = getEvaluateDpoitRenderable(webgl, this.colorFrontTextures[0]);
diff --git a/src/mol-gl/webgl/texture.ts b/src/mol-gl/webgl/texture.ts
index bfef180f6..d12c95d1c 100644
--- a/src/mol-gl/webgl/texture.ts
+++ b/src/mol-gl/webgl/texture.ts
@@ -66,7 +66,8 @@ export function getFormat(gl: GLRenderingContext, format: TextureFormat, type: T
return gl.RGB;
case 'rg':
if (isWebGL2(gl) && type === 'float') return gl.RG;
- return gl.RGBA;
+ else if (isWebGL2(gl) && type === 'int') return gl.RG_INTEGER;
+ else throw new Error('texture format "rg" requires webgl2 and type "float" or int"');
case 'rgba':
if (isWebGL2(gl) && type === 'int') return gl.RGBA_INTEGER;
return gl.RGBA;
--
GitLab