Commit 55d1462c authored by Corentin Wallez's avatar Corentin Wallez Committed by Commit Bot

Roll src/third_party/dawn/ 1fdcb16b6..04863c42b (2 commits)

This also contains a small amount of renames from Dawn to WGPU that
were missing but hidden by the fact that DawnNative.h included dawn.h
instead of webgpu.h (which is fixed in this roll).

https://dawn.googlesource.com/dawn.git/+log/1fdcb16b6995..04863c42bedd

$ git log 1fdcb16b6..04863c42b --date=short --no-merges --format='%ad %ae %s'
2019-10-25 cwallez Make examples and utils use webgpu.h
2019-10-24 cwallez Make dawn_native public headers and dawn_wsi use webgpu.h

Created with:
  roll-dep src/third_party/dawn


TBR=bajones@chromium.org

Bug: dawn:22
Change-Id: I69cf8050a1b9dbe9a4723d509927a7407b05ac1f
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1879915Reviewed-by: default avatarCorentin Wallez <cwallez@chromium.org>
Reviewed-by: default avatarBrandon Jones <bajones@chromium.org>
Commit-Queue: Corentin Wallez <cwallez@chromium.org>
Cr-Commit-Position: refs/heads/master@{#709544}
parent e4b32624
...@@ -310,7 +310,7 @@ vars = { ...@@ -310,7 +310,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': '1fdcb16b6995c54c645f17566d019ebf46229fd0', 'dawn_revision': '04863c42beddde4b4e8a76884094101c0ba7e1cc',
# 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.
......
...@@ -47,7 +47,7 @@ ExternalVkImageDawnRepresentation::~ExternalVkImageDawnRepresentation() { ...@@ -47,7 +47,7 @@ ExternalVkImageDawnRepresentation::~ExternalVkImageDawnRepresentation() {
dawn_procs_.deviceRelease(device_); dawn_procs_.deviceRelease(device_);
} }
DawnTexture ExternalVkImageDawnRepresentation::BeginAccess( WGPUTexture ExternalVkImageDawnRepresentation::BeginAccess(
WGPUTextureUsage usage) { WGPUTextureUsage usage) {
std::vector<SemaphoreHandle> handles; std::vector<SemaphoreHandle> handles;
......
...@@ -378,7 +378,7 @@ class SharedImageBackingIOSurface : public SharedImageBacking { ...@@ -378,7 +378,7 @@ class SharedImageBackingIOSurface : public SharedImageBacking {
const gfx::ColorSpace& color_space, const gfx::ColorSpace& color_space,
uint32_t usage, uint32_t usage,
base::ScopedCFTypeRef<IOSurfaceRef> io_surface, base::ScopedCFTypeRef<IOSurfaceRef> io_surface,
base::Optional<DawnTextureFormat> dawn_format, base::Optional<WGPUTextureFormat> dawn_format,
size_t estimated_size) size_t estimated_size)
: SharedImageBacking(mailbox, : SharedImageBacking(mailbox,
format, format,
...@@ -477,7 +477,7 @@ class SharedImageBackingIOSurface : public SharedImageBacking { ...@@ -477,7 +477,7 @@ class SharedImageBackingIOSurface : public SharedImageBacking {
std::unique_ptr<SharedImageRepresentationDawn> ProduceDawn( std::unique_ptr<SharedImageRepresentationDawn> ProduceDawn(
SharedImageManager* manager, SharedImageManager* manager,
MemoryTypeTracker* tracker, MemoryTypeTracker* tracker,
DawnDevice device) override { WGPUDevice device) override {
#if BUILDFLAG(USE_DAWN) #if BUILDFLAG(USE_DAWN)
if (!dawn_format_) { if (!dawn_format_) {
LOG(ERROR) << "Format not supported for Dawn"; LOG(ERROR) << "Format not supported for Dawn";
...@@ -561,7 +561,7 @@ class SharedImageBackingIOSurface : public SharedImageBacking { ...@@ -561,7 +561,7 @@ class SharedImageBackingIOSurface : public SharedImageBacking {
} }
base::ScopedCFTypeRef<IOSurfaceRef> io_surface_; base::ScopedCFTypeRef<IOSurfaceRef> io_surface_;
base::Optional<DawnTextureFormat> dawn_format_; base::Optional<WGPUTextureFormat> dawn_format_;
base::scoped_nsprotocol<id<MTLTexture>> mtl_texture_; base::scoped_nsprotocol<id<MTLTexture>> mtl_texture_;
bool is_cleared_ = false; bool is_cleared_ = false;
......
...@@ -292,7 +292,7 @@ TEST_F(SharedImageBackingFactoryIOSurfaceTest, Dawn_SkiaGL) { ...@@ -292,7 +292,7 @@ TEST_F(SharedImageBackingFactoryIOSurfaceTest, Dawn_SkiaGL) {
// Clear the shared image to green using Dawn. // Clear the shared image to green using Dawn.
{ {
wgpu::Texture texture = wgpu::Texture::Acquire( wgpu::Texture texture = wgpu::Texture::Acquire(
dawn_representation->BeginAccess(DAWN_TEXTURE_USAGE_OUTPUT_ATTACHMENT)); dawn_representation->BeginAccess(WGPUTextureUsage_OutputAttachment));
wgpu::RenderPassColorAttachmentDescriptor color_desc; wgpu::RenderPassColorAttachmentDescriptor color_desc;
color_desc.attachment = texture.CreateView(); color_desc.attachment = texture.CreateView();
......
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