c57ff07601
Adapt `wgpu_server_queue_submit` to the new submission index type. Use corrected spelling `WGPUTextureFormat_Rg11b10UFloat`. Assign queue ids explicitly, rather than deriving them from device ids: - `wgpu_bindings::client::IdentityHub`: add an `IdentityManager` for queues. Initialize it in `IdentityHub::default`. - `dom::webgpu::DeviceRequest`: hold separate `mDeviceId` and `mQueueId` members. - `wgpu_client_make_device_id`: rename to `wgpu_client_make_device_queue_id`, and have it allocate both a device id and a queue id. - `PWebGPU` protocol's `AdapterRequestDevice` request: explicitly pass an id for the new queue. - `WebGPUChild::AdapterRequestDevice`: pass through the queue id from `wgpu_client_make_device_queue_id` through to `SendAdapterRequestDevice`, and also return it as `DeviceRequest::mQueueId`. - `WebGPUParent::RecvAdapterRequestDevice`: accept a queue id, and pass it along to `ffi::wgpu_server_adapter_request_device`. - `wgpu_server_adapter_request_device`: take a new argument specifying the new queue's id, and pass that along to `global.adapter_request_device`. - `dom::webgpu::Adapter::RequestDevice`: given the `DeviceRequest` returned by `WebGPUChild::AdapterRequestDevice`, pass the ids for both the new device and the new queue to `dom::webgpu::Device::Device`. - Let `dom::webgpu::Device::Device` take a new argument explicitly specifying the device's queue's id. Differential Revision: https://phabricator.services.mozilla.com/D219356
115 lines
3.8 KiB
C++
115 lines
3.8 KiB
C++
/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
|
|
/* This Source Code Form is subject to the terms of the Mozilla Public
|
|
* License, v. 2.0. If a copy of the MPL was not distributed with this
|
|
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
|
|
|
|
#ifndef WEBGPU_CHILD_H_
|
|
#define WEBGPU_CHILD_H_
|
|
|
|
#include "mozilla/webgpu/PWebGPUChild.h"
|
|
#include "mozilla/MozPromise.h"
|
|
#include "mozilla/WeakPtr.h"
|
|
#include "mozilla/webgpu/ffi/wgpu.h"
|
|
|
|
namespace mozilla {
|
|
namespace ipc {
|
|
class UnsafeSharedMemoryHandle;
|
|
} // namespace ipc
|
|
namespace dom {
|
|
struct GPURequestAdapterOptions;
|
|
} // namespace dom
|
|
namespace layers {
|
|
class CompositorBridgeChild;
|
|
} // namespace layers
|
|
namespace webgpu {
|
|
namespace ffi {
|
|
struct WGPUClient;
|
|
struct WGPULimits;
|
|
struct WGPUTextureViewDescriptor;
|
|
} // namespace ffi
|
|
|
|
using AdapterPromise =
|
|
MozPromise<ipc::ByteBuf, Maybe<ipc::ResponseRejectReason>, true>;
|
|
using PipelinePromise = MozPromise<RawId, ipc::ResponseRejectReason, true>;
|
|
using DevicePromise = MozPromise<bool, ipc::ResponseRejectReason, true>;
|
|
|
|
struct PipelineCreationContext {
|
|
RawId mParentId = 0;
|
|
RawId mImplicitPipelineLayoutId = 0;
|
|
nsTArray<RawId> mImplicitBindGroupLayoutIds;
|
|
};
|
|
|
|
struct DeviceRequest {
|
|
RawId mDeviceId = 0;
|
|
RawId mQueueId = 0;
|
|
RefPtr<DevicePromise> mPromise;
|
|
// Note: we could put `ffi::WGPULimits` in here as well,
|
|
// but we don't want to #include ffi stuff in this header
|
|
};
|
|
|
|
ffi::WGPUByteBuf* ToFFI(ipc::ByteBuf* x);
|
|
|
|
class WebGPUChild final : public PWebGPUChild, public SupportsWeakPtr {
|
|
public:
|
|
friend class layers::CompositorBridgeChild;
|
|
|
|
NS_DECL_CYCLE_COLLECTION_NATIVE_CLASS(WebGPUChild)
|
|
NS_INLINE_DECL_CYCLE_COLLECTING_NATIVE_REFCOUNTING_INHERITED(WebGPUChild)
|
|
|
|
public:
|
|
explicit WebGPUChild();
|
|
|
|
RefPtr<AdapterPromise> InstanceRequestAdapter(
|
|
const dom::GPURequestAdapterOptions& aOptions);
|
|
Maybe<DeviceRequest> AdapterRequestDevice(
|
|
RawId aSelfId, const ffi::WGPUFfiDeviceDescriptor&);
|
|
RawId RenderBundleEncoderFinish(ffi::WGPURenderBundleEncoder& aEncoder,
|
|
RawId aDeviceId,
|
|
const dom::GPURenderBundleDescriptor& aDesc);
|
|
RawId RenderBundleEncoderFinishError(RawId aDeviceId, const nsString& aLabel);
|
|
|
|
ffi::WGPUClient* GetClient() const { return mClient.get(); }
|
|
|
|
void DeviceCreateSwapChain(RawId aSelfId, const RGBDescriptor& aRgbDesc,
|
|
size_t maxBufferCount,
|
|
const layers::RemoteTextureOwnerId& aOwnerId,
|
|
bool aUseExternalTextureInSwapChain);
|
|
|
|
void QueueOnSubmittedWorkDone(const RawId aSelfId,
|
|
const RefPtr<dom::Promise>& aPromise);
|
|
|
|
void SwapChainPresent(RawId aTextureId,
|
|
const RemoteTextureId& aRemoteTextureId,
|
|
const RemoteTextureOwnerId& aOwnerId);
|
|
|
|
void RegisterDevice(Device* const aDevice);
|
|
void UnregisterDevice(RawId aId);
|
|
void FreeUnregisteredInParentDevice(RawId aId);
|
|
|
|
void QueueSubmit(RawId aSelfId, RawId aDeviceId,
|
|
nsTArray<RawId>& aCommandBuffers);
|
|
void NotifyWaitForSubmit(RawId aTextureId);
|
|
|
|
static void JsWarning(nsIGlobalObject* aGlobal, const nsACString& aMessage);
|
|
|
|
private:
|
|
virtual ~WebGPUChild();
|
|
|
|
UniquePtr<ffi::WGPUClient> const mClient;
|
|
std::unordered_map<RawId, WeakPtr<Device>> mDeviceMap;
|
|
nsTArray<RawId> mSwapChainTexturesWaitingForSubmit;
|
|
|
|
public:
|
|
ipc::IPCResult RecvUncapturedError(Maybe<RawId> aDeviceId,
|
|
const nsACString& aMessage);
|
|
ipc::IPCResult RecvDropAction(const ipc::ByteBuf& aByteBuf);
|
|
ipc::IPCResult RecvDeviceLost(RawId aDeviceId, Maybe<uint8_t> aReason,
|
|
const nsACString& aMessage);
|
|
void ActorDestroy(ActorDestroyReason) override;
|
|
};
|
|
|
|
} // namespace webgpu
|
|
} // namespace mozilla
|
|
|
|
#endif // WEBGPU_CHILD_H_
|