Commit 47764cdb authored by Corentin Wallez's avatar Corentin Wallez Committed by Commit Bot

Roll src/third_party/dawn/ a900ccebc..f60522f5a (13 commits)

Also implements GPUTextureViewDescriptor.aspect and
GPUBindGroupLayoutBinding.textureDimension that were added to Dawn in
this roll.

https://dawn.googlesource.com/dawn.git/+log/a900ccebcf42..f60522f5a467

$ git log a900ccebc..f60522f5a --date=short --no-merges --format='%ad %ae %s'
2019-09-10 digit [fuchsia] Fix Chromium build.
2019-09-10 digit [fuchsia] Implement external semaphore and memory support.
2019-09-10 cwallez Implement BGLBinding::textureDimension
2019-09-10 cwallez Add TextureViewDescriptor.aspect.
2019-09-10 cwallez Implement debug markers and groups for CommandEncoder
2019-09-09 enga Metal: Support setting bind groups before pipeline to match WebGPU semantics
2019-09-09 enga D3D12: Add IndexBufferTracker
2019-09-09 enga D3D12: Factor SetVertexBuffer tracking to match other tracking classes
2019-09-09 digit [fuchsia] Add headers containing extra vulkan definitions.
2019-09-09 digit Enable Vulkan for Chromium Fuchsia build.
2019-09-09 enga dawn_wire: Fix leak in Server::DoDevicePopErrorScope
2019-09-07 hao.x.li Align the size of Uniform and Storage buffer to 16 bytes in Metal
2019-09-05 bryan.bernhart Resource Management 6: VK support for resource allocation.

Created with:
  roll-dep src/third_party/dawn

Change-Id: I631197c99bb2847175731627a1d808fa5b85a840
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1795762Reviewed-by: default avatarAustin Eng <enga@chromium.org>
Commit-Queue: Corentin Wallez <cwallez@chromium.org>
Cr-Commit-Position: refs/heads/master@{#695214}
parent bef6d196
...@@ -297,7 +297,7 @@ vars = { ...@@ -297,7 +297,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': 'a900ccebcf428c99184ca44a3fad6030b2e43fc7', 'dawn_revision': 'f60522f5a4670f98e6d459a677122a2d4f89f3ad',
# 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.
......
...@@ -665,6 +665,22 @@ DawnFrontFace AsDawnEnum<DawnFrontFace>(const WTF::String& webgpu_enum) { ...@@ -665,6 +665,22 @@ DawnFrontFace AsDawnEnum<DawnFrontFace>(const WTF::String& webgpu_enum) {
return DAWN_FRONT_FACE_FORCE32; return DAWN_FRONT_FACE_FORCE32;
} }
template <>
DawnTextureAspect AsDawnEnum<DawnTextureAspect>(
const WTF::String& webgpu_enum) {
if (webgpu_enum == "all") {
return DAWN_TEXTURE_ASPECT_ALL;
}
if (webgpu_enum == "stencil-only") {
return DAWN_TEXTURE_ASPECT_STENCIL_ONLY;
}
if (webgpu_enum == "depth-only") {
return DAWN_TEXTURE_ASPECT_DEPTH_ONLY;
}
NOTREACHED();
return DAWN_TEXTURE_ASPECT_FORCE32;
}
DawnColor AsDawnType(const GPUColor* webgpu_color) { DawnColor AsDawnType(const GPUColor* webgpu_color) {
DCHECK(webgpu_color); DCHECK(webgpu_color);
......
...@@ -18,6 +18,8 @@ DawnBindGroupLayoutBinding AsDawnType( ...@@ -18,6 +18,8 @@ DawnBindGroupLayoutBinding AsDawnType(
dawn_binding.type = AsDawnEnum<DawnBindingType>(webgpu_binding->type()); dawn_binding.type = AsDawnEnum<DawnBindingType>(webgpu_binding->type());
dawn_binding.visibility = dawn_binding.visibility =
AsDawnEnum<DawnShaderStage>(webgpu_binding->visibility()); AsDawnEnum<DawnShaderStage>(webgpu_binding->visibility());
dawn_binding.textureDimension =
AsDawnEnum<DawnTextureViewDimension>(webgpu_binding->textureDimension());
dawn_binding.textureComponentType = AsDawnEnum<DawnTextureComponentType>( dawn_binding.textureComponentType = AsDawnEnum<DawnTextureComponentType>(
webgpu_binding->textureComponentType()); webgpu_binding->textureComponentType());
dawn_binding.multisampled = webgpu_binding->multisampled(); dawn_binding.multisampled = webgpu_binding->multisampled();
......
...@@ -8,6 +8,7 @@ dictionary GPUBindGroupLayoutBinding { ...@@ -8,6 +8,7 @@ dictionary GPUBindGroupLayoutBinding {
required unsigned long binding; required unsigned long binding;
required GPUShaderStageFlags visibility; required GPUShaderStageFlags visibility;
required GPUBindingType type; required GPUBindingType type;
GPUTextureViewDimension textureDimension = "2d";
GPUTextureComponentType textureComponentType = "float"; GPUTextureComponentType textureComponentType = "float";
boolean multisampled = false; boolean multisampled = false;
boolean dynamic = false; boolean dynamic = false;
......
...@@ -44,6 +44,7 @@ DawnTextureViewDescriptor AsDawnType( ...@@ -44,6 +44,7 @@ DawnTextureViewDescriptor AsDawnType(
dawn_desc.mipLevelCount = webgpu_desc->mipLevelCount(); dawn_desc.mipLevelCount = webgpu_desc->mipLevelCount();
dawn_desc.baseArrayLayer = webgpu_desc->baseArrayLayer(); dawn_desc.baseArrayLayer = webgpu_desc->baseArrayLayer();
dawn_desc.arrayLayerCount = webgpu_desc->arrayLayerCount(); dawn_desc.arrayLayerCount = webgpu_desc->arrayLayerCount();
dawn_desc.aspect = AsDawnEnum<DawnTextureAspect>(webgpu_desc->aspect());
return dawn_desc; return dawn_desc;
} }
......
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