Commit db5b6c7b authored by François Beaufort's avatar François Beaufort Committed by Commit Bot

Roll src/third_party/dawn/ e16a901fb..91b2142ee (1 commit)

https://dawn.googlesource.com/dawn.git/+log/e16a901fb853..91b2142ee44d

$ git log e16a901fb..91b2142ee --date=short --no-merges --format='%ad %ae %s'
2019-10-10 beaufort.francois Change setVertexBuffers to setVertexBuffer

Created with:
  roll-dep src/third_party/dawn

Bug: 877147
Change-Id: Ia4bb0d2e0aa2e3f41c74c7a24e509198214f38b7
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1848387Reviewed-by: default avatarCorentin Wallez <cwallez@chromium.org>
Commit-Queue: François Beaufort <beaufort.francois@gmail.com>
Cr-Commit-Position: refs/heads/master@{#704531}
parent 651f5a29
...@@ -302,7 +302,7 @@ vars = { ...@@ -302,7 +302,7 @@ vars = {
# Three lines of non-changing comments so that # Three lines of non-changing comments so that
# the commit queue can handle CLs rolling feed # the commit queue can handle CLs rolling feed
# and whatever else without interference from each other. # and whatever else without interference from each other.
'dawn_revision': 'e16a901fb85351a93b224ea1b7b6d603a07fd1cc', 'dawn_revision': '91b2142ee44d3e4eb3bafcbc8eec4d196006c9d3',
# Three lines of non-changing comments so that # Three lines of non-changing comments so that
# the commit queue can handle CLs rolling feed # the commit queue can handle CLs rolling feed
# and whatever else without interference from each other. # and whatever else without interference from each other.
......
...@@ -91,22 +91,11 @@ void GPURenderBundleEncoder::setIndexBuffer(GPUBuffer* buffer, ...@@ -91,22 +91,11 @@ void GPURenderBundleEncoder::setIndexBuffer(GPUBuffer* buffer,
offset); offset);
} }
void GPURenderBundleEncoder::setVertexBuffers( void GPURenderBundleEncoder::setVertexBuffer(uint32_t slot,
uint32_t startSlot, const GPUBuffer* buffer,
const HeapVector<Member<GPUBuffer>>& buffers, uint64_t offset) {
const Vector<uint64_t>& offsets, GetProcs().renderBundleEncoderSetVertexBuffer(GetHandle(), slot,
ExceptionState& exception_state) { buffer->GetHandle(), offset);
if (buffers.size() != offsets.size()) {
exception_state.ThrowRangeError(
"buffers array and offsets array must be the same length");
return;
}
std::unique_ptr<DawnBuffer[]> dawn_buffers = AsDawnType(buffers);
GetProcs().renderBundleEncoderSetVertexBuffers(
GetHandle(), startSlot, buffers.size(), dawn_buffers.get(),
offsets.data());
} }
void GPURenderBundleEncoder::draw(uint32_t vertexCount, void GPURenderBundleEncoder::draw(uint32_t vertexCount,
......
...@@ -39,10 +39,7 @@ class GPURenderBundleEncoder : public DawnObject<DawnRenderBundleEncoder> { ...@@ -39,10 +39,7 @@ class GPURenderBundleEncoder : public DawnObject<DawnRenderBundleEncoder> {
void setPipeline(GPURenderPipeline* pipeline); void setPipeline(GPURenderPipeline* pipeline);
void setIndexBuffer(GPUBuffer* buffer, uint64_t offset); void setIndexBuffer(GPUBuffer* buffer, uint64_t offset);
void setVertexBuffers(uint32_t startSlot, void setVertexBuffer(uint32_t slot, const GPUBuffer* buffer, uint64_t offset);
const HeapVector<Member<GPUBuffer>>& buffers,
const Vector<uint64_t>& offsets,
ExceptionState& exception_state);
void draw(uint32_t vertexCount, void draw(uint32_t vertexCount,
uint32_t instanceCount, uint32_t instanceCount,
uint32_t firstVertex, uint32_t firstVertex,
......
...@@ -10,9 +10,9 @@ ...@@ -10,9 +10,9 @@
void setPipeline(GPURenderPipeline pipeline); void setPipeline(GPURenderPipeline pipeline);
void setIndexBuffer(GPUBuffer buffer, optional GPUBufferSize offset = 0); void setIndexBuffer(GPUBuffer buffer, optional GPUBufferSize offset = 0);
[RaisesException] void setVertexBuffers(unsigned long startSlot, void setVertexBuffer(unsigned long slot,
sequence<GPUBuffer> buffers, GPUBuffer buffer,
sequence<GPUBufferSize> offsets); optional GPUBufferSize offset = 0);
void draw(unsigned long vertexCount, unsigned long instanceCount, void draw(unsigned long vertexCount, unsigned long instanceCount,
unsigned long firstVertex, unsigned long firstVertex,
......
...@@ -98,22 +98,11 @@ void GPURenderPassEncoder::setIndexBuffer(GPUBuffer* buffer, uint64_t offset) { ...@@ -98,22 +98,11 @@ void GPURenderPassEncoder::setIndexBuffer(GPUBuffer* buffer, uint64_t offset) {
offset); offset);
} }
void GPURenderPassEncoder::setVertexBuffers( void GPURenderPassEncoder::setVertexBuffer(uint32_t slot,
uint32_t startSlot, const GPUBuffer* buffer,
const HeapVector<Member<GPUBuffer>>& buffers, const uint64_t offset) {
const Vector<uint64_t>& offsets, GetProcs().renderPassEncoderSetVertexBuffer(GetHandle(), slot,
ExceptionState& exception_state) { buffer->GetHandle(), offset);
if (buffers.size() != offsets.size()) {
exception_state.ThrowRangeError(
"buffers array and offsets array must be the same length");
return;
}
std::unique_ptr<DawnBuffer[]> dawn_buffers = AsDawnType(buffers);
GetProcs().renderPassEncoderSetVertexBuffers(
GetHandle(), startSlot, buffers.size(), dawn_buffers.get(),
offsets.data());
} }
void GPURenderPassEncoder::draw(uint32_t vertexCount, void GPURenderPassEncoder::draw(uint32_t vertexCount,
......
...@@ -47,10 +47,9 @@ class GPURenderPassEncoder : public DawnObject<DawnRenderPassEncoder> { ...@@ -47,10 +47,9 @@ class GPURenderPassEncoder : public DawnObject<DawnRenderPassEncoder> {
float maxDepth); float maxDepth);
void setScissorRect(uint32_t x, uint32_t y, uint32_t width, uint32_t height); void setScissorRect(uint32_t x, uint32_t y, uint32_t width, uint32_t height);
void setIndexBuffer(GPUBuffer* buffer, uint64_t offset); void setIndexBuffer(GPUBuffer* buffer, uint64_t offset);
void setVertexBuffers(uint32_t startSlot, void setVertexBuffer(uint32_t slot,
const HeapVector<Member<GPUBuffer>>& buffers, const GPUBuffer* buffer,
const Vector<uint64_t>& offsets, const uint64_t offset);
ExceptionState& exception_state);
void draw(uint32_t vertexCount, void draw(uint32_t vertexCount,
uint32_t instanceCount, uint32_t instanceCount,
uint32_t firstVertex, uint32_t firstVertex,
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment