encounter/dawn-cmake
1
0
Fork 0
mirror of https://github.com/encounter/dawn-cmake.git synced 2025-12-17 17:05:31 +00:00
Code Issues Packages Projects Releases Wiki Activity

Add setIndexBufferWithFormat method

Browse Source 
First step of a multi-part change to bring the setIndexBuffer
method up-to-date with the current WebGPU spec. This change
preserves the previous setIndexBuffer semantics for backwards
compatibility until developers have been notified and given
a grace period to transition to the new signature.

BUG=dawn:502
Change-Id: Ia8c665639494d244f52296ceadaedb320fa6c985
Reviewed-on: https://dawn-review.googlesource.com/c/dawn/+/27182
Commit-Queue: Brandon Jones <bajones@chromium.org>
Reviewed-by: Kai Ninomiya <kainino@chromium.org>
This commit is contained in:
Brandon Jones
2020-08-27 01:13:35 +00:00
committed by Commit Bot service account
parent 320c6c87b2
commit 8575cb3ec7
27 changed files with 492 additions and 106 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
src/dawn_native/opengl/CommandBufferGL.cpp
View File

@@ -982,6 +982,7 @@ namespace dawn_native { namespace opengl {
RenderPipeline* lastPipeline = nullptr;
uint64_t indexBufferBaseOffset = 0;
wgpu::IndexFormat indexBufferFormat;
VertexStateBufferBindingTracker vertexStateBufferBindingTracker;
BindGroupTracker bindGroupTracker = {};
@@ -1011,14 +1012,19 @@ namespace dawn_native { namespace opengl {
vertexStateBufferBindingTracker.Apply(gl);
bindGroupTracker.Apply(gl);
wgpu::IndexFormat indexFormat =
lastPipeline->GetVertexStateDescriptor()->indexFormat;
// If a index format was specified in setIndexBuffer always use it.
wgpu::IndexFormat indexFormat = indexBufferFormat;
if (indexFormat == wgpu::IndexFormat::Undefined) {
// Otherwise use the pipeline's index format.
// TODO(crbug.com/dawn/502): This path is deprecated.
indexFormat = lastPipeline->GetVertexStateDescriptor()->indexFormat;
}
size_t formatSize = IndexFormatSize(indexFormat);
GLenum formatType = IndexFormatType(indexFormat);
if (draw->firstInstance > 0) {
gl.DrawElementsInstancedBaseVertexBaseInstance(
lastPipeline->GetGLPrimitiveTopology(), draw->indexCount, formatType,
lastPipeline->GetGLPrimitiveTopology(), draw->indexCount,
IndexFormatType(indexFormat),
reinterpret_cast<void*>(draw->firstIndex * formatSize +
indexBufferBaseOffset),
draw->instanceCount, draw->baseVertex, draw->firstInstance);
@@ -1027,7 +1033,7 @@ namespace dawn_native { namespace opengl {
if (draw->baseVertex != 0) {
gl.DrawElementsInstancedBaseVertex(
lastPipeline->GetGLPrimitiveTopology(), draw->indexCount,
formatType,
IndexFormatType(indexFormat),
reinterpret_cast<void*>(draw->firstIndex * formatSize +
indexBufferBaseOffset),
draw->instanceCount, draw->baseVertex);
@@ -1035,7 +1041,7 @@ namespace dawn_native { namespace opengl {
// This branch is only needed on OpenGL < 3.2; ES < 3.2
gl.DrawElementsInstanced(
lastPipeline->GetGLPrimitiveTopology(), draw->indexCount,
formatType,
IndexFormatType(indexFormat),
reinterpret_cast<void*>(draw->firstIndex * formatSize +
indexBufferBaseOffset),
draw->instanceCount);
@@ -1064,16 +1070,20 @@ namespace dawn_native { namespace opengl {
vertexStateBufferBindingTracker.Apply(gl);
bindGroupTracker.Apply(gl);
wgpu::IndexFormat indexFormat =
lastPipeline->GetVertexStateDescriptor()->indexFormat;
GLenum formatType = IndexFormatType(indexFormat);
uint64_t indirectBufferOffset = draw->indirectOffset;
Buffer* indirectBuffer = ToBackend(draw->indirectBuffer.Get());
// If a index format was specified in setIndexBuffer always use it.
wgpu::IndexFormat indexFormat = indexBufferFormat;
if (indexFormat == wgpu::IndexFormat::Undefined) {
// Otherwise use the pipeline's index format.
// TODO(crbug.com/dawn/502): This path is deprecated.
indexFormat = lastPipeline->GetVertexStateDescriptor()->indexFormat;
}
gl.BindBuffer(GL_DRAW_INDIRECT_BUFFER, indirectBuffer->GetHandle());
gl.DrawElementsIndirect(
lastPipeline->GetGLPrimitiveTopology(), formatType,
lastPipeline->GetGLPrimitiveTopology(), IndexFormatType(indexFormat),
reinterpret_cast<void*>(static_cast<intptr_t>(indirectBufferOffset)));
break;
}
@@ -1110,6 +1120,9 @@ namespace dawn_native { namespace opengl {
case Command::SetIndexBuffer: {
SetIndexBufferCmd* cmd = iter->NextCommand<SetIndexBufferCmd>();
// TODO(crbug.com/dawn/502): Once setIndexBuffer is required to specify an
// index buffer format store as an GLenum.
indexBufferFormat = cmd->format;
indexBufferBaseOffset = cmd->offset;
vertexStateBufferBindingTracker.OnSetIndexBuffer(cmd->buffer.Get());
break;