Skip to content
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

WebGPURenderer: extract common draw call logic from backends #29358

Merged
merged 2 commits into from
Sep 8, 2024
Merged

WebGPURenderer: extract common draw call logic from backends #29358

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
79336da
draw params
Sep 8, 2024
671f721
add missing return
Sep 8, 2024
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
56 changes: 56 additions & 0 deletions src/renderers/common/RenderObject.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,6 +61,7 @@ export default class RenderObject {
this.attributes = null;
this.pipeline = null;
this.vertexBuffers = null;
this.drawParams = null;

this.updateClipping( renderContext.clippingContext );

Expand Down Expand Up @@ -183,6 +184,61 @@ export default class RenderObject {

}

getDrawParameters() {

const { object, material, geometry, group, drawRange } = this;

const drawParams = this.drawParams || ( this.drawParams = {
vertexCount: 0,
firstVertex: 0,
instanceCount: 0,
firstInstance: 0
} );

const index = this.getIndex();
const hasIndex = ( index !== null );
const instanceCount = geometry.isInstancedBufferGeometry ? geometry.instanceCount : ( object.count > 1 ? object.count : 1 );

if ( instanceCount === 0 ) return null;

drawParams.instanceCount = instanceCount;

if ( object.isBatchedMesh === true ) return drawParams;

let rangeFactor = 1;

if ( material.wireframe === true && ! object.isPoints && ! object.isLineSegments && ! object.isLine && ! object.isLineLoop ) {

rangeFactor = 2;

}

let firstVertex = drawRange.start * rangeFactor;
let lastVertex = ( drawRange.start + drawRange.count ) * rangeFactor;

if ( group !== null ) {

firstVertex = Math.max( firstVertex, group.start * rangeFactor );
lastVertex = Math.min( lastVertex, ( group.start + group.count ) * rangeFactor );

}

const itemCount = hasIndex === true ? index.count : geometry.attributes.position.count;

firstVertex = Math.max( firstVertex, 0 );
lastVertex = Math.min( lastVertex, itemCount );

const count = lastVertex - firstVertex;

if ( count < 0 || count === Infinity ) return null;

drawParams.vertexCount = count;
drawParams.firstVertex = firstVertex;

return drawParams;

}

getMaterialCacheKey() {

const { object, material } = this;
Expand Down
53 changes: 10 additions & 43 deletions src/renderers/webgl-fallback/WebGLBackend.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -597,6 +597,10 @@ class WebGLBackend extends Backend {

const contextData = this.get( context );

const drawParms = renderObject.getDrawParameters();

if ( drawParms === null ) return;

//

this._bindUniforms( renderObject.getBindings() );
Expand Down Expand Up @@ -635,9 +639,6 @@ class WebGLBackend extends Backend {

const index = renderObject.getIndex();

const geometry = renderObject.geometry;
const drawRange = renderObject.drawRange;

//

const lastObject = contextData.lastOcclusionObject;
Expand Down Expand Up @@ -668,8 +669,6 @@ class WebGLBackend extends Backend {
}

//
let rangeFactor = 1;

const renderer = this.bufferRenderer;

if ( object.isPoints ) renderer.mode = gl.POINTS;
Expand All @@ -683,8 +682,6 @@ class WebGLBackend extends Backend {
state.setLineWidth( material.wireframeLinewidth * this.renderer.getPixelRatio() );
renderer.mode = gl.LINES;

rangeFactor = 2;

} else {

renderer.mode = gl.TRIANGLES;
Expand All @@ -695,56 +692,26 @@ class WebGLBackend extends Backend {

//

const group = renderObject.group;

const { vertexCount, instanceCount } = drawParms;
let { firstVertex } = drawParms;

renderer.object = object;


let firstVertex = drawRange.start * rangeFactor;
let lastVertex = ( drawRange.start + drawRange.count ) * rangeFactor;

if ( group !== null ) {

firstVertex = Math.max( firstVertex, group.start * rangeFactor );
lastVertex = Math.min( lastVertex, ( group.start + group.count ) * rangeFactor );

}

if ( index !== null ) {

firstVertex *= index.array.BYTES_PER_ELEMENT;

const indexData = this.get( index );
const indexCount = index.count;

renderer.index = index.count;
renderer.type = indexData.type;

firstVertex = Math.max( firstVertex, 0 );
lastVertex = Math.min( lastVertex, indexCount );

} else {

renderer.index = 0;

const vertexCount = geometry.attributes.position.count;

firstVertex = Math.max( firstVertex, 0 );
lastVertex = Math.min( lastVertex, vertexCount );

}

const count = lastVertex - firstVertex;

if ( count < 0 || count === Infinity ) return;

if ( index !== null ) {

firstVertex *= index.array.BYTES_PER_ELEMENT;

}

const instanceCount = this.getInstanceCount( renderObject );

if ( object.isBatchedMesh ) {

if ( object._multiDrawInstances !== null ) {
Expand All @@ -763,11 +730,11 @@ class WebGLBackend extends Backend {

} else if ( instanceCount > 1 ) {

renderer.renderInstances( firstVertex, count, instanceCount );
renderer.renderInstances( firstVertex, vertexCount, instanceCount );

} else {

renderer.render( firstVertex, count );
renderer.render( firstVertex, vertexCount );

}
//
Expand Down
54 changes: 9 additions & 45 deletions src/renderers/webgpu/WebGPUBackend.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -829,13 +829,17 @@ class WebGPUBackend extends Backend {

draw( renderObject, info ) {

const { object, material, geometry, context, pipeline, group } = renderObject;
const { object, context, pipeline } = renderObject;
const bindings = renderObject.getBindings();
const renderContextData = this.get( context );
const pipelineGPU = this.get( pipeline ).pipeline;
const currentSets = renderContextData.currentSets;
const passEncoderGPU = renderContextData.currentPass;

const drawParms = renderObject.getDrawParameters();

if ( drawParms === null ) return;

// pipeline

if ( currentSets.pipeline !== pipelineGPU ) {
Expand Down Expand Up @@ -936,31 +940,6 @@ class WebGPUBackend extends Backend {

// draw

const drawRange = renderObject.drawRange;

let rangeFactor = 1;

if ( material.wireframe === true && ! object.isPoints && ! object.isLineSegments && ! object.isLine && ! object.isLineLoop ) {

rangeFactor = 2;

}

let firstVertex = drawRange.start * rangeFactor;
let lastVertex = ( drawRange.start + drawRange.count ) * rangeFactor;

if ( group !== null ) {

firstVertex = Math.max( firstVertex, group.start * rangeFactor );
lastVertex = Math.min( lastVertex, ( group.start + group.count ) * rangeFactor );

}



const instanceCount = this.getInstanceCount( renderObject );
if ( instanceCount === 0 ) return;

if ( object.isBatchedMesh === true ) {

const starts = object._multiDrawStarts;
Expand All @@ -981,32 +960,17 @@ class WebGPUBackend extends Backend {

} else if ( hasIndex === true ) {

const indexCount = index.count;

firstVertex = Math.max( firstVertex, 0 );
lastVertex = Math.min( lastVertex, indexCount );
const { vertexCount: indexCount, instanceCount, firstVertex: firstIndex } = drawParms;

const count = lastVertex - firstVertex;

if ( count < 0 || count === Infinity ) return;

passEncoderGPU.drawIndexed( count, instanceCount, firstVertex, 0, 0 );
passEncoderGPU.drawIndexed( indexCount, instanceCount, firstIndex, 0, 0 );

info.update( object, indexCount, instanceCount );

} else {

const positionAttribute = geometry.attributes.position;
const vertexCount = positionAttribute.count;

firstVertex = Math.max( firstVertex, 0 );
lastVertex = Math.min( lastVertex, vertexCount );

const count = lastVertex - firstVertex;

if ( count < 0 || count === Infinity ) return;
const { vertexCount, instanceCount, firstVertex } = drawParms;

passEncoderGPU.draw( count, instanceCount, firstVertex, 0 );
passEncoderGPU.draw( vertexCount, instanceCount, firstVertex, 0 );

info.update( object, vertexCount, instanceCount );

Expand Down