From c4be2268794076c519cd99db0bf6f956ba10ca36 Mon Sep 17 00:00:00 2001 From: Brandon DeRosier Date: Tue, 29 Aug 2023 14:29:59 -0700 Subject: [PATCH] [Impeller] Remove unused HasThreadingRestrictions capability. (flutter/engine#45242) Noticed this while working through documenting all of the capabilities. I guess we don't need this one anymore? --- .../renderer/backend/gles/context_gles.cc | 1 - .../renderer/backend/metal/context_mtl.mm | 1 - .../backend/vulkan/capabilities_vk.cc | 5 ----- .../renderer/backend/vulkan/capabilities_vk.h | 3 --- .../flutter/impeller/renderer/capabilities.cc | 19 ++----------------- .../flutter/impeller/renderer/capabilities.h | 5 ----- .../renderer/capabilities_unittests.cc | 1 - 7 files changed, 2 insertions(+), 33 deletions(-) diff --git a/engine/src/flutter/impeller/renderer/backend/gles/context_gles.cc b/engine/src/flutter/impeller/renderer/backend/gles/context_gles.cc index 4d0530127c..c7564a750f 100644 --- a/engine/src/flutter/impeller/renderer/backend/gles/context_gles.cc +++ b/engine/src/flutter/impeller/renderer/backend/gles/context_gles.cc @@ -62,7 +62,6 @@ ContextGLES::ContextGLES(std::unique_ptr gl, { device_capabilities_ = CapabilitiesBuilder() - .SetHasThreadingRestrictions(true) .SetSupportsOffscreenMSAA(false) .SetSupportsSSBO(false) .SetSupportsBufferToTextureBlits(false) diff --git a/engine/src/flutter/impeller/renderer/backend/metal/context_mtl.mm b/engine/src/flutter/impeller/renderer/backend/metal/context_mtl.mm index e92a4bb384..11faf74d96 100644 --- a/engine/src/flutter/impeller/renderer/backend/metal/context_mtl.mm +++ b/engine/src/flutter/impeller/renderer/backend/metal/context_mtl.mm @@ -52,7 +52,6 @@ static std::unique_ptr InferMetalCapabilities( id device, PixelFormat color_format) { return CapabilitiesBuilder() - .SetHasThreadingRestrictions(false) .SetSupportsOffscreenMSAA(true) .SetSupportsSSBO(true) .SetSupportsBufferToTextureBlits(true) diff --git a/engine/src/flutter/impeller/renderer/backend/vulkan/capabilities_vk.cc b/engine/src/flutter/impeller/renderer/backend/vulkan/capabilities_vk.cc index be2b671907..520e701bb4 100644 --- a/engine/src/flutter/impeller/renderer/backend/vulkan/capabilities_vk.cc +++ b/engine/src/flutter/impeller/renderer/backend/vulkan/capabilities_vk.cc @@ -396,11 +396,6 @@ bool CapabilitiesVK::SetPhysicalDevice(const vk::PhysicalDevice& device) { return true; } -// |Capabilities| -bool CapabilitiesVK::HasThreadingRestrictions() const { - return false; -} - // |Capabilities| bool CapabilitiesVK::SupportsOffscreenMSAA() const { return true; diff --git a/engine/src/flutter/impeller/renderer/backend/vulkan/capabilities_vk.h b/engine/src/flutter/impeller/renderer/backend/vulkan/capabilities_vk.h index ffa96d46bc..66344bd859 100644 --- a/engine/src/flutter/impeller/renderer/backend/vulkan/capabilities_vk.h +++ b/engine/src/flutter/impeller/renderer/backend/vulkan/capabilities_vk.h @@ -57,9 +57,6 @@ class CapabilitiesVK final : public Capabilities, void SetOffscreenFormat(PixelFormat pixel_format) const; - // |Capabilities| - bool HasThreadingRestrictions() const override; - // |Capabilities| bool SupportsOffscreenMSAA() const override; diff --git a/engine/src/flutter/impeller/renderer/capabilities.cc b/engine/src/flutter/impeller/renderer/capabilities.cc index d0c9f62348..0457289f60 100644 --- a/engine/src/flutter/impeller/renderer/capabilities.cc +++ b/engine/src/flutter/impeller/renderer/capabilities.cc @@ -15,11 +15,6 @@ class StandardCapabilities final : public Capabilities { // |Capabilities| ~StandardCapabilities() override = default; - // |Capabilities| - bool HasThreadingRestrictions() const override { - return has_threading_restrictions_; - } - // |Capabilities| bool SupportsOffscreenMSAA() const override { return supports_offscreen_msaa_; @@ -81,8 +76,7 @@ class StandardCapabilities final : public Capabilities { } private: - StandardCapabilities(bool has_threading_restrictions, - bool supports_offscreen_msaa, + StandardCapabilities(bool supports_offscreen_msaa, bool supports_ssbo, bool supports_buffer_to_texture_blits, bool supports_texture_to_texture_blits, @@ -95,8 +89,7 @@ class StandardCapabilities final : public Capabilities { bool supports_memoryless_textures, PixelFormat default_color_format, PixelFormat default_stencil_format) - : has_threading_restrictions_(has_threading_restrictions), - supports_offscreen_msaa_(supports_offscreen_msaa), + : supports_offscreen_msaa_(supports_offscreen_msaa), supports_ssbo_(supports_ssbo), supports_buffer_to_texture_blits_(supports_buffer_to_texture_blits), supports_texture_to_texture_blits_(supports_texture_to_texture_blits), @@ -113,7 +106,6 @@ class StandardCapabilities final : public Capabilities { friend class CapabilitiesBuilder; - bool has_threading_restrictions_ = false; bool supports_offscreen_msaa_ = false; bool supports_ssbo_ = false; bool supports_buffer_to_texture_blits_ = false; @@ -135,12 +127,6 @@ CapabilitiesBuilder::CapabilitiesBuilder() = default; CapabilitiesBuilder::~CapabilitiesBuilder() = default; -CapabilitiesBuilder& CapabilitiesBuilder::SetHasThreadingRestrictions( - bool value) { - has_threading_restrictions_ = value; - return *this; -} - CapabilitiesBuilder& CapabilitiesBuilder::SetSupportsOffscreenMSAA(bool value) { supports_offscreen_msaa_ = value; return *this; @@ -217,7 +203,6 @@ CapabilitiesBuilder& CapabilitiesBuilder::SetSupportsMemorylessTextures( std::unique_ptr CapabilitiesBuilder::Build() { return std::unique_ptr(new StandardCapabilities( // - has_threading_restrictions_, // supports_offscreen_msaa_, // supports_ssbo_, // supports_buffer_to_texture_blits_, // diff --git a/engine/src/flutter/impeller/renderer/capabilities.h b/engine/src/flutter/impeller/renderer/capabilities.h index 87a7f9df08..2b830f717e 100644 --- a/engine/src/flutter/impeller/renderer/capabilities.h +++ b/engine/src/flutter/impeller/renderer/capabilities.h @@ -15,8 +15,6 @@ class Capabilities { public: virtual ~Capabilities(); - virtual bool HasThreadingRestrictions() const = 0; - virtual bool SupportsOffscreenMSAA() const = 0; virtual bool SupportsSSBO() const = 0; @@ -55,8 +53,6 @@ class CapabilitiesBuilder { ~CapabilitiesBuilder(); - CapabilitiesBuilder& SetHasThreadingRestrictions(bool value); - CapabilitiesBuilder& SetSupportsOffscreenMSAA(bool value); CapabilitiesBuilder& SetSupportsSSBO(bool value); @@ -86,7 +82,6 @@ class CapabilitiesBuilder { std::unique_ptr Build(); private: - bool has_threading_restrictions_ = false; bool supports_offscreen_msaa_ = false; bool supports_ssbo_ = false; bool supports_buffer_to_texture_blits_ = false; diff --git a/engine/src/flutter/impeller/renderer/capabilities_unittests.cc b/engine/src/flutter/impeller/renderer/capabilities_unittests.cc index 9d8a9f3862..db2ccf3f60 100644 --- a/engine/src/flutter/impeller/renderer/capabilities_unittests.cc +++ b/engine/src/flutter/impeller/renderer/capabilities_unittests.cc @@ -18,7 +18,6 @@ namespace testing { ASSERT_EQ(opposite->name(), !default_value); \ } -CAPABILITY_TEST(HasThreadingRestrictions, false); CAPABILITY_TEST(SupportsOffscreenMSAA, false); CAPABILITY_TEST(SupportsSSBO, false); CAPABILITY_TEST(SupportsBufferToTextureBlits, false);