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

Initial support for images in Skwasm #42019

Merged
auto-submit merged 11 commits into from
May 16, 2023
+1,120 −218
Merged

Initial support for images in Skwasm #42019

Show file tree
Hide file tree
Changes from 8 commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
e212cd1
Initial pass at picture to image.
eyebrowsoffire May 9, 2023
7f8db30
Added a unit test and a fix.
eyebrowsoffire May 9, 2023
85fe346
Add support for image shaders and binding to fragment shaders.
eyebrowsoffire May 10, 2023
7f56e89
Add test for image shader.
eyebrowsoffire May 10, 2023
1122814
Partway through image rasterization.
eyebrowsoffire May 10, 2023
0544f10
Implement toByteData on images.
eyebrowsoffire May 11, 2023
fcec0ae
Image from pixel data.
eyebrowsoffire May 11, 2023
7009a83
Update licenses golden.
eyebrowsoffire May 13, 2023
4a2f1e5
Add support for rgbaFloat32 pixel format.
eyebrowsoffire May 16, 2023
fb6c2a6
Addressed more of Yegor's comments.
eyebrowsoffire May 16, 2023
36f988b
Merge branch 'main' into skwasm_image
eyebrowsoffire May 16, 2023
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
4 changes: 4 additions & 0 deletions ci/licenses_golden/licenses_flutter
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2007,6 +2007,7 @@ ORIGIN: ../../../flutter/lib/web_ui/lib/src/engine/skwasm/skwasm_impl/picture.da
ORIGIN: ../../../flutter/lib/web_ui/lib/src/engine/skwasm/skwasm_impl/raw/raw_canvas.dart + ../../../flutter/LICENSE
ORIGIN: ../../../flutter/lib/web_ui/lib/src/engine/skwasm/skwasm_impl/raw/raw_fonts.dart + ../../../flutter/LICENSE
ORIGIN: ../../../flutter/lib/web_ui/lib/src/engine/skwasm/skwasm_impl/raw/raw_geometry.dart + ../../../flutter/LICENSE
ORIGIN: ../../../flutter/lib/web_ui/lib/src/engine/skwasm/skwasm_impl/raw/raw_image.dart + ../../../flutter/LICENSE
ORIGIN: ../../../flutter/lib/web_ui/lib/src/engine/skwasm/skwasm_impl/raw/raw_memory.dart + ../../../flutter/LICENSE
ORIGIN: ../../../flutter/lib/web_ui/lib/src/engine/skwasm/skwasm_impl/raw/raw_paint.dart + ../../../flutter/LICENSE
ORIGIN: ../../../flutter/lib/web_ui/lib/src/engine/skwasm/skwasm_impl/raw/raw_path.dart + ../../../flutter/LICENSE
Expand Down Expand Up @@ -2077,6 +2078,7 @@ ORIGIN: ../../../flutter/lib/web_ui/skwasm/data.cpp + ../../../flutter/LICENSE
ORIGIN: ../../../flutter/lib/web_ui/skwasm/export.h + ../../../flutter/LICENSE
ORIGIN: ../../../flutter/lib/web_ui/skwasm/fonts.cpp + ../../../flutter/LICENSE
ORIGIN: ../../../flutter/lib/web_ui/skwasm/helpers.h + ../../../flutter/LICENSE
ORIGIN: ../../../flutter/lib/web_ui/skwasm/image.cpp + ../../../flutter/LICENSE
ORIGIN: ../../../flutter/lib/web_ui/skwasm/paint.cpp + ../../../flutter/LICENSE
ORIGIN: ../../../flutter/lib/web_ui/skwasm/path.cpp + ../../../flutter/LICENSE
ORIGIN: ../../../flutter/lib/web_ui/skwasm/picture.cpp + ../../../flutter/LICENSE
Expand Down Expand Up @@ -4626,6 +4628,7 @@ FILE: ../../../flutter/lib/web_ui/lib/src/engine/skwasm/skwasm_impl/picture.dart
FILE: ../../../flutter/lib/web_ui/lib/src/engine/skwasm/skwasm_impl/raw/raw_canvas.dart
FILE: ../../../flutter/lib/web_ui/lib/src/engine/skwasm/skwasm_impl/raw/raw_fonts.dart
FILE: ../../../flutter/lib/web_ui/lib/src/engine/skwasm/skwasm_impl/raw/raw_geometry.dart
FILE: ../../../flutter/lib/web_ui/lib/src/engine/skwasm/skwasm_impl/raw/raw_image.dart
FILE: ../../../flutter/lib/web_ui/lib/src/engine/skwasm/skwasm_impl/raw/raw_memory.dart
FILE: ../../../flutter/lib/web_ui/lib/src/engine/skwasm/skwasm_impl/raw/raw_paint.dart
FILE: ../../../flutter/lib/web_ui/lib/src/engine/skwasm/skwasm_impl/raw/raw_path.dart
Expand Down Expand Up @@ -4696,6 +4699,7 @@ FILE: ../../../flutter/lib/web_ui/skwasm/data.cpp
FILE: ../../../flutter/lib/web_ui/skwasm/export.h
FILE: ../../../flutter/lib/web_ui/skwasm/fonts.cpp
FILE: ../../../flutter/lib/web_ui/skwasm/helpers.h
FILE: ../../../flutter/lib/web_ui/skwasm/image.cpp
FILE: ../../../flutter/lib/web_ui/skwasm/paint.cpp
FILE: ../../../flutter/lib/web_ui/skwasm/path.cpp
FILE: ../../../flutter/lib/web_ui/skwasm/picture.cpp
Expand Down
2 changes: 2 additions & 0 deletions lib/web_ui/lib/painting.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -398,6 +398,7 @@ class MaskFilter {
String toString() => 'MaskFilter.blur($_style, ${_sigma.toStringAsFixed(1)})';
}

