development/flutter
development/flutter
1
0
Fork 0
mirror of https://github.com/flutter/flutter synced 2024-10-02 14:34:22 +00:00
Code Issues Packages Projects Releases Wiki Activity

[flutter_tools] use absolute path for shader lib (#116123)

Browse source 
* [flutter_tools] use absolute path for shader lib

* update tests
This commit is contained in:
Jonah Williams 2022-11-28 17:57:26 -08:00 committed by GitHub
parent 4c3b642f27
commit f777c9f651
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
packages/flutter_tools/lib/src/build_system/targets/shader_compiler.dart
View file

@ -175,8 +175,7 @@ class ShaderCompiler {
);
}
final String shaderLibPath = _fs.path.join(_fs.path.dirname(impellerc.path), 'shader_lib');
final String shaderLibPath = _fs.path.join(impellerc.parent.absolute.path, 'shader_lib');
final List<String> cmd = <String>[
impellerc.path,
target.target,
@ -190,6 +189,7 @@ class ShaderCompiler {
'--include=${input.parent.path}',
'--include=$shaderLibPath',
];
_logger.printTrace('shaderc command: $cmd');
final Process impellercProcess = await _processManager.start(cmd);
final int code = await impellercProcess.exitCode;
if (code != 0) {

2
packages/flutter_tools/test/general.shard/asset_bundle_test.dart
View file

@ -17,7 +17,7 @@ import 'package:flutter_tools/src/globals.dart' as globals;
import '../src/common.dart';
import '../src/context.dart';
const String shaderLibDir = './shader_lib';
const String shaderLibDir = '/./shader_lib';
void main() {
group('AssetBundle.build', () {

2
packages/flutter_tools/test/general.shard/build_system/targets/ios_test.dart
View file

@ -263,7 +263,7 @@ void main() {
'--input=/shader.glsl',
'--input-type=frag',
'--include=/',
'--include=./shader_lib',
'--include=/./shader_lib',
]),
FakeCommand(command: <String>[
'codesign',

2
packages/flutter_tools/test/general.shard/build_system/targets/shader_compiler_test.dart
View file

@ -16,7 +16,7 @@ import '../../../src/common.dart';
import '../../../src/fake_process_manager.dart';
const String fragDir = '/shaders';
const String shaderLibDir = './shader_lib';
const String shaderLibDir = '/./shader_lib';
const String fragPath = '/shaders/my_shader.frag';
const String notFragPath = '/shaders/not_a_frag.file';
const String outputSpirvPath = '/output/shaders/my_shader.frag.spirv';