Commit b8e20a8b authored by Austin Eng's avatar Austin Eng Committed by Commit Bot

Roll src/third_party/dawn c5e06a5d9f0d..314fd3513d0 (1 commit)

https://dawn.googlesource.com/dawn.git/+log/c5e06a5d9f0d..314fd3513d0

git log c5e06a5d9f0d..314fd3513d0 --date=short --no-merges --format='%ad %ae %s'
2019-11-01 enga@chromium.org Update SetBindGroup dynamic offsets to uint32_t

Created with:
  gclient setdep -r src/third_party/dawn@314fd3513d04fdc7412df0b6c7defc7b79356e8d

This CL also updates dynamic offsets in Chromium to be 32-bit to match
the Dawn API change.

TBR=cwallez@chromium.org

Bug: None
Change-Id: I4c61f1e0e81bfe28c5b5a83cf87610e8d4ca6e14
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1894303Reviewed-by: default avatarAustin Eng <enga@chromium.org>
Commit-Queue: Austin Eng <enga@chromium.org>
Cr-Commit-Position: refs/heads/master@{#711788}
parent f1bc502b
...@@ -307,7 +307,7 @@ vars = { ...@@ -307,7 +307,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': 'c5e06a5d9f0d7f2088ff2382e7821e6dac690087', 'dawn_revision': '314fd3513d04fdc7412df0b6c7defc7b79356e8',
# 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.
......
...@@ -34,7 +34,7 @@ GPUComputePassEncoder::~GPUComputePassEncoder() { ...@@ -34,7 +34,7 @@ GPUComputePassEncoder::~GPUComputePassEncoder() {
void GPUComputePassEncoder::setBindGroup( void GPUComputePassEncoder::setBindGroup(
uint32_t index, uint32_t index,
GPUBindGroup* bindGroup, GPUBindGroup* bindGroup,
const Vector<uint64_t>& dynamicOffsets) { const Vector<uint32_t>& dynamicOffsets) {
GetProcs().computePassEncoderSetBindGroup( GetProcs().computePassEncoderSetBindGroup(
GetHandle(), index, bindGroup->GetHandle(), dynamicOffsets.size(), GetHandle(), index, bindGroup->GetHandle(), dynamicOffsets.size(),
dynamicOffsets.data()); dynamicOffsets.data());
......
...@@ -27,7 +27,7 @@ class GPUComputePassEncoder : public DawnObject<WGPUComputePassEncoder> { ...@@ -27,7 +27,7 @@ class GPUComputePassEncoder : public DawnObject<WGPUComputePassEncoder> {
// gpu_compute_pass_encoder.idl // gpu_compute_pass_encoder.idl
void setBindGroup(uint32_t index, void setBindGroup(uint32_t index,
GPUBindGroup* bindGroup, GPUBindGroup* bindGroup,
const Vector<uint64_t>& dynamicOffsets); const Vector<uint32_t>& dynamicOffsets);
void pushDebugGroup(String groupLabel); void pushDebugGroup(String groupLabel);
void popDebugGroup(); void popDebugGroup();
void insertDebugMarker(String markerLabel); void insertDebugMarker(String markerLabel);
......
...@@ -8,7 +8,7 @@ ...@@ -8,7 +8,7 @@
RuntimeEnabled=WebGPU RuntimeEnabled=WebGPU
] interface mixin GPUProgrammablePassEncoder { ] interface mixin GPUProgrammablePassEncoder {
void setBindGroup(unsigned long index, GPUBindGroup bindGroup, void setBindGroup(unsigned long index, GPUBindGroup bindGroup,
optional sequence<GPUBufferSize> dynamicOffsets = []); optional sequence<unsigned long> dynamicOffsets = []);
void pushDebugGroup(DOMString groupLabel); void pushDebugGroup(DOMString groupLabel);
void popDebugGroup(); void popDebugGroup();
......
...@@ -61,7 +61,7 @@ GPURenderBundleEncoder::~GPURenderBundleEncoder() { ...@@ -61,7 +61,7 @@ GPURenderBundleEncoder::~GPURenderBundleEncoder() {
void GPURenderBundleEncoder::setBindGroup( void GPURenderBundleEncoder::setBindGroup(
uint32_t index, uint32_t index,
GPUBindGroup* bindGroup, GPUBindGroup* bindGroup,
const Vector<uint64_t>& dynamicOffsets) { const Vector<uint32_t>& dynamicOffsets) {
GetProcs().renderBundleEncoderSetBindGroup( GetProcs().renderBundleEncoderSetBindGroup(
GetHandle(), index, bindGroup->GetHandle(), dynamicOffsets.size(), GetHandle(), index, bindGroup->GetHandle(), dynamicOffsets.size(),
dynamicOffsets.data()); dynamicOffsets.data());
......
...@@ -32,7 +32,7 @@ class GPURenderBundleEncoder : public DawnObject<WGPURenderBundleEncoder> { ...@@ -32,7 +32,7 @@ class GPURenderBundleEncoder : public DawnObject<WGPURenderBundleEncoder> {
// gpu_render_bundle_encoder.idl // gpu_render_bundle_encoder.idl
void setBindGroup(uint32_t index, void setBindGroup(uint32_t index,
GPUBindGroup* bindGroup, GPUBindGroup* bindGroup,
const Vector<uint64_t>& dynamicOffsets); const Vector<uint32_t>& dynamicOffsets);
void pushDebugGroup(String groupLabel); void pushDebugGroup(String groupLabel);
void popDebugGroup(); void popDebugGroup();
void insertDebugMarker(String markerLabel); void insertDebugMarker(String markerLabel);
......
...@@ -37,7 +37,7 @@ GPURenderPassEncoder::~GPURenderPassEncoder() { ...@@ -37,7 +37,7 @@ GPURenderPassEncoder::~GPURenderPassEncoder() {
void GPURenderPassEncoder::setBindGroup( void GPURenderPassEncoder::setBindGroup(
uint32_t index, uint32_t index,
GPUBindGroup* bindGroup, GPUBindGroup* bindGroup,
const Vector<uint64_t>& dynamicOffsets) { const Vector<uint32_t>& dynamicOffsets) {
GetProcs().renderPassEncoderSetBindGroup( GetProcs().renderPassEncoderSetBindGroup(
GetHandle(), index, bindGroup->GetHandle(), dynamicOffsets.size(), GetHandle(), index, bindGroup->GetHandle(), dynamicOffsets.size(),
dynamicOffsets.data()); dynamicOffsets.data());
......
...@@ -30,7 +30,7 @@ class GPURenderPassEncoder : public DawnObject<WGPURenderPassEncoder> { ...@@ -30,7 +30,7 @@ class GPURenderPassEncoder : public DawnObject<WGPURenderPassEncoder> {
// gpu_render_pass_encoder.idl // gpu_render_pass_encoder.idl
void setBindGroup(uint32_t index, void setBindGroup(uint32_t index,
GPUBindGroup* bindGroup, GPUBindGroup* bindGroup,
const Vector<uint64_t>& dynamicOffsets); const Vector<uint32_t>& dynamicOffsets);
void pushDebugGroup(String groupLabel); void pushDebugGroup(String groupLabel);
void popDebugGroup(); void popDebugGroup();
void insertDebugMarker(String markerLabel); void insertDebugMarker(String markerLabel);
......
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