Skip to content
This repository was archived by the owner on Feb 25, 2025. It is now read-only.

Revert "[Impeller] Use a device buffer for SkBitmap allocation, use Linear texture on Metal backend." #41533

Merged
merged 1 commit into from
Apr 26, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion impeller/renderer/backend/metal/context_mtl.mm
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,6 @@ static bool DeviceSupportsComputeSubgroups(id<MTLDevice> device) {
.SetSupportsBufferToTextureBlits(true)
.SetSupportsTextureToTextureBlits(true)
.SetSupportsDecalTileMode(true)
.SetSupportsSharedDeviceBufferTextureMemory(true)
.SetSupportsFramebufferFetch(DeviceSupportsFramebufferFetch(device))
.SetDefaultColorFormat(color_format)
.SetDefaultStencilFormat(PixelFormat::kS8UInt)
Expand Down
6 changes: 0 additions & 6 deletions impeller/renderer/backend/vulkan/capabilities_vk.cc
Original file line number Diff line number Diff line change
Expand Up @@ -348,16 +348,10 @@ bool CapabilitiesVK::SupportsReadFromOnscreenTexture() const {
return false;
}

// |Capabilities|
bool CapabilitiesVK::SupportsDecalTileMode() const {
return true;
}

// |Capabilities|
bool CapabilitiesVK::SupportsSharedDeviceBufferTextureMemory() const {
return false;
}

// |Capabilities|
PixelFormat CapabilitiesVK::GetDefaultColorFormat() const {
return color_format_;
Expand Down
3 changes: 0 additions & 3 deletions impeller/renderer/backend/vulkan/capabilities_vk.h
Original file line number Diff line number Diff line change
Expand Up @@ -79,9 +79,6 @@ class CapabilitiesVK final : public Capabilities,
// |Capabilities|
bool SupportsDecalTileMode() const override;

// |Capabilities|
bool SupportsSharedDeviceBufferTextureMemory() const override;

// |Capabilities|
PixelFormat GetDefaultColorFormat() const override;

Expand Down
16 changes: 0 additions & 16 deletions impeller/renderer/capabilities.cc
Original file line number Diff line number Diff line change
Expand Up @@ -66,11 +66,6 @@ class StandardCapabilities final : public Capabilities {
return supports_decal_tile_mode_;
}

// |Capabilities|
bool SupportsSharedDeviceBufferTextureMemory() const override {
return supports_shared_device_buffer_texture_memory_;
}

// |Capabilities|
PixelFormat GetDefaultColorFormat() const override {
return default_color_format_;
Expand All @@ -93,7 +88,6 @@ class StandardCapabilities final : public Capabilities {
bool supports_read_from_onscreen_texture,
bool supports_read_from_resolve,
bool supports_decal_tile_mode,
bool supports_shared_device_buffer_texture_memory,
PixelFormat default_color_format,
PixelFormat default_stencil_format)
: has_threading_restrictions_(has_threading_restrictions),
Expand All @@ -108,8 +102,6 @@ class StandardCapabilities final : public Capabilities {
supports_read_from_onscreen_texture),
supports_read_from_resolve_(supports_read_from_resolve),
supports_decal_tile_mode_(supports_decal_tile_mode),
supports_shared_device_buffer_texture_memory_(
supports_shared_device_buffer_texture_memory),
default_color_format_(default_color_format),
default_stencil_format_(default_stencil_format) {}

Expand All @@ -126,7 +118,6 @@ class StandardCapabilities final : public Capabilities {
bool supports_read_from_onscreen_texture_ = false;
bool supports_read_from_resolve_ = false;
bool supports_decal_tile_mode_ = false;
bool supports_shared_device_buffer_texture_memory_ = false;
PixelFormat default_color_format_ = PixelFormat::kUnknown;
PixelFormat default_stencil_format_ = PixelFormat::kUnknown;

Expand Down Expand Up @@ -211,12 +202,6 @@ CapabilitiesBuilder& CapabilitiesBuilder::SetSupportsDecalTileMode(bool value) {
return *this;
}

CapabilitiesBuilder&
CapabilitiesBuilder::SetSupportsSharedDeviceBufferTextureMemory(bool value) {
supports_shared_device_buffer_texture_memory_ = value;
return *this;
}

std::unique_ptr<Capabilities> CapabilitiesBuilder::Build() {
return std::unique_ptr<StandardCapabilities>(new StandardCapabilities( //
has_threading_restrictions_, //
Expand All @@ -230,7 +215,6 @@ std::unique_ptr<Capabilities> CapabilitiesBuilder::Build() {
supports_read_from_onscreen_texture_, //
supports_read_from_resolve_, //
supports_decal_tile_mode_, //
supports_shared_device_buffer_texture_memory_, //
*default_color_format_, //
*default_stencil_format_ //
));
Expand Down
5 changes: 0 additions & 5 deletions impeller/renderer/capabilities.h
Original file line number Diff line number Diff line change
Expand Up @@ -37,8 +37,6 @@ class Capabilities {

virtual bool SupportsDecalTileMode() const = 0;

virtual bool SupportsSharedDeviceBufferTextureMemory() const = 0;

virtual PixelFormat GetDefaultColorFormat() const = 0;

virtual PixelFormat GetDefaultStencilFormat() const = 0;
Expand Down Expand Up @@ -81,8 +79,6 @@ class CapabilitiesBuilder {

CapabilitiesBuilder& SetSupportsDecalTileMode(bool value);

CapabilitiesBuilder& SetSupportsSharedDeviceBufferTextureMemory(bool value);

std::unique_ptr<Capabilities> Build();

private:
Expand All @@ -97,7 +93,6 @@ class CapabilitiesBuilder {
bool supports_read_from_onscreen_texture_ = false;
bool supports_read_from_resolve_ = false;
bool supports_decal_tile_mode_ = false;
bool supports_shared_device_buffer_texture_memory_ = false;
std::optional<PixelFormat> default_color_format_ = std::nullopt;
std::optional<PixelFormat> default_stencil_format_ = std::nullopt;

Expand Down
1 change: 0 additions & 1 deletion impeller/renderer/capabilities_unittests.cc
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,6 @@ CAPABILITY_TEST(SupportsComputeSubgroups, false);
CAPABILITY_TEST(SupportsReadFromOnscreenTexture, false);
CAPABILITY_TEST(SupportsReadFromResolve, false);
CAPABILITY_TEST(SupportsDecalTileMode, false);
CAPABILITY_TEST(SupportsSharedDeviceBufferTextureMemory, false);

} // namespace testing
} // namespace impeller
Loading