commit 73966626d36ebd6f36ee954ff68ab36b5994780c
parent 90468a05fabf730e8471f6a057552646e40fd216
Author: Jamie Nicol <jnicol@mozilla.com>
Date: Thu, 23 Oct 2025 14:12:07 +0000
Bug 1994441 - Build ExternalTextureSourceHost from TextureHost instead of RemoteDecoderVideoSubDescriptor. r=webgpu-reviewers,ErichDonGubler
Differential Revision: https://phabricator.services.mozilla.com/D269238
Diffstat:
10 files changed, 119 insertions(+), 137 deletions(-)
diff --git a/dom/webgpu/ExternalTexture.cpp b/dom/webgpu/ExternalTexture.cpp
@@ -28,9 +28,11 @@
#ifdef XP_WIN
# include "mozilla/layers/CompositeProcessD3D11FencesHolderMap.h"
# include "mozilla/layers/GpuProcessD3D11TextureMap.h"
+# include "mozilla/layers/TextureD3D11.h"
#endif
#ifdef XP_MACOSX
# include "mozilla/gfx/MacIOSurface.h"
+# include "mozilla/layers/MacIOSurfaceTextureHostOGL.h"
#endif
namespace mozilla::webgpu {
@@ -446,6 +448,12 @@ ExternalTextureSourceHost::ExternalTextureSourceHost(
const auto videoBridge =
layers::VideoBridgeParent::GetSingleton(remoteDecoderDesc.source());
+ if (!videoBridge) {
+ gfxCriticalErrorOnce() << "Failed to get VideoBridge";
+ aParent->ReportError(aDeviceId, dom::GPUErrorFilter::Internal,
+ "Failed to get VideoBridge"_ns);
+ return CreateError();
+ }
const RefPtr<layers::TextureHost> textureHost =
videoBridge->LookupTexture(aParent->mContentId,
remoteDecoderDesc.handle());
@@ -455,61 +463,30 @@ ExternalTextureSourceHost::ExternalTextureSourceHost(
"Failed to lookup remote decoder texture"_ns);
return CreateError();
}
- const layers::RemoteDecoderVideoSubDescriptor& subDesc =
- remoteDecoderDesc.subdesc();
-
- switch (subDesc.type()) {
- case layers::RemoteDecoderVideoSubDescriptor::Tnull_t: {
- const RefPtr<layers::BufferTextureHost> bufferHost =
- textureHost->AsBufferTextureHost();
- if (!bufferHost) {
- gfxCriticalNoteOnce << "Unexpected TextureHost type";
- aParent->ReportError(aDeviceId, dom::GPUErrorFilter::Internal,
- "Unexpected TextureHost type"_ns);
- return CreateError();
- }
- return CreateFromBufferDesc(
- aParent, aDeviceId, aQueueId, aDesc,
- bufferHost->GetBufferDescriptor(),
- Span(bufferHost->GetBuffer(), bufferHost->GetBufferSize()));
- } break;
-
- case layers::RemoteDecoderVideoSubDescriptor::TSurfaceDescriptorD3D10: {
- const layers::SurfaceDescriptorD3D10& d3d10Desc =
- subDesc.get_SurfaceDescriptorD3D10();
- return CreateFromD3D10Desc(aParent, aDeviceId, aQueueId, aDesc,
- d3d10Desc, textureHost->GetFormat());
- } break;
-
- case layers::RemoteDecoderVideoSubDescriptor::
- TSurfaceDescriptorDXGIYCbCr: {
- const layers::SurfaceDescriptorDXGIYCbCr& dxgiDesc =
- subDesc.get_SurfaceDescriptorDXGIYCbCr();
- return CreateFromDXGIYCbCrDesc(aParent, aDeviceId, aQueueId, aDesc,
- dxgiDesc);
- } break;
-
- case layers::RemoteDecoderVideoSubDescriptor::
- TSurfaceDescriptorMacIOSurface: {
- return CreateFromMacIOSurfaceDesc(
- aParent, aDeviceId, aDesc,
- subDesc.get_SurfaceDescriptorMacIOSurface());
- } break;
-
- case layers::RemoteDecoderVideoSubDescriptor::T__None:
- case layers::RemoteDecoderVideoSubDescriptor::TSurfaceDescriptorDMABuf:
- case layers::RemoteDecoderVideoSubDescriptor::
- TSurfaceDescriptorDcompSurface: {
- gfxCriticalErrorOnce()
- << "Unexpected RemoteDecoderVideoSubDescriptor type: "
- << subDesc.type();
- aParent->ReportError(
- aDeviceId, dom::GPUErrorFilter::Internal,
- nsPrintfCString(
- "Unexpected RemoteDecoderVideoSubDescriptor type: %d",
- subDesc.type()));
- return CreateError();
- } break;
+
+ if (const auto* bufferHost = textureHost->AsBufferTextureHost()) {
+ return CreateFromBufferDesc(
+ aParent, aDeviceId, aQueueId, aDesc,
+ bufferHost->GetBufferDescriptor(),
+ Span(bufferHost->GetBuffer(), bufferHost->GetBufferSize()));
+ } else if (const auto* dxgiHost = textureHost->AsDXGITextureHostD3D11()) {
+ return CreateFromDXGITextureHost(aParent, aDeviceId, aQueueId, aDesc,
+ dxgiHost);
+ } else if (const auto* dxgiYCbCrHost =
+ textureHost->AsDXGIYCbCrTextureHostD3D11()) {
+ return CreateFromDXGIYCbCrTextureHost(aParent, aDeviceId, aQueueId,
+ aDesc, dxgiYCbCrHost);
+ } else if (const auto* ioSurfHost =
+ textureHost->AsMacIOSurfaceTextureHost()) {
+ return CreateFromMacIOSurfaceTextureHost(aParent, aDeviceId, aDesc,
+ ioSurfHost);
+ } else {
+ gfxCriticalErrorOnce()
+ << "Unexpected SurfaceDescriptorGPUVideo TextureHost type";
+ aParent->ReportError(
+ aDeviceId, dom::GPUErrorFilter::Internal,
+ "Unexpected SurfaceDescriptorGPUVideo TextureHost type"_ns);
+ return CreateError();
}
} break;
default:
@@ -527,9 +504,9 @@ ExternalTextureSourceHost::ExternalTextureSourceHost(
ExternalTextureSourceHost::CreateFromBufferDesc(
WebGPUParent* aParent, RawId aDeviceId, RawId aQueueId,
const ExternalTextureSourceDescriptor& aDesc,
- const layers::BufferDescriptor& aSd, Span<uint8_t> aBuffer) {
+ const layers::BufferDescriptor& aBufferDesc, Span<uint8_t> aBuffer) {
const gfx::SurfaceFormat format =
- layers::ImageDataSerializer::FormatFromBufferDescriptor(aSd);
+ layers::ImageDataSerializer::FormatFromBufferDescriptor(aBufferDesc);
// Creates a texture and view for a single plane, and writes the provided data
// to the texture.
auto createPlane = [aParent, aDeviceId, aQueueId](
@@ -601,9 +578,9 @@ ExternalTextureSourceHost::CreateFromBufferDesc(
AutoTArray<RawId, 3> usedTextureIds;
AutoTArray<RawId, 3> usedViewIds;
gfx::YUVRangedColorSpace colorSpace;
- switch (aSd.type()) {
+ switch (aBufferDesc.type()) {
case layers::BufferDescriptor::TRGBDescriptor: {
- const layers::RGBDescriptor& rgbDesc = aSd.get_RGBDescriptor();
+ const layers::RGBDescriptor& rgbDesc = aBufferDesc.get_RGBDescriptor();
ffi::WGPUTextureFormat planeFormat;
switch (rgbDesc.format()) {
case gfx::SurfaceFormat::B8G8R8A8:
@@ -631,11 +608,12 @@ ExternalTextureSourceHost::CreateFromBufferDesc(
colorSpace = gfx::YUVRangedColorSpace::GbrIdentity;
} break;
case layers::BufferDescriptor::TYCbCrDescriptor: {
- const layers::YCbCrDescriptor& yCbCrDesc = aSd.get_YCbCrDescriptor();
+ const layers::YCbCrDescriptor& yCbCrDesc =
+ aBufferDesc.get_YCbCrDescriptor();
const gfx::IntSize ySize =
- layers::ImageDataSerializer::SizeFromBufferDescriptor(aSd);
+ layers::ImageDataSerializer::SizeFromBufferDescriptor(aBufferDesc);
const gfx::IntSize cbCrSize =
- layers::ImageDataSerializer::GetCroppedCbCrSize(aSd);
+ layers::ImageDataSerializer::GetCroppedCbCrSize(aBufferDesc);
ffi::WGPUTextureFormat planeFormat;
switch (yCbCrDesc.colorDepth()) {
@@ -690,20 +668,20 @@ ExternalTextureSourceHost::CreateError() {
}
/* static */ ExternalTextureSourceHost
-ExternalTextureSourceHost::CreateFromD3D10Desc(
+ExternalTextureSourceHost::CreateFromDXGITextureHost(
WebGPUParent* aParent, RawId aDeviceId, RawId aQueueId,
const ExternalTextureSourceDescriptor& aDesc,
- const layers::SurfaceDescriptorD3D10& aSd, gfx::SurfaceFormat aFormat) {
+ const layers::DXGITextureHostD3D11* aTextureHost) {
#ifdef XP_WIN
- const auto& gpuProcessTextureId = aSd.gpuProcessTextureId();
Maybe<HANDLE> handle;
- if (gpuProcessTextureId) {
+ if (aTextureHost->mGpuProcessTextureId) {
auto* textureMap = layers::GpuProcessD3D11TextureMap::Get();
if (textureMap) {
- handle = textureMap->GetSharedHandle(gpuProcessTextureId.ref());
+ handle =
+ textureMap->GetSharedHandle(aTextureHost->mGpuProcessTextureId.ref());
}
- } else if (aSd.handle()) {
- handle.emplace(aSd.handle()->GetHandle());
+ } else if (aTextureHost->mHandle) {
+ handle.emplace(aTextureHost->mHandle->GetHandle());
}
if (!handle) {
@@ -714,12 +692,13 @@ ExternalTextureSourceHost::CreateFromD3D10Desc(
}
const gfx::YUVRangedColorSpace colorSpace = gfx::ToYUVRangedColorSpace(
- gfx::ToYUVColorSpace(aSd.colorSpace()), aSd.colorRange());
+ gfx::ToYUVColorSpace(aTextureHost->mColorSpace),
+ aTextureHost->mColorRange);
ffi::WGPUTextureFormat textureFormat;
AutoTArray<std::pair<ffi::WGPUTextureFormat, ffi::WGPUTextureAspect>, 2>
viewFormatAndAspects;
- switch (aFormat) {
+ switch (aTextureHost->mFormat) {
case gfx::SurfaceFormat::R8G8B8A8:
case gfx::SurfaceFormat::R8G8B8X8:
textureFormat = {ffi::WGPUTextureFormat_Rgba8Unorm};
@@ -751,10 +730,12 @@ ExternalTextureSourceHost::CreateFromD3D10Desc(
ffi::WGPUTextureAspect_Plane1));
break;
default:
- gfxCriticalNoteOnce << "Unsupported surface format: " << aFormat;
- aParent->ReportError(aDeviceId, dom::GPUErrorFilter::Internal,
- nsPrintfCString("Unsupported surface format: %s",
- mozilla::ToString(aFormat).c_str()));
+ gfxCriticalNoteOnce << "Unsupported surface format: "
+ << aTextureHost->mFormat;
+ aParent->ReportError(
+ aDeviceId, dom::GPUErrorFilter::Internal,
+ nsPrintfCString("Unsupported surface format: %s",
+ mozilla::ToString(aTextureHost->mFormat).c_str()));
return CreateError();
}
@@ -764,8 +745,8 @@ ExternalTextureSourceHost::CreateFromD3D10Desc(
const ffi::WGPUTextureDescriptor textureDesc{
.size =
ffi::WGPUExtent3d{
- .width = static_cast<uint32_t>(aSd.size().width),
- .height = static_cast<uint32_t>(aSd.size().height),
+ .width = static_cast<uint32_t>(aTextureHost->mSize.width),
+ .height = static_cast<uint32_t>(aTextureHost->mSize.height),
.depth_or_array_layers = 1,
},
.mip_level_count = 1,
@@ -805,10 +786,10 @@ ExternalTextureSourceHost::CreateFromD3D10Desc(
}
usedViewIds.AppendElement(aDesc.mViewIds[i]);
}
- ExternalTextureSourceHost source(usedTextureIds, usedViewIds, aDesc.mSize,
- aFormat, colorSpace, aDesc.mSampleTransform,
- aDesc.mLoadTransform);
- source.mFenceId = aSd.fencesHolderId();
+ ExternalTextureSourceHost source(
+ usedTextureIds, usedViewIds, aDesc.mSize, aTextureHost->mFormat,
+ colorSpace, aDesc.mSampleTransform, aDesc.mLoadTransform);
+ source.mFenceId = aTextureHost->mFencesHolderId;
return source;
#else
MOZ_CRASH();
@@ -816,41 +797,40 @@ ExternalTextureSourceHost::CreateFromD3D10Desc(
}
/* static */ ExternalTextureSourceHost
-ExternalTextureSourceHost::CreateFromDXGIYCbCrDesc(
+ExternalTextureSourceHost::CreateFromDXGIYCbCrTextureHost(
WebGPUParent* aParent, RawId aDeviceId, RawId aQueueId,
const ExternalTextureSourceDescriptor& aDesc,
- const layers::SurfaceDescriptorDXGIYCbCr& aSd) {
+ const layers::DXGIYCbCrTextureHostD3D11* aTextureHost) {
#ifdef XP_WIN
- const gfx::SurfaceFormat format = gfx::SurfaceFormat::YUV420;
- const gfx::YUVRangedColorSpace colorSpace =
- gfx::ToYUVRangedColorSpace(aSd.yUVColorSpace(), aSd.colorRange());
+ const gfx::YUVRangedColorSpace colorSpace = gfx::ToYUVRangedColorSpace(
+ aTextureHost->mYUVColorSpace, aTextureHost->mColorRange);
ffi::WGPUTextureFormat planeFormat;
- switch (aSd.colorDepth()) {
+ switch (aTextureHost->mColorDepth) {
case gfx::ColorDepth::COLOR_8:
planeFormat = {ffi::WGPUTextureFormat_R8Unorm};
break;
case gfx::ColorDepth::COLOR_10:
case gfx::ColorDepth::COLOR_12:
case gfx::ColorDepth::COLOR_16:
- gfxCriticalNoteOnce << "Unsupported color depth: " << aSd.colorDepth();
+ gfxCriticalNoteOnce << "Unsupported color depth: "
+ << aTextureHost->mColorDepth;
aParent->ReportError(
aDeviceId, dom::GPUErrorFilter::Internal,
- nsPrintfCString("Unsupported color depth: %s",
- mozilla::ToString(aSd.colorDepth()).c_str()));
+ nsPrintfCString(
+ "Unsupported color depth: %s",
+ mozilla::ToString(aTextureHost->mColorDepth).c_str()));
return CreateError();
}
- const std::array handles = {aSd.handleY(), aSd.handleCb(), aSd.handleCr()};
- const std::array sizes = {aSd.sizeY(), aSd.sizeCbCr(), aSd.sizeCbCr()};
-
for (int i = 0; i < 3; i++) {
{
+ const auto size = i == 0 ? aTextureHost->mSizeY : aTextureHost->mSizeCbCr;
const ffi::WGPUTextureDescriptor textureDesc{
.size =
ffi::WGPUExtent3d{
- .width = static_cast<uint32_t>(sizes[i].width),
- .height = static_cast<uint32_t>(sizes[i].height),
+ .width = static_cast<uint32_t>(size.width),
+ .height = static_cast<uint32_t>(size.height),
.depth_or_array_layers = 1,
},
.mip_level_count = 1,
@@ -863,7 +843,7 @@ ExternalTextureSourceHost::CreateFromDXGIYCbCrDesc(
ErrorBuffer error;
ffi::wgpu_server_device_import_texture_from_shared_handle(
aParent->GetContext(), aDeviceId, aDesc.mTextureIds[i], &textureDesc,
- handles[i]->GetHandle(), error.ToFFI());
+ aTextureHost->mHandles[i]->GetHandle(), error.ToFFI());
// From here on there's no need to return early with `CreateError()` in
// case of an error, as an error creating a texture or view will be
// propagated to any views or external textures created from them.
@@ -884,9 +864,9 @@ ExternalTextureSourceHost::CreateFromDXGIYCbCrDesc(
}
ExternalTextureSourceHost source(
- aDesc.mTextureIds, aDesc.mViewIds, aDesc.mSize, format, colorSpace,
- aDesc.mSampleTransform, aDesc.mLoadTransform);
- source.mFenceId = Some(aSd.fencesHolderId());
+ aDesc.mTextureIds, aDesc.mViewIds, aDesc.mSize, aTextureHost->GetFormat(),
+ colorSpace, aDesc.mSampleTransform, aDesc.mLoadTransform);
+ source.mFenceId = Some(aTextureHost->mFencesHolderId);
return source;
#else
MOZ_CRASH();
@@ -894,13 +874,12 @@ ExternalTextureSourceHost::CreateFromDXGIYCbCrDesc(
}
/* static */ ExternalTextureSourceHost
-ExternalTextureSourceHost::CreateFromMacIOSurfaceDesc(
+ExternalTextureSourceHost::CreateFromMacIOSurfaceTextureHost(
WebGPUParent* aParent, RawId aDeviceId,
const ExternalTextureSourceDescriptor& aDesc,
- const layers::SurfaceDescriptorMacIOSurface& aSd) {
+ const layers::MacIOSurfaceTextureHostOGL* aTextureHost) {
#ifdef XP_MACOSX
- const RefPtr<MacIOSurface> ioSurface = MacIOSurface::LookupSurface(
- aSd.surfaceId(), !aSd.isOpaque(), aSd.yUVColorSpace());
+ const RefPtr<MacIOSurface> ioSurface = aTextureHost->mSurface;
if (!ioSurface) {
gfxCriticalErrorOnce() << "Failed to lookup MacIOSurface";
aParent->ReportError(aDeviceId, dom::GPUErrorFilter::Internal,
@@ -909,12 +888,12 @@ ExternalTextureSourceHost::CreateFromMacIOSurfaceDesc(
return CreateError();
}
- // aSd.gpuFence should be null. It is only required to synchronize GPU reads
+ // mGpuFence should be null. It is only required to synchronize GPU reads
// from an IOSurface following GPU writes, e.g. when an IOSurface is used for
// WebGPU presentation. In our case the IOSurface has been written to from
// the CPU or obtained from a CVPixelBuffer, and no additional synchronization
// is required.
- MOZ_ASSERT(!aSd.gpuFence());
+ MOZ_ASSERT(!aTextureHost->mGpuFence);
const gfx::SurfaceFormat format = ioSurface->GetFormat();
const gfx::YUVRangedColorSpace colorSpace = gfx::ToYUVRangedColorSpace(
diff --git a/dom/webgpu/ExternalTexture.h b/dom/webgpu/ExternalTexture.h
@@ -28,7 +28,10 @@ class VideoFrame;
} // namespace dom
namespace layers {
class BufferDescriptor;
+class DXGITextureHostD3D11;
+class DXGIYCbCrTextureHostD3D11;
class Image;
+class MacIOSurfaceTextureHostOGL;
} // namespace layers
namespace webgpu {
@@ -245,19 +248,19 @@ class ExternalTextureSourceHost {
static ExternalTextureSourceHost CreateFromBufferDesc(
WebGPUParent* aParent, RawId aDeviceId, RawId aQueueId,
const ExternalTextureSourceDescriptor& aDesc,
- const layers::BufferDescriptor& aSd, Span<uint8_t> aBuffer);
- static ExternalTextureSourceHost CreateFromD3D10Desc(
+ const layers::BufferDescriptor& aBufferDesc, Span<uint8_t> aBuffer);
+ static ExternalTextureSourceHost CreateFromDXGITextureHost(
WebGPUParent* aParent, RawId aDeviceId, RawId aQueueId,
const ExternalTextureSourceDescriptor& aDesc,
- const layers::SurfaceDescriptorD3D10& aSd, gfx::SurfaceFormat aFormat);
- static ExternalTextureSourceHost CreateFromDXGIYCbCrDesc(
+ const layers::DXGITextureHostD3D11* aTextureHost);
+ static ExternalTextureSourceHost CreateFromDXGIYCbCrTextureHost(
WebGPUParent* aParent, RawId aDeviceId, RawId aQueueId,
const ExternalTextureSourceDescriptor& aDesc,
- const layers::SurfaceDescriptorDXGIYCbCr& aSd);
- static ExternalTextureSourceHost CreateFromMacIOSurfaceDesc(
+ const layers::DXGIYCbCrTextureHostD3D11* aTextureHost);
+ static ExternalTextureSourceHost CreateFromMacIOSurfaceTextureHost(
WebGPUParent* aParent, RawId aDeviceId,
const ExternalTextureSourceDescriptor& aDesc,
- const layers::SurfaceDescriptorMacIOSurface& aSd);
+ const layers::MacIOSurfaceTextureHostOGL* aTextureHost);
// Creates an external texture source in an error state that will be
// propagated to any external textures created from it.
diff --git a/gfx/layers/composite/TextureHost.cpp b/gfx/layers/composite/TextureHost.cpp
@@ -771,11 +771,11 @@ void ShmemTextureHost::ForgetSharedData() {
void ShmemTextureHost::OnShutdown() { mShmem = nullptr; }
-uint8_t* ShmemTextureHost::GetBuffer() {
+uint8_t* ShmemTextureHost::GetBuffer() const {
return mShmem ? mShmem->get<uint8_t>() : nullptr;
}
-size_t ShmemTextureHost::GetBufferSize() {
+size_t ShmemTextureHost::GetBufferSize() const {
return mShmem ? mShmem->Size<uint8_t>() : 0;
}
@@ -803,9 +803,9 @@ void MemoryTextureHost::DeallocateSharedData() {
void MemoryTextureHost::ForgetSharedData() { mBuffer = nullptr; }
-uint8_t* MemoryTextureHost::GetBuffer() { return mBuffer; }
+uint8_t* MemoryTextureHost::GetBuffer() const { return mBuffer; }
-size_t MemoryTextureHost::GetBufferSize() {
+size_t MemoryTextureHost::GetBufferSize() const {
// MemoryTextureHost just trusts that the buffer size is large enough to read
// anything we need to. That's because MemoryTextureHost has to trust the
// buffer pointer anyway, so the security model here is just that
diff --git a/gfx/layers/composite/TextureHost.h b/gfx/layers/composite/TextureHost.h
@@ -801,9 +801,9 @@ class BufferTextureHost : public TextureHost {
virtual ~BufferTextureHost();
- virtual uint8_t* GetBuffer() = 0;
+ virtual uint8_t* GetBuffer() const = 0;
- virtual size_t GetBufferSize() = 0;
+ virtual size_t GetBufferSize() const = 0;
void UnbindTextureSource() override;
@@ -893,9 +893,9 @@ class ShmemTextureHost : public BufferTextureHost {
void ForgetSharedData() override;
- uint8_t* GetBuffer() override;
+ uint8_t* GetBuffer() const override;
- size_t GetBufferSize() override;
+ size_t GetBufferSize() const override;
const char* Name() override { return "ShmemTextureHost"; }
@@ -927,9 +927,9 @@ class MemoryTextureHost : public BufferTextureHost {
void ForgetSharedData() override;
- uint8_t* GetBuffer() override;
+ uint8_t* GetBuffer() const override;
- size_t GetBufferSize() override;
+ size_t GetBufferSize() const override;
const char* Name() override { return "MemoryTextureHost"; }
diff --git a/gfx/layers/d3d11/TextureD3D11.cpp b/gfx/layers/d3d11/TextureD3D11.cpp
@@ -1466,6 +1466,8 @@ bool DXGITextureHostD3D11::SupportsExternalCompositing(
DXGIYCbCrTextureHostD3D11::DXGIYCbCrTextureHostD3D11(
TextureFlags aFlags, const SurfaceDescriptorDXGIYCbCr& aDescriptor)
: TextureHost(TextureHostType::DXGIYCbCr, aFlags),
+ mHandles{aDescriptor.handleY(), aDescriptor.handleCb(),
+ aDescriptor.handleCr()},
mSize(aDescriptor.size()),
mSizeY(aDescriptor.sizeY()),
mSizeCbCr(aDescriptor.sizeCbCr()),
@@ -1478,9 +1480,6 @@ DXGIYCbCrTextureHostD3D11::DXGIYCbCrTextureHostD3D11(
} else {
MOZ_ASSERT_UNREACHABLE("FencesHolderMap not available");
}
- mHandles[0] = aDescriptor.handleY();
- mHandles[1] = aDescriptor.handleCb();
- mHandles[2] = aDescriptor.handleCr();
}
DXGIYCbCrTextureHostD3D11::~DXGIYCbCrTextureHostD3D11() {
diff --git a/gfx/layers/d3d11/TextureD3D11.h b/gfx/layers/d3d11/TextureD3D11.h
@@ -463,6 +463,9 @@ class DXGIYCbCrTextureHostD3D11 : public TextureHost {
void SetReadFence(RefPtr<FenceD3D11> aReadFence);
+ // Handles will be closed automatically when `UniqueFileHandle` gets
+ // destroyed.
+ const RefPtr<gfx::FileHandleWrapper> mHandles[3];
const gfx::IntSize mSize;
const gfx::IntSize mSizeY;
const gfx::IntSize mSizeCbCr;
@@ -472,9 +475,6 @@ class DXGIYCbCrTextureHostD3D11 : public TextureHost {
const CompositeProcessFencesHolderId mFencesHolderId;
protected:
- // Handles will be closed automatically when `UniqueFileHandle` gets
- // destroyed.
- RefPtr<gfx::FileHandleWrapper> mHandles[3];
bool mIsLocked = false;
RefPtr<FenceD3D11> mReadFence;
};
diff --git a/gfx/layers/opengl/MacIOSurfaceTextureHostOGL.cpp b/gfx/layers/opengl/MacIOSurfaceTextureHostOGL.cpp
@@ -17,15 +17,15 @@ namespace layers {
MacIOSurfaceTextureHostOGL::MacIOSurfaceTextureHostOGL(
TextureFlags aFlags, const SurfaceDescriptorMacIOSurface& aDescriptor)
- : TextureHost(TextureHostType::MacIOSurface, aFlags) {
+ : TextureHost(TextureHostType::MacIOSurface, aFlags),
+ mSurface(MacIOSurface::LookupSurface(aDescriptor.surfaceId(),
+ !aDescriptor.isOpaque(),
+ aDescriptor.yUVColorSpace())),
+ mGpuFence(aDescriptor.gpuFence()) {
MOZ_COUNT_CTOR(MacIOSurfaceTextureHostOGL);
- mSurface = MacIOSurface::LookupSurface(aDescriptor.surfaceId(),
- !aDescriptor.isOpaque(),
- aDescriptor.yUVColorSpace());
if (!mSurface) {
gfxCriticalNote << "Failed to look up MacIOSurface";
}
- mGpuFence = aDescriptor.gpuFence();
}
MacIOSurfaceTextureHostOGL::~MacIOSurfaceTextureHostOGL() {
diff --git a/gfx/layers/opengl/MacIOSurfaceTextureHostOGL.h b/gfx/layers/opengl/MacIOSurfaceTextureHostOGL.h
@@ -76,10 +76,11 @@ class MacIOSurfaceTextureHostOGL : public TextureHost {
gfx::YUVColorSpace GetYUVColorSpace() const override;
gfx::ColorRange GetColorRange() const override;
+ const RefPtr<MacIOSurface> mSurface;
+ const RefPtr<GpuFence> mGpuFence;
+
protected:
RefPtr<GLTextureSource> mTextureSource;
- RefPtr<MacIOSurface> mSurface;
- RefPtr<GpuFence> mGpuFence;
};
} // namespace layers
diff --git a/gfx/webrender_bindings/RenderD3D11TextureHost.cpp b/gfx/webrender_bindings/RenderD3D11TextureHost.cpp
@@ -474,7 +474,7 @@ bool RenderDXGITextureHost::SyncObjectNeeded() {
}
RenderDXGIYCbCrTextureHost::RenderDXGIYCbCrTextureHost(
- RefPtr<gfx::FileHandleWrapper> (&aHandles)[3],
+ const RefPtr<gfx::FileHandleWrapper> (&aHandles)[3],
const gfx::YUVColorSpace aYUVColorSpace, const gfx::ColorDepth aColorDepth,
const gfx::ColorRange aColorRange, const gfx::IntSize aSizeY,
const gfx::IntSize aSizeCbCr,
diff --git a/gfx/webrender_bindings/RenderD3D11TextureHost.h b/gfx/webrender_bindings/RenderD3D11TextureHost.h
@@ -136,7 +136,7 @@ class RenderDXGITextureHost final : public RenderTextureHostSWGL {
class RenderDXGIYCbCrTextureHost final : public RenderTextureHostSWGL {
public:
explicit RenderDXGIYCbCrTextureHost(
- RefPtr<gfx::FileHandleWrapper> (&aHandles)[3],
+ const RefPtr<gfx::FileHandleWrapper> (&aHandles)[3],
const gfx::YUVColorSpace aYUVColorSpace,
const gfx::ColorDepth aColorDepth, const gfx::ColorRange aColorRange,
const gfx::IntSize aSizeY, const gfx::IntSize aSizeCbCr,
