Skip to content

BatchedMesh: Deprecate old instancing render paths #30550

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
Feb 18, 2025
Merged

BatchedMesh: Deprecate old instancing render paths #30550

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
3f13780
Deprecate use of "_multiDrawInstances"
gkjohnson Feb 18, 2025
afb842a
r170 -> r173
gkjohnson Feb 18, 2025
8d23e58
173 -> 174
gkjohnson Feb 18, 2025
948257d
Fix logs
gkjohnson Feb 18, 2025
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
2 changes: 2 additions & 0 deletions src/renderers/WebGLRenderer.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -870,6 +870,8 @@ class WebGLRenderer {

if ( object._multiDrawInstances !== null ) {

// @deprecated, r174
warnOnce( 'THREE.WebGLRenderer: renderMultiDrawInstances has been deprecated and will be removed in r184. Append to renderMultiDraw arguments and use indirection.' );
renderer.renderMultiDrawInstances( object._multiDrawStarts, object._multiDrawCounts, object._multiDrawCount, object._multiDrawInstances );

} else {
Expand Down
2 changes: 2 additions & 0 deletions src/renderers/webgl-fallback/WebGLBackend.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1076,6 +1076,8 @@ class WebGLBackend extends Backend {

if ( object._multiDrawInstances !== null ) {

// @deprecated, r174
warnOnce( 'THREE.WebGLBackend: renderMultiDrawInstances has been deprecated and will be removed in r184. Append to renderMultiDraw arguments and use indirection.' );
renderer.renderMultiDrawInstances( object._multiDrawStarts, object._multiDrawCounts, object._multiDrawCount, object._multiDrawInstances );

} else if ( ! this.hasFeature( 'WEBGL_multi_draw' ) ) {
Expand Down
8 changes: 8 additions & 0 deletions src/renderers/webgpu/WebGPUBackend.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@ import WebGPUTextureUtils from './utils/WebGPUTextureUtils.js';

import { WebGPUCoordinateSystem } from '../../constants.js';
import WebGPUTimestampQueryPool from './utils/WebGPUTimestampQueryPool.js';
import { warnOnce } from '../../utils.js';

/**
* A backend implementation targeting WebGPU.
Expand Down Expand Up @@ -1220,6 +1221,13 @@ class WebGPUBackend extends Backend {
const drawCount = object._multiDrawCount;
const drawInstances = object._multiDrawInstances;

if ( drawInstances !== null ) {

// @deprecated, r174
warnOnce( 'THREE.WebGPUBackend: renderMultiDrawInstances has been deprecated and will be removed in r184. Append to renderMultiDraw arguments and use indirection.' );

}

for ( let i = 0; i < drawCount; i ++ ) {

const count = drawInstances ? drawInstances[ i ] : 1;
Expand Down