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

Jump to bottom

WebGLRenderer: option to enable multi_draw / gl_DrawID in vertex shader #27630

Merged
merged 6 commits into from
Jan 29, 2024
Merged

WebGLRenderer: option to enable multi_draw / gl_DrawID in vertex shader #27630

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
77cd82f
feat: multi_draw / enable gl_DrawID
vegarringdal Jan 27, 2024
2cafa8b
chore: remove space
vegarringdal Jan 27, 2024
b20c14d
chore: rename extensionMultidraw to extensionMultiDraw
vegarringdal Jan 28, 2024
4d89459
chore: rename variable in extension
vegarringdal Jan 28, 2024
ee3ac6f
Update WebGLPrograms.js
Mugen87 Jan 29, 2024
92a9c40
chore: update docs
VegarRingdalAibel Jan 29, 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
1 change: 1 addition & 0 deletions docs/api/en/materials/ShaderMaterial.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -347,6 +347,7 @@ <h3>[property:Object extensions]</h3>
drawBuffers: false, // set to use draw buffers
shaderTextureLOD: false, // set to use shader texture LOD
clipCullDistance: false // set to use vertex shader clipping
multiDraw: false // set to use vertex shader multi_draw / enable gl_DrawID
};
</code>
</p>
Expand Down
3 changes: 2 additions & 1 deletion src/materials/ShaderMaterial.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,8 @@ class ShaderMaterial extends Material {
fragDepth: false, // set to use fragment depth values
drawBuffers: false, // set to use draw buffers
shaderTextureLOD: false, // set to use shader texture LOD
clipCullDistance: false // set to use vertex shader clipping
clipCullDistance: false, // set to use vertex shader clipping
multiDraw: false // set to use vertex shader multi_draw / enable gl_DrawID
Mugen87 marked this conversation as resolved.
Show resolved Hide resolved
};

// When rendered geometry doesn't include these attributes but the material does,
Expand Down
3 changes: 2 additions & 1 deletion src/renderers/webgl/WebGLProgram.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -154,7 +154,8 @@ function generateExtensions( parameters ) {
function generateVertexExtensions( parameters ) {

const chunks = [
parameters.extensionClipCullDistance ? '#extension GL_ANGLE_clip_cull_distance : require' : ''
parameters.extensionClipCullDistance ? '#extension GL_ANGLE_clip_cull_distance : require' : '',
parameters.extensionMultiDraw ? '#extension GL_ANGLE_multi_draw : require' : '',
];

return chunks.filter( filterEmptyLine ).join( '\n' );
Expand Down
3 changes: 2 additions & 1 deletion src/renderers/webgl/WebGLPrograms.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -353,7 +353,8 @@ function WebGLPrograms( renderer, cubemaps, cubeuvmaps, extensions, capabilities
extensionFragDepth: HAS_EXTENSIONS && material.extensions.fragDepth === true,
extensionDrawBuffers: HAS_EXTENSIONS && material.extensions.drawBuffers === true,
extensionShaderTextureLOD: HAS_EXTENSIONS && material.extensions.shaderTextureLOD === true,
extensionClipCullDistance: HAS_EXTENSIONS && material.extensions.clipCullDistance && extensions.has( 'WEBGL_clip_cull_distance' ),
extensionClipCullDistance: HAS_EXTENSIONS && material.extensions.clipCullDistance === true && extensions.has( 'WEBGL_clip_cull_distance' ),
extensionMultiDraw: HAS_EXTENSIONS && material.extensions.multiDraw === true && extensions.has( 'WEBGL_multi_draw' ),

rendererExtensionFragDepth: IS_WEBGL2 || extensions.has( 'EXT_frag_depth' ),
rendererExtensionDrawBuffers: IS_WEBGL2 || extensions.has( 'WEBGL_draw_buffers' ),
Expand Down