Import Cobalt 25.master.0.1033342
diff --git a/third_party/skia/src/gpu/dawn/GrDawnTexture.h b/third_party/skia/src/gpu/dawn/GrDawnTexture.h
index cc69fd7..0a7d64a 100644
--- a/third_party/skia/src/gpu/dawn/GrDawnTexture.h
+++ b/third_party/skia/src/gpu/dawn/GrDawnTexture.h
@@ -9,19 +9,19 @@
#define GrDawnTexture_DEFINED
#include "include/gpu/GrTexture.h"
-#include "dawn/dawncpp.h"
+#include "dawn/webgpu_cpp.h"
class GrDawnGpu;
struct GrDawnImageInfo;
class GrDawnTexture : public GrTexture {
public:
- static sk_sp<GrDawnTexture> Make(GrDawnGpu*, const SkISize& size, GrPixelConfig config,
- dawn::TextureFormat format, GrRenderable, int sampleCnt,
+ static sk_sp<GrDawnTexture> Make(GrDawnGpu*, const SkISize& dimensions, GrPixelConfig config,
+ wgpu::TextureFormat format, GrRenderable, int sampleCnt,
SkBudgeted, int mipLevels, GrMipMapsStatus);
- static sk_sp<GrDawnTexture> MakeWrapped(GrDawnGpu*, const SkISize& size, GrPixelConfig config,
- GrRenderable, int sampleCnt,
+ static sk_sp<GrDawnTexture> MakeWrapped(GrDawnGpu*, const SkISize& dimensions,
+ GrPixelConfig config, GrRenderable, int sampleCnt,
GrMipMapsStatus, GrWrapCacheable,
const GrDawnImageInfo&);
@@ -32,15 +32,15 @@
void textureParamsModified() override {}
- void upload(const GrMipLevel texels[], int mipLevels, dawn::CommandEncoder copyEncoder);
+ void upload(const GrMipLevel texels[], int mipLevels, wgpu::CommandEncoder copyEncoder);
void upload(const GrMipLevel texels[], int mipLevels, const SkIRect& dstRect,
- dawn::CommandEncoder copyEncoder);
+ wgpu::CommandEncoder copyEncoder);
- dawn::Texture texture() const { return fInfo.fTexture; }
- dawn::TextureView textureView() const { return fTextureView; }
+ wgpu::Texture texture() const { return fInfo.fTexture; }
+ wgpu::TextureView textureView() const { return fTextureView; }
protected:
- GrDawnTexture(GrDawnGpu*, const SkISize& size, GrPixelConfig config,
- dawn::TextureView, const GrDawnImageInfo&, GrMipMapsStatus);
+ GrDawnTexture(GrDawnGpu*, const SkISize& dimensions, GrPixelConfig config, wgpu::TextureView,
+ const GrDawnImageInfo&, GrMipMapsStatus);
GrDawnGpu* getDawnGpu() const;
@@ -55,7 +55,7 @@
GrDawnTexture(GrDawnGpu*, const GrSurfaceDesc&, const GrDawnImageInfo&, GrMipMapsStatus);
GrDawnImageInfo fInfo;
- dawn::TextureView fTextureView;
+ wgpu::TextureView fTextureView;
typedef GrTexture INHERITED;
};