Skip to content

Commit 650c6e3

Browse files
zandersozanderso
authored
Revert "[Impeller] More sundry fixes to the Vulkan backend. (flutter#40244)" (flutter#40247)
Revert "[Impeller] More sundry fixes to the Vulkan backend."
1 parent 3ac895e commit 650c6e3

File tree

74 files changed

+1423
-2539
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

74 files changed

+1423
-2539
lines changed

‎ci/licenses_golden/licenses_flutter‎

Lines changed: 6 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -1411,18 +1411,10 @@ ORIGIN: ../../../flutter/impeller/renderer/backend/vulkan/command_buffer_vk.cc +
14111411
ORIGIN: ../../../flutter/impeller/renderer/backend/vulkan/command_buffer_vk.h + ../../../flutter/LICENSE
14121412
ORIGIN: ../../../flutter/impeller/renderer/backend/vulkan/command_encoder_vk.cc + ../../../flutter/LICENSE
14131413
ORIGIN: ../../../flutter/impeller/renderer/backend/vulkan/command_encoder_vk.h + ../../../flutter/LICENSE
1414-
ORIGIN: ../../../flutter/impeller/renderer/backend/vulkan/command_pool_vk.cc + ../../../flutter/LICENSE
1415-
ORIGIN: ../../../flutter/impeller/renderer/backend/vulkan/command_pool_vk.h + ../../../flutter/LICENSE
14161414
ORIGIN: ../../../flutter/impeller/renderer/backend/vulkan/context_vk.cc + ../../../flutter/LICENSE
14171415
ORIGIN: ../../../flutter/impeller/renderer/backend/vulkan/context_vk.h + ../../../flutter/LICENSE
1418-
ORIGIN: ../../../flutter/impeller/renderer/backend/vulkan/debug_report_vk.cc + ../../../flutter/LICENSE
1419-
ORIGIN: ../../../flutter/impeller/renderer/backend/vulkan/debug_report_vk.h + ../../../flutter/LICENSE
1420-
ORIGIN: ../../../flutter/impeller/renderer/backend/vulkan/descriptor_pool_vk.cc + ../../../flutter/LICENSE
1421-
ORIGIN: ../../../flutter/impeller/renderer/backend/vulkan/descriptor_pool_vk.h + ../../../flutter/LICENSE
14221416
ORIGIN: ../../../flutter/impeller/renderer/backend/vulkan/device_buffer_vk.cc + ../../../flutter/LICENSE
14231417
ORIGIN: ../../../flutter/impeller/renderer/backend/vulkan/device_buffer_vk.h + ../../../flutter/LICENSE
1424-
ORIGIN: ../../../flutter/impeller/renderer/backend/vulkan/fence_waiter_vk.cc + ../../../flutter/LICENSE
1425-
ORIGIN: ../../../flutter/impeller/renderer/backend/vulkan/fence_waiter_vk.h + ../../../flutter/LICENSE
14261418
ORIGIN: ../../../flutter/impeller/renderer/backend/vulkan/formats_vk.cc + ../../../flutter/LICENSE
14271419
ORIGIN: ../../../flutter/impeller/renderer/backend/vulkan/formats_vk.h + ../../../flutter/LICENSE
14281420
ORIGIN: ../../../flutter/impeller/renderer/backend/vulkan/pipeline_library_vk.cc + ../../../flutter/LICENSE
@@ -1464,8 +1456,6 @@ ORIGIN: ../../../flutter/impeller/renderer/buffer.cc + ../../../flutter/LICENSE
14641456
ORIGIN: ../../../flutter/impeller/renderer/buffer.h + ../../../flutter/LICENSE
14651457
ORIGIN: ../../../flutter/impeller/renderer/buffer_view.cc + ../../../flutter/LICENSE
14661458
ORIGIN: ../../../flutter/impeller/renderer/buffer_view.h + ../../../flutter/LICENSE
1467-
ORIGIN: ../../../flutter/impeller/renderer/capabilities.cc + ../../../flutter/LICENSE
1468-
ORIGIN: ../../../flutter/impeller/renderer/capabilities.h + ../../../flutter/LICENSE
14691459
ORIGIN: ../../../flutter/impeller/renderer/command.cc + ../../../flutter/LICENSE
14701460
ORIGIN: ../../../flutter/impeller/renderer/command.h + ../../../flutter/LICENSE
14711461
ORIGIN: ../../../flutter/impeller/renderer/command_buffer.cc + ../../../flutter/LICENSE
@@ -1480,10 +1470,13 @@ ORIGIN: ../../../flutter/impeller/renderer/compute_pipeline_descriptor.cc + ../.
14801470
ORIGIN: ../../../flutter/impeller/renderer/compute_pipeline_descriptor.h + ../../../flutter/LICENSE
14811471
ORIGIN: ../../../flutter/impeller/renderer/context.cc + ../../../flutter/LICENSE
14821472
ORIGIN: ../../../flutter/impeller/renderer/context.h + ../../../flutter/LICENSE
1473+
ORIGIN: ../../../flutter/impeller/renderer/descriptor_set_layout.h + ../../../flutter/LICENSE
14831474
ORIGIN: ../../../flutter/impeller/renderer/device_buffer.cc + ../../../flutter/LICENSE
14841475
ORIGIN: ../../../flutter/impeller/renderer/device_buffer.h + ../../../flutter/LICENSE
14851476
ORIGIN: ../../../flutter/impeller/renderer/device_buffer_descriptor.cc + ../../../flutter/LICENSE
14861477
ORIGIN: ../../../flutter/impeller/renderer/device_buffer_descriptor.h + ../../../flutter/LICENSE
1478+
ORIGIN: ../../../flutter/impeller/renderer/device_capabilities.cc + ../../../flutter/LICENSE
1479+
ORIGIN: ../../../flutter/impeller/renderer/device_capabilities.h + ../../../flutter/LICENSE
14871480
ORIGIN: ../../../flutter/impeller/renderer/formats.cc + ../../../flutter/LICENSE
14881481
ORIGIN: ../../../flutter/impeller/renderer/formats.h + ../../../flutter/LICENSE
14891482
ORIGIN: ../../../flutter/impeller/renderer/gpu_tracer.cc + ../../../flutter/LICENSE
@@ -3947,18 +3940,10 @@ FILE: ../../../flutter/impeller/renderer/backend/vulkan/command_buffer_vk.cc
39473940
FILE: ../../../flutter/impeller/renderer/backend/vulkan/command_buffer_vk.h
39483941
FILE: ../../../flutter/impeller/renderer/backend/vulkan/command_encoder_vk.cc
39493942
FILE: ../../../flutter/impeller/renderer/backend/vulkan/command_encoder_vk.h
3950-
FILE: ../../../flutter/impeller/renderer/backend/vulkan/command_pool_vk.cc
3951-
FILE: ../../../flutter/impeller/renderer/backend/vulkan/command_pool_vk.h
39523943
FILE: ../../../flutter/impeller/renderer/backend/vulkan/context_vk.cc
39533944
FILE: ../../../flutter/impeller/renderer/backend/vulkan/context_vk.h
3954-
FILE: ../../../flutter/impeller/renderer/backend/vulkan/debug_report_vk.cc
3955-
FILE: ../../../flutter/impeller/renderer/backend/vulkan/debug_report_vk.h
3956-
FILE: ../../../flutter/impeller/renderer/backend/vulkan/descriptor_pool_vk.cc
3957-
FILE: ../../../flutter/impeller/renderer/backend/vulkan/descriptor_pool_vk.h
39583945
FILE: ../../../flutter/impeller/renderer/backend/vulkan/device_buffer_vk.cc
39593946
FILE: ../../../flutter/impeller/renderer/backend/vulkan/device_buffer_vk.h
3960-
FILE: ../../../flutter/impeller/renderer/backend/vulkan/fence_waiter_vk.cc
3961-
FILE: ../../../flutter/impeller/renderer/backend/vulkan/fence_waiter_vk.h
39623947
FILE: ../../../flutter/impeller/renderer/backend/vulkan/formats_vk.cc
39633948
FILE: ../../../flutter/impeller/renderer/backend/vulkan/formats_vk.h
39643949
FILE: ../../../flutter/impeller/renderer/backend/vulkan/pipeline_library_vk.cc
@@ -4000,8 +3985,6 @@ FILE: ../../../flutter/impeller/renderer/buffer.cc
40003985
FILE: ../../../flutter/impeller/renderer/buffer.h
40013986
FILE: ../../../flutter/impeller/renderer/buffer_view.cc
40023987
FILE: ../../../flutter/impeller/renderer/buffer_view.h
4003-
FILE: ../../../flutter/impeller/renderer/capabilities.cc
4004-
FILE: ../../../flutter/impeller/renderer/capabilities.h
40053988
FILE: ../../../flutter/impeller/renderer/command.cc
40063989
FILE: ../../../flutter/impeller/renderer/command.h
40073990
FILE: ../../../flutter/impeller/renderer/command_buffer.cc
@@ -4016,10 +3999,13 @@ FILE: ../../../flutter/impeller/renderer/compute_pipeline_descriptor.cc
40163999
FILE: ../../../flutter/impeller/renderer/compute_pipeline_descriptor.h
40174000
FILE: ../../../flutter/impeller/renderer/context.cc
40184001
FILE: ../../../flutter/impeller/renderer/context.h
4002+
FILE: ../../../flutter/impeller/renderer/descriptor_set_layout.h
40194003
FILE: ../../../flutter/impeller/renderer/device_buffer.cc
40204004
FILE: ../../../flutter/impeller/renderer/device_buffer.h
40214005
FILE: ../../../flutter/impeller/renderer/device_buffer_descriptor.cc
40224006
FILE: ../../../flutter/impeller/renderer/device_buffer_descriptor.h
4007+
FILE: ../../../flutter/impeller/renderer/device_capabilities.cc
4008+
FILE: ../../../flutter/impeller/renderer/device_capabilities.h
40234009
FILE: ../../../flutter/impeller/renderer/formats.cc
40244010
FILE: ../../../flutter/impeller/renderer/formats.h
40254011
FILE: ../../../flutter/impeller/renderer/gpu_tracer.cc

‎impeller/aiks/aiks_unittests.cc‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -108,7 +108,7 @@ bool GenerateMipmap(const std::shared_ptr<Context>& context,
108108
}
109109
pass->GenerateMipmap(std::move(texture), std::move(label));
110110
pass->EncodeCommands(context->GetResourceAllocator());
111-
return buffer->SubmitCommands();
111+
return true;
112112
}
113113

