Skip to content

Commit d0a4259

Browse files
committed
Disable xll and fix vulkan build error
1 parent 223ff62 commit d0a4259

File tree

3 files changed

+11
-12
lines changed

3 files changed

+11
-12
lines changed

engine/src/build_overrides/vulkan_headers.gni

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,6 @@
66
# set anything.
77

88
if (is_linux) {
9-
vulkan_use_x11 = true
9+
vulkan_use_x11 = false
1010
vulkan_use_wayland = true
1111
}

engine/src/flutter/shell/platform/embedder/embedder_external_texture_vulkan.cc

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -35,28 +35,27 @@ EmbedderExternalTextureVulkan::EmbedderExternalTextureVulkan(
3535

3636
// |flutter::Texture|
3737
void EmbedderExternalTextureVulkan::Paint(PaintContext& context,
38-
const SkRect& bounds,
38+
const DlRect& bounds,
3939
bool freeze,
4040
const DlImageSampling sampling) {
4141
if (last_image_ == nullptr) {
4242
last_image_ =
43-
ResolveTexture(Id(), //
44-
context.gr_context, //
45-
context.aiks_context, //
46-
SkISize::Make(bounds.width(), bounds.height()) //
43+
ResolveTexture(Id(), //
44+
context.gr_context, //
45+
context.aiks_context, //
46+
SkISize::Make(bounds.GetWidth(), bounds.GetHeight()) //
4747
);
4848
}
4949

5050
DlCanvas* canvas = context.canvas;
5151
const DlPaint* paint = context.paint;
5252

5353
if (last_image_) {
54-
SkRect image_bounds = SkRect::Make(last_image_->bounds());
54+
DlRect image_bounds = DlRect::Make(last_image_->GetBounds());
5555
if (bounds != image_bounds) {
5656
canvas->DrawImageRect(last_image_, image_bounds, bounds, sampling, paint);
5757
} else {
58-
canvas->DrawImage(last_image_, SkPoint{bounds.x(), bounds.y()}, sampling,
59-
paint);
58+
canvas->DrawImage(last_image_, bounds.GetOrigin(), sampling, paint);
6059
}
6160
}
6261
}

engine/src/flutter/shell/platform/embedder/embedder_external_texture_vulkan.h

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -41,9 +41,9 @@ class EmbedderExternalTextureVulkan : public flutter::Texture {
4141

4242
// |flutter::Texture|
4343
void Paint(PaintContext& context,
44-
const SkRect& bounds,
45-
bool freeze,
46-
const DlImageSampling sampling) override;
44+
const DlRect& bounds,
45+
bool freeze,
46+
const DlImageSampling sampling) override;
4747

4848
// |flutter::Texture|
4949
void OnGrContextCreated() override;

0 commit comments

Comments
 (0)