// This needs to be kept in sync with the "_FilterQuality" enum in skwasm's canvas.cpp
enum FilterQuality {
none,
low,
Expand Down Expand Up @@ -438,6 +439,7 @@ enum ColorSpace {
extendedSRGB,
}

// This must be kept in sync with the `ImageByteFormat` enum in Skwasm's surface.cpp.
enum ImageByteFormat {
rawRgba,
rawStraightRgba,
Expand Down
1 change: 1 addition & 0 deletions lib/web_ui/lib/src/engine/skwasm/skwasm_impl.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@ export 'skwasm_impl/picture.dart';
export 'skwasm_impl/raw/raw_canvas.dart';
export 'skwasm_impl/raw/raw_fonts.dart';
export 'skwasm_impl/raw/raw_geometry.dart';
export 'skwasm_impl/raw/raw_image.dart';
export 'skwasm_impl/raw/raw_memory.dart';
export 'skwasm_impl/raw/raw_paint.dart';
export 'skwasm_impl/raw/raw_path.dart';
Expand Down
48 changes: 39 additions & 9 deletions lib/web_ui/lib/src/engine/skwasm/skwasm_impl/canvas.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -183,21 +183,51 @@ class SkwasmCanvas implements ui.Canvas {
}

@override
void drawImage(ui.Image uiImage, ui.Offset offset, ui.Paint uiPaint) {
throw UnimplementedError();
}
void drawImage(ui.Image image, ui.Offset offset, ui.Paint paint) =>
canvasDrawImage(
_handle,
(image as SkwasmImage).handle,
offset.dx,
offset.dy,
(paint as SkwasmPaint).handle,
paint.filterQuality.index,
);

@override
void drawImageRect(
ui.Image uiImage, ui.Rect src, ui.Rect dst, ui.Paint uiPaint) {
throw UnimplementedError();
}
ui.Image image,
ui.Rect src,
ui.Rect dst,
ui.Paint paint) => withStackScope((StackScope scope) {
final Pointer<Float> sourceRect = scope.convertRectToNative(src);
final Pointer<Float> destRect = scope.convertRectToNative(dst);
canvasDrawImageRect(
_handle,
(image as SkwasmImage).handle,
sourceRect,
destRect,
(paint as SkwasmPaint).handle,
paint.filterQuality.index,
);
});

@override
void drawImageNine(
ui.Image uiImage, ui.Rect center, ui.Rect dst, ui.Paint uiPaint) {
throw UnimplementedError();
}
ui.Image image,
ui.Rect center,
ui.Rect dst,
ui.Paint paint) => withStackScope((StackScope scope) {
final Pointer<Int32> centerRect = scope.convertIRectToNative(center);
final Pointer<Float> destRect = scope.convertRectToNative(dst);
canvasDrawImageNine(
_handle,
(image as SkwasmImage).handle,
centerRect,
destRect,
(paint as SkwasmPaint).handle,
paint.filterQuality.index,
);
});

