react-native-wgpu 0.2.10 → 0.3.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-native-wgpu",
-  "version": "0.2.10",
+  "version": "0.3.1",
   "description": "React Native WebGPU",
   "main": "lib/commonjs/index",
   "module": "lib/module/index",
@@ -10,6 +10,7 @@
   "files": [
     "src/**",
     "lib/**",
+    "!**/__tests__/**",
     "android/build.gradle",
     "android/CMakeLists.txt",
     "android/cpp/**",
@@ -19,6 +20,7 @@
     "libs/**",
     "*.podspec"
   ],
+  "dawn": "chromium/7472",
   "scripts": {
     "test": "NODE_OPTIONS='--experimental-require-module' jest -i",
     "test:ref": "REFERENCE=true NODE_OPTIONS='--experimental-require-module' jest -i",
@@ -32,8 +34,7 @@
     "clang-format-android": "find android/cpp/ -iname \"*.h\" -o -iname \"*.m\" -o -iname \"*.cpp\" | xargs clang-format -i",
     "clang-format-common": "find cpp/rnwgpu -iname \"*.h\" -o -iname \"*.m\" -o -iname \"*.cpp\" | xargs clang-format -i",
     "cpplint": "cpplint --linelength=230 --filter=-legal/copyright,-whitespace/indent,-whitespace/comments,-whitespace/ending_newline,-build/include_order,-runtime/references,-readability/todo,-whitespace/blank_line,-whitespace/todo,-runtime/int,-build/c++11,-whitespace/parens --exclude=example --exclude=android/.cxx --exclude=cpp/webgpu --exclude=cpp/dawn --exclude=ios --exclude=android/build --exclude=node_modules --recursive .",
-    "download-artifacts": "tsx scripts/build/download-artifacts.ts && yarn copy-artifacts",
-    "copy-artifacts": "tsx scripts/build/copy-artifacts.ts",
+    "install-dawn": "tsx scripts/install-dawn.ts",
     "codegen": "tsx scripts/codegen/codegen.ts && yarn clang-format"
   },
   "keywords": [

package/react-native-wgpu.podspec

@@ -31,21 +31,17 @@ Pod::Spec.new do |s|
     install_modules_dependencies(s)
   else
     s.dependency "React-Core"
-
-    # Don't install the dependencies when we run `pod install` in the old architecture.
-    if ENV['RCT_NEW_ARCH_ENABLED'] == '1' then
-      s.compiler_flags = folly_compiler_flags + " -DRCT_NEW_ARCH_ENABLED=1"
-      s.pod_target_xcconfig    = {
-          "HEADER_SEARCH_PATHS" => "\"$(PODS_ROOT)/boost\"",
-          "OTHER_CPLUSPLUSFLAGS" => "-DFOLLY_NO_CONFIG -DFOLLY_MOBILE=1 -DFOLLY_USE_LIBCPP=1",
-          "CLANG_CXX_LANGUAGE_STANDARD" => "c++17"
-      }
-      s.dependency "React-RCTFabric"
-      s.dependency "React-Codegen"
-      s.dependency "RCT-Folly"
-      s.dependency "RCTRequired"
-      s.dependency "RCTTypeSafety"
-      s.dependency "ReactCommon/turbomodule/core"
-    end
+    s.compiler_flags = folly_compiler_flags
+    s.pod_target_xcconfig    = {
+        "HEADER_SEARCH_PATHS" => "\"$(PODS_ROOT)/boost\" \"$(PODS_TARGET_SRCROOT)/cpp\"",
+        "OTHER_CPLUSPLUSFLAGS" => "-DFOLLY_NO_CONFIG -DFOLLY_MOBILE=1 -DFOLLY_USE_LIBCPP=1",
+        "CLANG_CXX_LANGUAGE_STANDARD" => "c++17"
+    }
+    s.dependency "React-RCTFabric"
+    s.dependency "React-Codegen"
+    s.dependency "RCT-Folly"
+    s.dependency "RCTRequired"
+    s.dependency "RCTTypeSafety"
+    s.dependency "ReactCommon/turbomodule/core"
   end
 end

package/src/Canvas.tsx

@@ -1,15 +1,6 @@
-import type { ViewProps, LayoutChangeEvent } from "react-native";
+import type { ViewProps } from "react-native";
 import { View } from "react-native";
-import {
-  forwardRef,
-  useEffect,
-  useImperativeHandle,
-  useRef,
-  useState,
-  useLayoutEffect,
-  useCallback,
-} from "react";
-import type { RefObject } from "react";
+import { forwardRef, useImperativeHandle, useRef, useState } from "react";
 
 import WebGPUNativeView from "./WebGPUViewNativeComponent";
 
@@ -51,81 +42,29 @@ export interface CanvasRef {
   getContextId: () => number;
   getContext(contextName: "webgpu"): RNCanvasContext | null;
   getNativeSurface: () => NativeCanvas;
-  whenReady: (callback: () => void) => void;
 }
 
-interface Size {
-  width: number;
-  height: number;
-}
-
-const useSizeFabric = (ref: RefObject<View>) => {
-  const [size, setSize] = useState<null | Size>(null);
-  useLayoutEffect(() => {
-    if (!ref.current) {
-      throw new Error("Canvas ref is null");
-    }
-    ref.current.measureInWindow((_x, _y, width, height) => {
-      setSize({ width, height });
-    });
-  }, [ref]);
-  return { size, onLayout: undefined };
-};
-
-const useSizePaper = (_ref: RefObject<View>) => {
-  const [size, setSize] = useState<null | Size>(null);
-  const onLayout = useCallback<(event: LayoutChangeEvent) => void>(
-    ({
-      nativeEvent: {
-        layout: { width, height },
-      },
-    }) => {
-      if (size === null) {
-        setSize({ width, height });
-      }
-    },
-    [size],
-  );
-  return { size, onLayout };
-};
-
 export const Canvas = forwardRef<
   CanvasRef,
   ViewProps & { transparent?: boolean }
 >(({ onLayout: _onLayout, transparent, ...props }, ref) => {
   const viewRef = useRef(null);
-  const FABRIC = RNWebGPU.fabric;
-  const useSize = FABRIC ? useSizeFabric : useSizePaper;
   const [contextId, _] = useState(() => generateContextId());
-  const cb = useRef<() => void>();
-  const { size, onLayout } = useSize(viewRef);
-  useEffect(() => {
-    if (size && cb.current) {
-      cb.current();
-    }
-  }, [size]);
   useImperativeHandle(ref, () => ({
     getContextId: () => contextId,
     getNativeSurface: () => {
-      if (size === null) {
-        throw new Error("[WebGPU] Canvas size is not available yet");
-      }
       return RNWebGPU.getNativeSurface(contextId);
     },
-    whenReady(callback: () => void) {
-      if (size === null) {
-        cb.current = callback;
-      } else {
-        callback();
-      }
-    },
     getContext(contextName: "webgpu"): RNCanvasContext | null {
       if (contextName !== "webgpu") {
         throw new Error(`[WebGPU] Unsupported context: ${contextName}`);
       }
-      if (size === null) {
-        throw new Error("[WebGPU] Canvas size is not available yet");
+      if (!viewRef.current) {
+        throw new Error("[WebGPU] Cannot get context before mount");
       }
+      // eslint-disable-next-line @typescript-eslint/ban-ts-comment
+      // @ts-expect-error
+      const size = viewRef.current.unstable_getBoundingClientRect();
       return RNWebGPU.MakeWebGPUCanvasContext(
         contextId,
         size.width,
@@ -134,7 +73,7 @@ export const Canvas = forwardRef<
     },
   }));
   return (
-    <View collapsable={false} ref={viewRef} onLayout={onLayout} {...props}>
+    <View collapsable={false} ref={viewRef} {...props}>
       <WebGPUNativeView
         style={{ flex: 1 }}
         contextId={contextId}

package/src/hooks.tsx

@@ -1,9 +1,14 @@
 import type { ReactNode } from "react";
-import { createContext, useContext, useEffect, useRef, useState } from "react";
+import {
+  createContext,
+  useContext,
+  useEffect,
+  useLayoutEffect,
+  useRef,
+  useState,
+} from "react";
 
-import type { RNCanvasContext, CanvasRef, NativeCanvas } from "./Canvas";
-
-type Unsubscribe = () => void;
+import type { CanvasRef, NativeCanvas } from "./Canvas";
 
 export const warnIfNotHardwareAccelerated = (adapter: GPUAdapter) => {
   // Check if adapter is a fallback adapter using the new GPUAdapterInfo API
@@ -43,11 +48,12 @@ export const GPUDeviceProvider = ({
 };
 
 export const useSurface = () => {
+  const ref = useRef<CanvasRef>(null);
   const [surface, setSurface] = useState<NativeCanvas | null>(null);
-  const ref = useCanvasEffect(() => {
+  useLayoutEffect(() => {
     const sur = ref.current!.getNativeSurface();
     setSurface(sur);
-  });
+  }, []);
   return { ref, surface };
 };
 
@@ -59,6 +65,8 @@ export const useMainDevice = () => {
   return ctx;
 };
 
+export const useCanvasRef = () => useRef<CanvasRef>(null);
+
 export const useDevice = (
   adapterOptions?: GPURequestAdapterOptions,
   deviceDescriptor?: GPUDeviceDescriptor,
@@ -83,45 +91,3 @@ export const useDevice = (
   }, [adapterOptions, deviceDescriptor, state]);
   return { adapter: state?.adapter ?? null, device: state?.device ?? null };
 };
-
-export const useGPUContext = () => {
-  const [context, setContext] = useState<RNCanvasContext | null>(null);
-  const ref = useCanvasEffect(() => {
-    const ctx = ref.current!.getContext("webgpu")!;
-    setContext(ctx);
-  });
-  return { ref, context };
-};
-
-export const useCanvasEffect = (
-  effect: () =>
-    | void
-    | Unsubscribe
-    | Promise<Unsubscribe | void>
-    | Promise<void>,
-) => {
-  const unsub = useRef<Unsubscribe | null | Promise<Unsubscribe | void>>(null);
-  const ref = useRef<CanvasRef>(null);
-  useEffect(() => {
-    if (!ref.current || !ref.current.whenReady) {
-      throw new Error("The reference is not assigned to a WebGPU Canvas");
-    }
-    ref.current.whenReady(async () => {
-      const sub = effect();
-      if (sub) {
-        unsub.current = sub;
-      }
-    });
-    return () => {
-      if (unsub.current) {
-        if (unsub.current instanceof Promise) {
-          unsub.current.then((sub) => sub && sub());
-        } else {
-          unsub.current();
-        }
-      }
-    };
-    // eslint-disable-next-line react-hooks/exhaustive-deps
-  }, []);
-  return ref;
-};

package/android/cpp/platform/ThreadUtils.cpp

@@ -1,41 +0,0 @@
-//
-//  ThreadUtils.cpp
-//  react-native-nitro
-//
-//  Created by Marc Rousavy on 14.07.24.
-//
-
-#include "ThreadUtils.h"
-#include <pthread.h>
-#include <sstream>
-#include <string>
-#include <sys/prctl.h>
-#include <thread>
-
-namespace margelo {
-
-std::string ThreadUtils::getThreadName() {
-#ifdef HAVE_ANDROID_PTHREAD_SETNAME_NP
-  // Try using pthread APIs
-  pthread_t this_thread = pthread_self();
-  char thread_name[16]; // Thread name length limit in Android is 16 characters
-
-  int result =
-      pthread_getname_np(this_thread, thread_name, sizeof(thread_name));
-  if (result == 0) {
-    return std::string(thread_name);
-  }
-#endif
-
-  // Fall back to this_thread ID
-  std::stringstream stream;
-  stream << std::this_thread::get_id();
-  std::string threadId = stream.str();
-  return "Thread #" + threadId;
-}
-
-void ThreadUtils::setThreadName(const std::string &name) {
-  prctl(PR_SET_NAME, name.c_str(), 0, 0, 0);
-}
-
-} // namespace margelo

package/android/src/oldarch/com/webgpu/NativeWebGPUModuleSpec.java

@@ -1,23 +0,0 @@
-package com.webgpu;
-
-import androidx.annotation.NonNull;
-import androidx.annotation.Nullable;
-
-import com.facebook.react.bridge.ReactApplicationContext;
-import com.facebook.react.bridge.ReactContextBaseJavaModule;
-
-class NativeWebGPUModuleSpec extends ReactContextBaseJavaModule {
-
-  public static final String NAME = "WebGPUModule";
-
-  public NativeWebGPUModuleSpec(@Nullable ReactApplicationContext reactContext) {
-    super(reactContext);
-  }
-
-  @NonNull
-  @Override
-  public String getName() {
-    return NAME;
-  }
-
-}

package/android/src/oldarch/com/webgpu/WebGPUViewManagerSpec.java

@@ -1,12 +0,0 @@
-package com.webgpu;
-
-import android.view.View;
-
-import androidx.annotation.Nullable;
-
-import com.facebook.react.uimanager.SimpleViewManager;
-
-public abstract class WebGPUViewManagerSpec<T extends View> extends SimpleViewManager<T> {
-  public abstract void setContextId(T view, int contextId);
-  public abstract void setTransparent(T view, boolean transparency);
-}

package/apple/WebGPUViewManager.mm

@@ -1,24 +0,0 @@
-#import "MetalView.h"
-#import "RCTBridge.h"
-#import "RNWGUIKit.h"
-#import "WebGPUModule.h"
-#import <React/RCTUIManager.h>
-#import <React/RCTViewManager.h>
-
-@interface WebGPUViewManager : RCTViewManager
-@end
-
-@implementation WebGPUViewManager
-
-RCT_EXPORT_MODULE(WebGPUView)
-
-- (RNWGPlatformView *)view {
-  return [MetalView new];
-}
-
-RCT_CUSTOM_VIEW_PROPERTY(contextId, NSNumber, RNWGPlatformView) {
-  NSNumber *contextId = [RCTConvert NSNumber:json];
-  [(MetalView *)view setContextId:contextId];
-}
-
-@end

package/apple/platform/ThreadUtils.cpp

@@ -1,34 +0,0 @@
-//
-//  ThreadUtils.cpp
-//  react-native-nitro
-//
-//  Created by Marc Rousavy on 14.07.24.
-//
-
-#include "ThreadUtils.h"
-#include <pthread.h>
-#include <sstream>
-#include <string>
-#include <thread>
-
-namespace margelo {
-
-std::string ThreadUtils::getThreadName() {
-  // Try using pthread APIs
-  char name[256];
-  if (pthread_getname_np(pthread_self(), name, sizeof(name)) == 0) {
-    return std::string(name);
-  }
-
-  // Fall back to this_thread ID
-  std::stringstream stream;
-  stream << std::this_thread::get_id();
-  std::string threadId = stream.str();
-  return "Thread #" + threadId;
-}
-
-void ThreadUtils::setThreadName(const std::string &name) {
-  pthread_setname_np(name.c_str());
-}
-
-} // namespace margelo

package/cpp/dawn/dawn_proc.h

@@ -1,50 +0,0 @@
-// Copyright 2019 The Dawn & Tint Authors
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// 1. Redistributions of source code must retain the above copyright notice, this
-//    list of conditions and the following disclaimer.
-//
-// 2. Redistributions in binary form must reproduce the above copyright notice,
-//    this list of conditions and the following disclaimer in the documentation
-//    and/or other materials provided with the distribution.
-//
-// 3. Neither the name of the copyright holder nor the names of its
-//    contributors may be used to endorse or promote products derived from
-//    this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-// DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
-// FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-// DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
-// SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
-// CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
-// OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-#ifndef INCLUDE_DAWN_DAWN_PROC_H_
-#define INCLUDE_DAWN_DAWN_PROC_H_
-
-#include <webgpu/webgpu.h>
-
-#include "dawn/dawn_proc_table.h"
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-// Sets the static proctable used by libdawn_proc to implement the Dawn entrypoints. Passing NULL
-// for `procs` sets up the null proctable that contains only null function pointers. It is the
-// default value of the proctable. Setting the proctable back to null is good practice when you
-// are done using libdawn_proc since further usage will cause a segfault instead of calling an
-// unexpected function.
-WGPU_EXPORT void dawnProcSetProcs(const DawnProcTable* procs);
-
-#ifdef __cplusplus
-}  // extern "C"
-#endif
-
-#endif  // INCLUDE_DAWN_DAWN_PROC_H_

package/cpp/dawn/dawn_thread_dispatch_proc.h

@@ -1,47 +0,0 @@
-// Copyright 2020 The Dawn & Tint Authors
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// 1. Redistributions of source code must retain the above copyright notice, this
-//    list of conditions and the following disclaimer.
-//
-// 2. Redistributions in binary form must reproduce the above copyright notice,
-//    this list of conditions and the following disclaimer in the documentation
-//    and/or other materials provided with the distribution.
-//
-// 3. Neither the name of the copyright holder nor the names of its
-//    contributors may be used to endorse or promote products derived from
-//    this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-// DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
-// FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-// DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
-// SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
-// CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
-// OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-#ifndef INCLUDE_DAWN_DAWN_THREAD_DISPATCH_PROC_H_
-#define INCLUDE_DAWN_DAWN_THREAD_DISPATCH_PROC_H_
-
-#include "dawn/dawn_proc.h"
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-// Call dawnProcSetProcs(&dawnThreadDispatchProcTable) and then use dawnProcSetPerThreadProcs
-// to set per-thread procs.
-WGPU_EXPORT extern DawnProcTable dawnThreadDispatchProcTable;
-WGPU_EXPORT void dawnProcSetDefaultThreadProcs(const DawnProcTable* procs);
-WGPU_EXPORT void dawnProcSetPerThreadProcs(const DawnProcTable* procs);
-
-#ifdef __cplusplus
-}  // extern "C"
-#endif
-
-#endif  // INCLUDE_DAWN_DAWN_THREAD_DISPATCH_PROC_H_

package/cpp/dawn/native/D3D11Backend.h

@@ -1,77 +0,0 @@
-// Copyright 2023 The Dawn & Tint Authors
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// 1. Redistributions of source code must retain the above copyright notice, this
-//    list of conditions and the following disclaimer.
-//
-// 2. Redistributions in binary form must reproduce the above copyright notice,
-//    this list of conditions and the following disclaimer in the documentation
-//    and/or other materials provided with the distribution.
-//
-// 3. Neither the name of the copyright holder nor the names of its
-//    contributors may be used to endorse or promote products derived from
-//    this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-// DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
-// FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-// DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
-// SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
-// CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
-// OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-#ifndef INCLUDE_DAWN_NATIVE_D3D11BACKEND_H_
-#define INCLUDE_DAWN_NATIVE_D3D11BACKEND_H_
-
-#include <d3d11_1.h>
-#include <wrl/client.h>
-
-#include <memory>
-#include <optional>
-
-#include "dawn/native/D3DBackend.h"
-
-namespace dawn::native::d3d11 {
-
-DAWN_NATIVE_EXPORT Microsoft::WRL::ComPtr<ID3D11Device> GetD3D11Device(WGPUDevice device);
-
-// May be chained on RequestAdapterOptions
-struct DAWN_NATIVE_EXPORT RequestAdapterOptionsD3D11Device : wgpu::ChainedStruct {
-    RequestAdapterOptionsD3D11Device() {
-        sType = static_cast<wgpu::SType>(WGPUSType_RequestAdapterOptionsD3D11Device);
-    }
-
-    Microsoft::WRL::ComPtr<ID3D11Device> device;
-};
-
-// May be chained on SharedTextureMemoryDescriptor
-struct DAWN_NATIVE_EXPORT SharedTextureMemoryD3D11Texture2DDescriptor : wgpu::ChainedStruct {
-    SharedTextureMemoryD3D11Texture2DDescriptor() {
-        sType = static_cast<wgpu::SType>(WGPUSType_SharedTextureMemoryD3D11Texture2DDescriptor);
-    }
-
-    // This ID3D11Texture2D object must be created from the same ID3D11Device used in the
-    // WGPUDevice.
-    Microsoft::WRL::ComPtr<ID3D11Texture2D> texture;
-
-    // If this flag is true, Dawn is required to signal a fence before EndAccess() and return it in
-    // SharedTextureMemoryEndAccessState's fences list.
-    // If it's false, no fence signaling is needed and EndAccess() might return empty fence list.
-    // Notes:
-    // - This flag is not relevant if the feature SharedFenceDXGISharedHandle is disabled/not
-    // supported.
-    // - This flag if present will override the requiresEndAccessFence flag in
-    // SharedTextureMemoryD3D11BeginState
-    // TODO(chromium:335003893): This flag is deprecated. Remove it once clients are updated to use
-    // SharedTextureMemoryD3D11BeginState's requiresEndAccessFence.
-    std::optional<bool> requiresEndAccessFence;
-};
-
-}  // namespace dawn::native::d3d11
-
-#endif  // INCLUDE_DAWN_NATIVE_D3D11BACKEND_H_

package/cpp/dawn/native/D3D12Backend.h

@@ -1,68 +0,0 @@
-// Copyright 2018 The Dawn & Tint Authors
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// 1. Redistributions of source code must retain the above copyright notice, this
-//    list of conditions and the following disclaimer.
-//
-// 2. Redistributions in binary form must reproduce the above copyright notice,
-//    this list of conditions and the following disclaimer in the documentation
-//    and/or other materials provided with the distribution.
-//
-// 3. Neither the name of the copyright holder nor the names of its
-//    contributors may be used to endorse or promote products derived from
-//    this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-// DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
-// FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-// DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
-// SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
-// CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
-// OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-#ifndef INCLUDE_DAWN_NATIVE_D3D12BACKEND_H_
-#define INCLUDE_DAWN_NATIVE_D3D12BACKEND_H_
-
-#include <d3d12.h>
-#include <dxgi1_4.h>
-#include <wrl/client.h>
-
-#include "dawn/native/D3DBackend.h"
-
-struct ID3D12Device;
-struct ID3D12Resource;
-
-namespace dawn::native::d3d12 {
-
-class Device;
-
-enum MemorySegment {
-    Local,
-    NonLocal,
-};
-
-DAWN_NATIVE_EXPORT Microsoft::WRL::ComPtr<ID3D12Device> GetD3D12Device(WGPUDevice device);
-
-DAWN_NATIVE_EXPORT uint64_t SetExternalMemoryReservation(WGPUDevice device,
-                                                         uint64_t requestedReservationSize,
-                                                         MemorySegment memorySegment);
-
-// May be chained on SharedBufferMemoryDescriptor
-struct DAWN_NATIVE_EXPORT SharedBufferMemoryD3D12ResourceDescriptor : wgpu::ChainedStruct {
-    SharedBufferMemoryD3D12ResourceDescriptor() {
-        sType = static_cast<wgpu::SType>(WGPUSType_SharedBufferMemoryD3D12ResourceDescriptor);
-    }
-
-    // This ID3D12Resource object must be created from the same ID3D12Device used in the
-    // WGPUDevice.
-    Microsoft::WRL::ComPtr<ID3D12Resource> resource;
-};
-
-}  // namespace dawn::native::d3d12
-
-#endif  // INCLUDE_DAWN_NATIVE_D3D12BACKEND_H_