Commit 74cefac7 authored by John Budorick's avatar John Budorick Committed by Commit Bot

Revert "Roll src/third_party/dawn/ 1093c4de2..c57b18020 (2 commits)"

This reverts commit 8af63978.

Reason for revert: suspected of causing compile failure in https://ci.chromium.org/p/chromium/builders/ci/mac-archive-dbg/3670

Original change's description:
> Roll src/third_party/dawn/ 1093c4de2..c57b18020 (2 commits)
> 
> https://dawn.googlesource.com/dawn.git/+log/1093c4de2cfa..c57b1802088a
> 
> $ git log 1093c4de2..c57b18020 --date=short --no-merges --format='%ad %ae %s'
> 2019-10-15 cwallez Add dawnGetProcAddress.
> 2019-10-15 cwallez Split the libdawn target in components with a single purpose.
> 
> Created with:
>   roll-dep src/third_party/dawn
> 
> BUG=dawn:22
> 
> Change-Id: Ibc6a154143d98e2c9a5d770e766388e43d05b5ab
> Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1863013
> Reviewed-by: Kenneth Russell <kbr@chromium.org>
> Commit-Queue: Corentin Wallez <cwallez@chromium.org>
> Cr-Commit-Position: refs/heads/master@{#705998}

TBR=kbr@chromium.org,cwallez@chromium.org

Change-Id: I621465bddca007213307e862b68192953eac49ee
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Bug: dawn:22
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1862991Reviewed-by: default avatarJohn Budorick <jbudorick@chromium.org>
Commit-Queue: John Budorick <jbudorick@chromium.org>
Cr-Commit-Position: refs/heads/master@{#706019}
parent ffc4470f
...@@ -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': 'c57b1802088a16065abb7897eb835cd277eb5ee2', 'dawn_revision': '1093c4de2cfad715f0da1460aafbf88f47bd7bb1',
# 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.
......
...@@ -6,7 +6,6 @@ ...@@ -6,7 +6,6 @@
#define GPU_COMMAND_BUFFER_CLIENT_WEBGPU_INTERFACE_H_ #define GPU_COMMAND_BUFFER_CLIENT_WEBGPU_INTERFACE_H_
#include <dawn/dawn.h> #include <dawn/dawn.h>
#include <dawn/dawn_proc_table.h>
#include "gpu/command_buffer/client/interface_base.h" #include "gpu/command_buffer/client/interface_base.h"
#include "gpu/command_buffer/common/webgpu_cmd_enums.h" #include "gpu/command_buffer/common/webgpu_cmd_enums.h"
......
...@@ -29,7 +29,6 @@ ...@@ -29,7 +29,6 @@
#include "ui/gl/init/gl_factory.h" #include "ui/gl/init/gl_factory.h"
#if BUILDFLAG(USE_DAWN) #if BUILDFLAG(USE_DAWN)
#include <dawn/dawn_proc.h>
#include <dawn/dawncpp.h> #include <dawn/dawncpp.h>
#include <dawn_native/DawnNative.h> #include <dawn_native/DawnNative.h>
#endif // BUILDFLAG(USE_DAWN) #endif // BUILDFLAG(USE_DAWN)
...@@ -268,7 +267,7 @@ TEST_F(SharedImageBackingFactoryIOSurfaceTest, Dawn_SkiaGL) { ...@@ -268,7 +267,7 @@ TEST_F(SharedImageBackingFactoryIOSurfaceTest, Dawn_SkiaGL) {
dawn::Device device = dawn::Device::Acquire(adapter_it->CreateDevice()); dawn::Device device = dawn::Device::Acquire(adapter_it->CreateDevice());
DawnProcTable procs = dawn_native::GetProcs(); DawnProcTable procs = dawn_native::GetProcs();
dawnProcSetProcs(&procs); dawnSetProcs(&procs);
// Create a backing using mailbox. // Create a backing using mailbox.
auto mailbox = Mailbox::GenerateForSharedImage(); auto mailbox = Mailbox::GenerateForSharedImage();
...@@ -356,7 +355,7 @@ TEST_F(SharedImageBackingFactoryIOSurfaceTest, Dawn_SkiaGL) { ...@@ -356,7 +355,7 @@ TEST_F(SharedImageBackingFactoryIOSurfaceTest, Dawn_SkiaGL) {
// Shut down Dawn // Shut down Dawn
device = dawn::Device(); device = dawn::Device();
dawnProcSetProcs(nullptr); dawnSetProcs(nullptr);
skia_representation.reset(); skia_representation.reset();
factory_ref.reset(); factory_ref.reset();
......
...@@ -6,7 +6,6 @@ ...@@ -6,7 +6,6 @@
#define GPU_COMMAND_BUFFER_SERVICE_SHARED_IMAGE_REPRESENTATION_H_ #define GPU_COMMAND_BUFFER_SERVICE_SHARED_IMAGE_REPRESENTATION_H_
#include <dawn/dawn.h> #include <dawn/dawn.h>
#include <dawn/dawn_proc_table.h>
#include "base/callback_helpers.h" #include "base/callback_helpers.h"
#include "build/build_config.h" #include "build/build_config.h"
......
...@@ -5,7 +5,6 @@ ...@@ -5,7 +5,6 @@
#include "gpu/command_buffer/tests/webgpu_test.h" #include "gpu/command_buffer/tests/webgpu_test.h"
#include <dawn/dawn.h> #include <dawn/dawn.h>
#include <dawn/dawn_proc.h>
#include "base/test/test_simple_task_runner.h" #include "base/test/test_simple_task_runner.h"
#include "build/build_config.h" #include "build/build_config.h"
...@@ -82,7 +81,7 @@ void WebGPUTest::Initialize(const Options& options) { ...@@ -82,7 +81,7 @@ void WebGPUTest::Initialize(const Options& options) {
webgpu()->RequestAdapter(webgpu::PowerPreference::kHighPerformance); webgpu()->RequestAdapter(webgpu::PowerPreference::kHighPerformance);
DawnProcTable procs = webgpu()->GetProcs(); DawnProcTable procs = webgpu()->GetProcs();
dawnProcSetProcs(&procs); dawnSetProcs(&procs);
} }
webgpu::WebGPUInterface* WebGPUTest::webgpu() const { webgpu::WebGPUInterface* WebGPUTest::webgpu() const {
......
...@@ -6,7 +6,6 @@ ...@@ -6,7 +6,6 @@
#define THIRD_PARTY_BLINK_RENDERER_MODULES_WEBGPU_DAWN_OBJECT_H_ #define THIRD_PARTY_BLINK_RENDERER_MODULES_WEBGPU_DAWN_OBJECT_H_
#include <dawn/dawn.h> #include <dawn/dawn.h>
#include <dawn/dawn_proc_table.h>
#include "base/memory/scoped_refptr.h" #include "base/memory/scoped_refptr.h"
#include "third_party/blink/renderer/platform/bindings/script_wrappable.h" #include "third_party/blink/renderer/platform/bindings/script_wrappable.h"
......
...@@ -6,7 +6,6 @@ ...@@ -6,7 +6,6 @@
#define THIRD_PARTY_BLINK_RENDERER_PLATFORM_GRAPHICS_GPU_DAWN_CONTROL_CLIENT_HOLDER_H_ #define THIRD_PARTY_BLINK_RENDERER_PLATFORM_GRAPHICS_GPU_DAWN_CONTROL_CLIENT_HOLDER_H_
#include <dawn/dawn.h> #include <dawn/dawn.h>
#include <dawn/dawn_proc_table.h>
#include "third_party/blink/public/platform/web_graphics_context_3d_provider.h" #include "third_party/blink/public/platform/web_graphics_context_3d_provider.h"
#include "third_party/blink/renderer/platform/platform_export.h" #include "third_party/blink/renderer/platform/platform_export.h"
......
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