Skip to content

Commit a4599bf

Browse files
chinmaygardednfield
authored andcommitted
Add impellerc options to compile OpenGL Desktop and ES variant shaders. (flutter#139)
Also parameterize all unit-tests so all backends are automatically tested.
1 parent a08cb8b commit a4599bf

22 files changed

+1041
-455
lines changed

impeller/compiler/BUILD.gn

+13-1
Original file line numberDiff line numberDiff line change
@@ -9,12 +9,20 @@ impeller_component("compiler_lib") {
99
"code_gen_template.h",
1010
"compiler.cc",
1111
"compiler.h",
12+
"compiler_backend.cc",
13+
"compiler_backend.h",
1214
"include_dir.h",
15+
"includer.cc",
16+
"includer.h",
1317
"logger.h",
1418
"reflector.cc",
1519
"reflector.h",
20+
"source_options.cc",
21+
"source_options.h",
1622
"switches.cc",
1723
"switches.h",
24+
"types.cc",
25+
"types.h",
1826
"utilities.cc",
1927
"utilities.h",
2028
]
@@ -52,7 +60,11 @@ impeller_component("compiler_unittests") {
5260

5361
output_name = "impellerc_unittests"
5462

55-
sources = [ "compiler_unittests.cc" ]
63+
sources = [
64+
"compiler_test.cc",
65+
"compiler_test.h",
66+
"compiler_unittests.cc",
67+
]
5668

5769
deps = [
5870
":compiler_lib",

impeller/compiler/code_gen_template.h

+3-3
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ struct {{camel_case(shader_name)}}{{camel_case(shader_stage)}}Shader {
5353
5454
static constexpr auto kResource{{camel_case(buffer.name)}} = ShaderUniformSlot<{{buffer.name}}> { // {{buffer.name}}
5555
"{{buffer.name}}", // name
56-
{{buffer.msl_res_0}}u, // binding
56+
{{buffer.ext_res_0}}u, // binding
5757
};
5858
{% endfor %}
5959
{% endif %}
@@ -91,8 +91,8 @@ struct {{camel_case(shader_name)}}{{camel_case(shader_stage)}}Shader {
9191
9292
static constexpr auto kResource{{camel_case(sampled_image.name)}} = SampledImageSlot { // {{sampled_image.name}}
9393
"{{sampled_image.name}}", // name
94-
{{sampled_image.msl_res_0}}u, // texture
95-
{{sampled_image.msl_res_1}}u, // sampler
94+
{{sampled_image.ext_res_0}}u, // texture
95+
{{sampled_image.ext_res_1}}u, // sampler
9696
};
9797
{% endfor %}
9898
{% endif %}

0 commit comments

Comments
 (0)