Bug 1959083 [Linux] Remove SW dmabuf textures r=lsalzman
Differential Revision: https://phabricator.services.mozilla.com/D245541
This commit is contained in:
@@ -50,8 +50,6 @@
|
||||
#ifdef MOZ_WIDGET_GTK
|
||||
# include <gtk/gtkx.h>
|
||||
# include "gfxPlatformGtk.h"
|
||||
# include "mozilla/layers/DMABUFTextureClientOGL.h"
|
||||
# include "mozilla/widget/DMABufLibWrapper.h"
|
||||
#endif
|
||||
#ifdef MOZ_WAYLAND
|
||||
# include "mozilla/widget/nsWaylandDisplay.h"
|
||||
@@ -301,15 +299,6 @@ static TextureType ChooseTextureType(gfx::SurfaceFormat aFormat,
|
||||
}
|
||||
#endif
|
||||
|
||||
#ifdef MOZ_WIDGET_GTK
|
||||
if ((layersBackend == LayersBackend::LAYERS_WR &&
|
||||
!aKnowsCompositor->UsingSoftwareWebRender()) &&
|
||||
widget::DMABufDevice::IsDMABufTexturesEnabled() &&
|
||||
aFormat != SurfaceFormat::A8) {
|
||||
return TextureType::DMABUF;
|
||||
}
|
||||
#endif
|
||||
|
||||
#ifdef XP_MACOSX
|
||||
if (StaticPrefs::gfx_use_iosurface_textures_AtStartup() &&
|
||||
!aKnowsCompositor->UsingSoftwareWebRender()) {
|
||||
@@ -345,11 +334,6 @@ TextureData* TextureData::Create(TextureType aTextureType,
|
||||
return D3D11TextureData::Create(aSize, aFormat, aAllocFlags);
|
||||
#endif
|
||||
|
||||
#ifdef MOZ_WIDGET_GTK
|
||||
case TextureType::DMABUF:
|
||||
return DMABUFTextureData::Create(aSize, aFormat, aBackendType);
|
||||
#endif
|
||||
|
||||
#ifdef XP_MACOSX
|
||||
case TextureType::MacIOSurface:
|
||||
return MacIOSurfaceTextureData::Create(aSize, aFormat, aBackendType);
|
||||
|
||||
@@ -18418,13 +18418,6 @@
|
||||
value: false
|
||||
mirror: once
|
||||
|
||||
# Use DMABuf for content textures.
|
||||
# For testing purposes only.
|
||||
- name: widget.dmabuf-textures.enabled
|
||||
type: RelaxedAtomicBool
|
||||
value: false
|
||||
mirror: always
|
||||
|
||||
# Get DMABuf format feedback from compositor.
|
||||
# For testing only
|
||||
- name: widget.dmabuf-feedback.enabled
|
||||
|
||||
@@ -226,14 +226,6 @@ void DMABufDevice::Configure() {
|
||||
LOGDMABUF(("DMABuf is enabled"));
|
||||
}
|
||||
|
||||
#ifdef NIGHTLY_BUILD
|
||||
bool DMABufDevice::IsDMABufTexturesEnabled() {
|
||||
return gfx::gfxVars::UseDMABuf() &&
|
||||
StaticPrefs::widget_dmabuf_textures_enabled();
|
||||
}
|
||||
#else
|
||||
bool DMABufDevice::IsDMABufTexturesEnabled() { return false; }
|
||||
#endif
|
||||
bool DMABufDevice::IsDMABufWebGLEnabled() {
|
||||
LOGDMABUF(
|
||||
("DMABufDevice::IsDMABufWebGLEnabled: UseDMABuf %d "
|
||||
|
||||
@@ -207,8 +207,6 @@ class DMABufDevice {
|
||||
|
||||
bool IsEnabled(nsACString& aFailureId);
|
||||
|
||||
// Use dmabuf for WebRender general web content
|
||||
static bool IsDMABufTexturesEnabled();
|
||||
// Use dmabuf for WebGL content
|
||||
static bool IsDMABufWebGLEnabled();
|
||||
static void DisableDMABufWebGL();
|
||||
|
||||
Reference in New Issue
Block a user