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

[web] remove runtime effect check #38832

Merged
merged 1 commit into from
Jan 13, 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
8 changes: 0 additions & 8 deletions lib/web_ui/lib/src/engine/canvaskit/canvaskit_api.dart
Original file line number Diff line number Diff line change
Expand Up @@ -136,16 +136,8 @@ extension CanvasKitExtension on CanvasKit {
Object src,
SkPartialImageInfo info,
);

/// Retrieve the RuntimeEffect namespace for null checking.
external Object? get RuntimeEffect;
}

// TODO(jonahwilliams): remove this once all CanvasKit versions
// are built in the SDK.
// https://github.com/flutter/flutter/issues/114260
final bool isRuntimeEffectAvailable = windowFlutterCanvasKit?.RuntimeEffect != null;

@JS('window.CanvasKitInit')
external Object _CanvasKitInit(CanvasKitInitOptions options);

Expand Down
3 changes: 0 additions & 3 deletions lib/web_ui/lib/src/engine/canvaskit/renderer.dart
Original file line number Diff line number Diff line change
Expand Up @@ -384,9 +384,6 @@ class CanvasKitRenderer implements Renderer {
if (_programs.containsKey(assetKey)) {
return _programs[assetKey]!;
}
if (!isRuntimeEffectAvailable) {
throw Exception('FragmentProgram is not supported.');
}
return _programs[assetKey] = assetManager.load(assetKey).then((ByteData data) {
return CkFragmentProgram.fromBytes(assetKey, data.buffer.asUint8List());
});
Expand Down
39 changes: 18 additions & 21 deletions lib/web_ui/test/canvaskit/canvaskit_api_test.dart
Original file line number Diff line number Diff line change
Expand Up @@ -349,44 +349,41 @@ void _shaderTests() {
});

test('RuntimeEffect', () {
// TODO(hterkelsen): Remove this check when local CanvasKit is default.
if (isRuntimeEffectAvailable) {
const String kSkSlProgram = r'''
const String kSkSlProgram = r'''
half4 main(vec2 fragCoord) {
return vec4(1.0, 0.0, 0.0, 1.0);
}
''';

final SkRuntimeEffect? effect = MakeRuntimeEffect(kSkSlProgram);
expect(effect, isNotNull);
final SkRuntimeEffect? effect = MakeRuntimeEffect(kSkSlProgram);
expect(effect, isNotNull);

const String kInvalidSkSlProgram = '';
const String kInvalidSkSlProgram = '';

// Invalid SkSL returns null.
final SkRuntimeEffect? invalidEffect = MakeRuntimeEffect(kInvalidSkSlProgram);
expect(invalidEffect, isNull);
// Invalid SkSL returns null.
final SkRuntimeEffect? invalidEffect = MakeRuntimeEffect(kInvalidSkSlProgram);
expect(invalidEffect, isNull);

final SkShader? shader = effect!.makeShader(<double>[]);
expect(shader, isNotNull);
final SkShader? shader = effect!.makeShader(<double>[]);
expect(shader, isNotNull);

// mismatched uniforms returns null.
final SkShader? invalidShader = effect.makeShader(<double>[1]);
// mismatched uniforms returns null.
final SkShader? invalidShader = effect.makeShader(<double>[1]);

expect(invalidShader, isNull);
expect(invalidShader, isNull);

const String kSkSlProgramWithUniforms = r'''
const String kSkSlProgramWithUniforms = r'''
uniform vec4 u_color;

half4 main(vec2 fragCoord) {
return u_color;
return u_color;
}
''';
''';

final SkShader? shaderWithUniform = MakeRuntimeEffect(kSkSlProgramWithUniforms)
!.makeShader(<double>[1.0, 0.0, 0.0, 1.0]);
final SkShader? shaderWithUniform = MakeRuntimeEffect(kSkSlProgramWithUniforms)
!.makeShader(<double>[1.0, 0.0, 0.0, 1.0]);

expect(shaderWithUniform, isNotNull);
}
expect(shaderWithUniform, isNotNull);
});
}

Expand Down
33 changes: 15 additions & 18 deletions lib/web_ui/test/canvaskit/fragment_program_test.dart
Original file line number Diff line number Diff line change
Expand Up @@ -186,29 +186,26 @@ void testMain() {
});

test('FragmentProgram can be created from JSON IPLR bundle', () async {
// TODO(hterkelsen): Remove this check when local CanvasKit is default.
if (isRuntimeEffectAvailable) {
final Uint8List data = utf8.encode(kJsonIPLR) as Uint8List;
final CkFragmentProgram program = await CkFragmentProgram.fromBytes('test', data);
final Uint8List data = utf8.encode(kJsonIPLR) as Uint8List;
final CkFragmentProgram program = await CkFragmentProgram.fromBytes('test', data);

expect(program.effect, isNotNull);
expect(program.floatCount, 32);
expect(program.textureCount, 0);
expect(program.uniforms, hasLength(17));
expect(program.name, 'test');
expect(program.effect, isNotNull);
expect(program.floatCount, 32);
expect(program.textureCount, 0);
expect(program.uniforms, hasLength(17));
expect(program.name, 'test');

final ui.FragmentShader shader = program.fragmentShader();
final ui.FragmentShader shader = program.fragmentShader();

shader.setFloat(0, 4);
shader.dispose();
shader.setFloat(0, 4);
shader.dispose();

expect(shader.debugDisposed, true);
expect(shader.debugDisposed, true);

final ui.FragmentShader shader2 = program.fragmentShader();
final ui.FragmentShader shader2 = program.fragmentShader();

shader.setFloat(0, 5);
shader2.dispose();
expect(shader2.debugDisposed, true);
}
shader.setFloat(0, 5);
shader2.dispose();
expect(shader2.debugDisposed, true);
});
}