@override
void drawPicture(ui.Picture picture) {
Expand Down
50 changes: 39 additions & 11 deletions lib/web_ui/lib/src/engine/skwasm/skwasm_impl/image.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,39 +2,67 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.

import 'dart:ffi';
import 'dart:typed_data';

import 'package:ui/src/engine.dart';
import 'package:ui/src/engine/skwasm/skwasm_impl.dart';
import 'package:ui/ui.dart' as ui;

class SkwasmImage implements ui.Image {
@override
int get width {
throw UnimplementedError();
SkwasmImage(this.handle);

factory SkwasmImage.fromPixels(
Uint8List pixels,
int width,
int height,
ui.PixelFormat format, {
int? rowBytes,
}) {
final SkDataHandle dataHandle = skDataCreate(pixels.length);
final Pointer<Uint8> dataPointer = skDataGetPointer(dataHandle).cast<Uint8>();
for (int i = 0; i < pixels.length; i++) {
dataPointer[i] = pixels[i];
}
final ImageHandle imageHandle = imageCreateFromPixels(
dataHandle,
width,
height,
format == ui.PixelFormat.bgra8888,

@yjbanov yjbanov May 15, 2023

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Is a bool sufficient to express all pixel formats we have? https://api.flutter.dev/flutter/dart-ui/PixelFormat.html

@eyebrowsoffire eyebrowsoffire May 15, 2023

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Well, we just have the two formats in web:

enum PixelFormat {
  rgba8888,
  bgra8888,
}

So I figured it was simpler to pass a bool for now. We can change it to an enum later if we have more than two.

@yjbanov yjbanov May 15, 2023

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Oh, that looks like a bug. PixelFormat is part of dart:ui, which is expected to be identical across all platforms.

@eyebrowsoffire eyebrowsoffire May 16, 2023

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I added support for it in Skwasm, but it's still not supported in all the renderers and the bitmap creation code path. I filed flutter/flutter#126895 as a follow-on.

rowBytes ?? 4 * width,
);
skDataDispose(dataHandle);
return SkwasmImage(imageHandle);
}

final ImageHandle handle;
bool _isDisposed = false;

@override
int get height {
throw UnimplementedError();
}
int get width => imageGetWidth(handle);

@override
int get height => imageGetHeight(handle);

@override
Future<ByteData?> toByteData(
{ui.ImageByteFormat format = ui.ImageByteFormat.rawRgba}) {
throw UnimplementedError();
return (renderer as SkwasmRenderer).surface.rasterizeImage(this, format);
}

@override
ui.ColorSpace get colorSpace => ui.ColorSpace.sRGB;

@override
void dispose() {
throw UnimplementedError();
if (!_isDisposed) {
imageDispose(handle);
_isDisposed = true;
}
}

@override
bool get debugDisposed {
throw UnimplementedError();
}
bool get debugDisposed => _isDisposed;

@override
SkwasmImage clone() => this;
Expand Down
28 changes: 14 additions & 14 deletions lib/web_ui/lib/src/engine/skwasm/skwasm_impl/paint.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,31 +76,31 @@ class SkwasmPaint implements ui.Paint {
@override
set strokeMiterLimit(double limit) => paintSetMiterLimit(_handle, limit);

// Unimplemented stuff below
@override
ui.ColorFilter? colorFilter;
ui.Shader? get shader => _shader;

@override
ui.FilterQuality filterQuality = ui.FilterQuality.none;
set shader(ui.Shader? uiShader) {
final SkwasmShader? skwasmShader = uiShader as SkwasmShader?;
_shader = skwasmShader;
final ShaderHandle shaderHandle =
skwasmShader != null ? skwasmShader.handle : nullptr;
paintSetShader(_handle, shaderHandle);
}

@override
ui.ImageFilter? imageFilter;
ui.FilterQuality filterQuality = ui.FilterQuality.none;

// Unimplemented stuff below
@override
bool invertColors = false;
ui.ColorFilter? colorFilter;

@override
ui.MaskFilter? maskFilter;
ui.ImageFilter? imageFilter;

@override
ui.Shader? get shader => _shader;
bool invertColors = false;

@override
set shader(ui.Shader? uiShader) {
final SkwasmShader? skwasmShader = uiShader as SkwasmShader?;
_shader = skwasmShader;
final ShaderHandle shaderHandle =
skwasmShader != null ? skwasmShader.handle : nullptr;
paintSetShader(_handle, shaderHandle);
}
ui.MaskFilter? maskFilter;
}
10 changes: 3 additions & 7 deletions lib/web_ui/lib/src/engine/skwasm/skwasm_impl/picture.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,7 @@ class SkwasmPicture implements ui.Picture {
PictureHandle get handle => _handle;

@override
Future<ui.Image> toImage(int width, int height) {
throw UnimplementedError();
}
Future<ui.Image> toImage(int width, int height) async => toImageSync(width, height);

@override
void dispose() {
Expand All @@ -30,10 +28,8 @@ class SkwasmPicture implements ui.Picture {
bool debugDisposed = false;

@override
ui.Image toImageSync(int width, int height) {
// TODO(jacksongardner): implement toImageSync
throw UnimplementedError();
}
ui.Image toImageSync(int width, int height) =>
SkwasmImage(imageCreateFromPicture(handle, width, height));

ui.Rect get cullRect {
return withStackScope((StackScope s) {
Expand Down
55 changes: 53 additions & 2 deletions lib/web_ui/lib/src/engine/skwasm/skwasm_impl/raw/raw_canvas.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,9 @@ import 'dart:ffi';

import 'package:ui/src/engine/skwasm/skwasm_impl.dart';

final class CanvasWrapper extends Opaque {}
final class RawCanvas extends Opaque {}

typedef CanvasHandle = Pointer<CanvasWrapper>;
typedef CanvasHandle = Pointer<RawCanvas>;

@Native<Void Function(CanvasHandle)>(symbol: 'canvas_destroy', isLeaf: true)
external void canvasDestroy(CanvasHandle canvas);
Expand Down Expand Up @@ -126,6 +126,57 @@ external void canvasDrawPath(
symbol: 'canvas_drawPicture', isLeaf: true)
external void canvasDrawPicture(CanvasHandle canvas, PictureHandle picture);

@Native<Void Function(
CanvasHandle,
ImageHandle,
Float,
Float,
PaintHandle,
Int
)>(symbol: 'canvas_drawImage', isLeaf: true)
external void canvasDrawImage(
CanvasHandle handle,
ImageHandle image,
double offsetX,
double offsetY,
PaintHandle paint,
int filterQuality,
);

@Native<Void Function(
CanvasHandle,
ImageHandle,
Pointer<Float>,
Pointer<Float>,
PaintHandle,
Int,
)>(symbol: 'canvas_drawImageRect', isLeaf: true)
external void canvasDrawImageRect(
CanvasHandle handle,
ImageHandle image,
Pointer<Float> sourceRect,
Pointer<Float> destRect,
PaintHandle paint,
int filterQuality,
);

@Native<Void Function(
CanvasHandle,
ImageHandle,
Pointer<Int32>,
Pointer<Float>,
PaintHandle,
Int,
)>(symbol: 'canvas_drawImageNine', isLeaf: true)
external void canvasDrawImageNine(
CanvasHandle handle,
ImageHandle image,
Pointer<Int32> centerRect,
Pointer<Float> destRect,
PaintHandle paint,
int filterQuality,
);

@Native<Void Function(CanvasHandle, PathHandle, Float, Float, Int32, Bool)>(
symbol: 'canvas_drawShadow', isLeaf: true)
external void canvasDrawShadow(
Expand Down
48 changes: 48 additions & 0 deletions lib/web_ui/lib/src/engine/skwasm/skwasm_impl/raw/raw_image.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,48 @@
// Copyright 2013 The Flutter Authors. All rights reserved.
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.

@DefaultAsset('skwasm')
library skwasm_impl;

import 'dart:ffi';

import 'package:ui/src/engine/skwasm/skwasm_impl.dart';

final class RawImage extends Opaque {}
typedef ImageHandle = Pointer<RawImage>;

@Native<ImageHandle Function(
PictureHandle,
Int32,
Int32,
)>(symbol: 'image_createFromPicture', isLeaf: true)
external ImageHandle imageCreateFromPicture(
PictureHandle handle,
int width,
int height,
);

@Native<ImageHandle Function(
SkDataHandle,
Int,
Int,
Bool,
Size
)>(symbol: 'image_createFromPixels', isLeaf: true)
external ImageHandle imageCreateFromPixels(
SkDataHandle pixelData,
int width,
int height,
bool isBgra,
int rowByteCount,
);

@Native<Void Function(ImageHandle)>(symbol: 'image_dispose', isLeaf: true)
external void imageDispose(ImageHandle handle);

@Native<Int Function(ImageHandle)>(symbol: 'image_getWidth', isLeaf: true)
external int imageGetWidth(ImageHandle handle);

@Native<Int Function(ImageHandle)>(symbol: 'image_getHeight', isLeaf: true)
external int imageGetHeight(ImageHandle handle);
Loading