From 5f56dd759819a009b86ea7f854180a38ccfc1e8e Mon Sep 17 00:00:00 2001 From: ANDREA GARGARO Date: Sun, 29 Sep 2024 23:57:02 +0200 Subject: [PATCH 1/2] Fix multidraw render info --- src/renderers/webgl-fallback/WebGLBufferRenderer.js | 9 ++------- src/renderers/webgl/WebGLIndexedBufferRenderer.js | 8 ++------ 2 files changed, 4 insertions(+), 13 deletions(-) diff --git a/src/renderers/webgl-fallback/WebGLBufferRenderer.js b/src/renderers/webgl-fallback/WebGLBufferRenderer.js index 48747e51995cc0..1e10dad05adcea 100644 --- a/src/renderers/webgl-fallback/WebGLBufferRenderer.js +++ b/src/renderers/webgl-fallback/WebGLBufferRenderer.js @@ -120,18 +120,13 @@ class WebGLBufferRenderer { } let elementCount = 0; - for ( let i = 0; i < drawCount; i ++ ) { - elementCount += counts[ i ]; + elementCount += counts[ i ] * primcount[ i ]; } - for ( let i = 0; i < primcount.length; i ++ ) { - - info.update( object, elementCount, mode, primcount[ i ] ); - - } + info.update( object, elementCount, mode, 1 ); } diff --git a/src/renderers/webgl/WebGLIndexedBufferRenderer.js b/src/renderers/webgl/WebGLIndexedBufferRenderer.js index c6a1e8a59e4edc..f75a4e8a85945c 100644 --- a/src/renderers/webgl/WebGLIndexedBufferRenderer.js +++ b/src/renderers/webgl/WebGLIndexedBufferRenderer.js @@ -75,15 +75,11 @@ function WebGLIndexedBufferRenderer( gl, extensions, info ) { let elementCount = 0; for ( let i = 0; i < drawCount; i ++ ) { - elementCount += counts[ i ]; + elementCount += counts[ i ] * primcount[ i ]; } - for ( let i = 0; i < primcount.length; i ++ ) { - - info.update( elementCount, mode, primcount[ i ] ); - - } + info.update( elementCount, mode, 1 ); } From 42a022461d37e9a47079c1dcb2581476ccecaf2c Mon Sep 17 00:00:00 2001 From: ANDREA GARGARO Date: Tue, 1 Oct 2024 00:09:31 +0200 Subject: [PATCH 2/2] WebGLBufferRender fix --- src/renderers/webgl/WebGLBufferRenderer.js | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/src/renderers/webgl/WebGLBufferRenderer.js b/src/renderers/webgl/WebGLBufferRenderer.js index 1f5802a6dfd660..174bf29a8f0079 100644 --- a/src/renderers/webgl/WebGLBufferRenderer.js +++ b/src/renderers/webgl/WebGLBufferRenderer.js @@ -65,15 +65,11 @@ function WebGLBufferRenderer( gl, extensions, info ) { let elementCount = 0; for ( let i = 0; i < drawCount; i ++ ) { - elementCount += counts[ i ]; + elementCount += counts[ i ] * primcount[ i ]; } - for ( let i = 0; i < primcount.length; i ++ ) { - - info.update( elementCount, mode, primcount[ i ] ); - - } + info.update( elementCount, mode, 1 ); }