114114
TEST_P(AiksTest, CanRenderTiledTexture) {

‎impeller/aiks/picture.cc‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ std::shared_ptr<Texture> Picture::RenderToTexture(
5454
// features to Image someday.
5555
auto impeller_context = context.GetContext();
5656
RenderTarget target;
57-
if (impeller_context->GetCapabilities()->SupportsOffscreenMSAA()) {
57+
if (impeller_context->GetDeviceCapabilities().SupportsOffscreenMSAA()) {
5858
target = RenderTarget::CreateOffscreenMSAA(*impeller_context, size);
5959
} else {
6060
target = RenderTarget::CreateOffscreen(*impeller_context, size);

‎impeller/compiler/code_gen_template.h‎

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,8 @@ constexpr std::string_view kReflectionHeaderTemplate =
2222
2323
#include "impeller/renderer/compute_command.h" {# // nogncheck #}
2424
25+
#include "impeller/renderer/descriptor_set_layout.h" {# // nogncheck #}
26+
2527
#include "impeller/renderer/sampler.h" {# // nogncheck #}
2628
2729
#include "impeller/renderer/shader_types.h" {# // nogncheck #}
@@ -164,15 +166,17 @@ std::move({{ arg.argument_name }}){% if not loop.is_last %}, {% endif %}
164166
{% for buffer in buffers %}
165167
DescriptorSetLayout{
166168
{{buffer.binding}}, // binding = {{buffer.binding}}
167-
DescriptorType::kUniformBuffer, // descriptor_type = Uniform Buffer
168-
{{to_shader_stage(shader_stage)}}, // shader_stage = {{to_shader_stage(shader_stage)}}
169+
DescriptorType::kUniformBuffer, // descriptorType = Uniform Buffer
170+
1, // descriptorCount = 1
171+
{{to_shader_stage(shader_stage)}}, // stageFlags = {{to_shader_stage(shader_stage)}}
169172
},
170173
{% endfor %}
171174
{% for sampled_image in sampled_images %}
172175
DescriptorSetLayout{
173176
{{sampled_image.binding}}, // binding = {{sampled_image.binding}}
174-
DescriptorType::kSampledImage, // descriptor_type = Sampled Image
175-
{{to_shader_stage(shader_stage)}}, // shader_stage = {{to_shader_stage(shader_stage)}}
177+
DescriptorType::kSampledImage, // descriptorType = Sampled Image
178+
1, // descriptorCount = 1
179+
{{to_shader_stage(shader_stage)}}, // stageFlags = {{to_shader_stage(shader_stage)}}
176180
},
177181
{% endfor %}
178182
};

‎impeller/entity/contents/content_context.cc‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -154,8 +154,7 @@ static std::unique_ptr<PipelineT> CreateDefaultPipeline(
154154
return nullptr;
155155
}
156156
// Apply default ContentContextOptions to the descriptor.
157-
const auto default_color_fmt =
158-
context.GetCapabilities()->GetDefaultColorFormat();
157+
const auto default_color_fmt = context.GetColorAttachmentPixelFormat();
159158
ContentContextOptions{.color_attachment_pixel_format = default_color_fmt}
160159
.ApplyToPipelineDescriptor(*desc);
161160
return std::make_unique<PipelineT>(context, desc);
@@ -176,15 +175,15 @@ ContentContext::ContentContext(std::shared_ptr<Context> context)
176175
CreateDefaultPipeline<LinearGradientFillPipeline>(*context_);
177176
radial_gradient_fill_pipelines_[{}] =
178177
CreateDefaultPipeline<RadialGradientFillPipeline>(*context_);
179-
if (context_->GetCapabilities()->SupportsSSBO()) {
178+
if (context_->GetDeviceCapabilities().SupportsSSBO()) {
180179
linear_gradient_ssbo_fill_pipelines_[{}] =
181180
CreateDefaultPipeline<LinearGradientSSBOFillPipeline>(*context_);
182181
radial_gradient_ssbo_fill_pipelines_[{}] =
183182
CreateDefaultPipeline<RadialGradientSSBOFillPipeline>(*context_);
184183
sweep_gradient_ssbo_fill_pipelines_[{}] =
185184
CreateDefaultPipeline<SweepGradientSSBOFillPipeline>(*context_);
186185
}
187-
if (context_->GetCapabilities()->SupportsFramebufferFetch()) {
186+
if (context_->GetDeviceCapabilities().SupportsFramebufferFetch()) {
188187
framebuffer_blend_color_pipelines_[{}] =
189188
CreateDefaultPipeline<FramebufferBlendColorPipeline>(*context_);
190189
framebuffer_blend_colorburn_pipelines_[{}] =
@@ -316,7 +315,8 @@ std::shared_ptr<Texture> ContentContext::MakeSubpass(
316315
auto context = GetContext();
317316

318317
RenderTarget subpass_target;
319-
if (context->GetCapabilities()->SupportsOffscreenMSAA() && msaa_enabled) {
318+
if (context->GetDeviceCapabilities().SupportsOffscreenMSAA() &&
319+
msaa_enabled) {
320320
subpass_target = RenderTarget::CreateOffscreenMSAA(
321321
*context, texture_size, SPrintF("%s Offscreen", label.c_str()),
322322
RenderTarget::kDefaultColorAttachmentConfigMSAA, std::nullopt);
@@ -374,8 +374,8 @@ std::shared_ptr<Context> ContentContext::GetContext() const {
374374
return context_;
375375
}
376376

377-
const Capabilities& ContentContext::GetDeviceCapabilities() const {
378-
return *context_->GetCapabilities();
377+
const IDeviceCapabilities& ContentContext::GetDeviceCapabilities() const {
378+
return context_->GetDeviceCapabilities();
379379
}
380380

381381
void ContentContext::SetWireframe(bool wireframe) {

‎impeller/entity/contents/content_context.h‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@
4747
#include "impeller/entity/vertices.frag.h"
4848
#include "impeller/entity/yuv_to_rgb_filter.frag.h"
4949
#include "impeller/entity/yuv_to_rgb_filter.vert.h"
50-
#include "impeller/renderer/capabilities.h"
50+
#include "impeller/renderer/device_capabilities.h"
5151
#include "impeller/renderer/formats.h"
5252
#include "impeller/renderer/pipeline.h"
5353
#include "impeller/scene/scene_context.h"
@@ -601,7 +601,7 @@ class ContentContext {
601601

602602
std::shared_ptr<GlyphAtlasContext> GetGlyphAtlasContext() const;
603603

604-
const Capabilities& GetDeviceCapabilities() const;
604+
const IDeviceCapabilities& GetDeviceCapabilities() const;
605605

606606
void SetWireframe(bool wireframe);
607607

‎impeller/entity/contents/runtime_effect_contents.cc‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -102,9 +102,10 @@ bool RuntimeEffectContents::Render(const ContentContext& renderer,
102102
/// Get or create runtime stage pipeline.
103103
///
104104

105-
const auto& caps = context->GetCapabilities();
106-
const auto color_attachment_format = caps->GetDefaultColorFormat();
107-
const auto stencil_attachment_format = caps->GetDefaultStencilFormat();
105+
const auto& device_capabilities = context->GetDeviceCapabilities();
106+
const auto color_attachment_format = context->GetColorAttachmentPixelFormat();
107+
const auto stencil_attachment_format =
108+
device_capabilities.GetDefaultStencilFormat();
108109

109110
using VS = RuntimeEffectVertexShader;
110111
PipelineDescriptor desc;

‎impeller/entity/entity_pass.cc‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -152,7 +152,7 @@ static RenderTarget CreateRenderTarget(ContentContext& renderer,
152152
/// What's important is the `StorageMode` of the textures, which cannot be
153153
/// changed for the lifetime of the textures.
154154

155-
if (context->GetCapabilities()->SupportsOffscreenMSAA()) {
155+
if (context->GetDeviceCapabilities().SupportsOffscreenMSAA()) {
156156
return RenderTarget::CreateOffscreenMSAA(
157157
*context, // context
158158
size, // size
@@ -210,8 +210,8 @@ bool EntityPass::Render(ContentContext& renderer,
210210
command_buffer->SetLabel("EntityPass Root Command Buffer");
211211

212212
if (renderer.GetContext()
213-
->GetCapabilities()
214-
->SupportsTextureToTextureBlits()) {
213+
->GetDeviceCapabilities()
214+
.SupportsTextureToTextureBlits()) {
215215
auto blit_pass = command_buffer->CreateBlitPass();
216216

217217
blit_pass->AddCopy(offscreen_target.GetRenderTargetTexture(),

‎impeller/playground/backend/metal/playground_impl_mtl.mm‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -82,8 +82,9 @@
8282
}
8383
data_->metal_layer = [CAMetalLayer layer];
8484
data_->metal_layer.device = ContextMTL::Cast(*context).GetMTLDevice();
85-
data_->metal_layer.pixelFormat =
86-
ToMTLPixelFormat(context->GetCapabilities()->GetDefaultColorFormat());
85+
// This pixel format is one of the documented supported formats.
86+
const auto color_fmt = context->GetColorAttachmentPixelFormat();
87+
data_->metal_layer.pixelFormat = ToMTLPixelFormat(color_fmt);
8788
data_->metal_layer.framebufferOnly = NO;
8889
cocoa_window.contentView.layer = data_->metal_layer;
8990
cocoa_window.contentView.wantsLayer = YES;

‎impeller/playground/playground.cc‎

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -402,13 +402,8 @@ std::shared_ptr<Texture> Playground::CreateTextureForFixture(
402402
std::shared_ptr<Texture> Playground::CreateTextureForFixture(
403403
const char* fixture_name,
404404
bool enable_mipmapping) const {
405-
auto texture = CreateTextureForFixture(OpenAssetAsMapping(fixture_name),
406-
enable_mipmapping);
407-
if (texture == nullptr) {
408-
return nullptr;
409-
}
410-
texture->SetLabel(fixture_name);
411-
return texture;
405+
return CreateTextureForFixture(OpenAssetAsMapping(fixture_name),
406+
enable_mipmapping);
412407
}
413408

414409
std::shared_ptr<Texture> Playground::CreateTextureCubeForFixture(

0 commit comments

Comments
 (0)