Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[impellerc] remove remaining remap sampler support #39198

Merged
merged 1 commit into from
Jan 27, 2023
Merged

[impellerc] remove remaining remap sampler support #39198

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
1 change: 0 additions & 1 deletion impeller/compiler/impellerc_main.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,6 @@ bool Main(const fml::CommandLine& command_line) {
switches.source_file_name, options.type, options.source_language,
switches.entry_point);
options.json_format = switches.json_format;
options.remap_samplers = switches.remap_samplers;
options.gles_language_version = switches.gles_language_version;

Reflector::Options reflector_options;
Expand Down
1 change: 0 additions & 1 deletion impeller/compiler/source_options.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,6 @@ struct SourceOptions {
uint32_t gles_language_version = 100;
std::vector<std::string> defines;
bool json_format = false;
bool remap_samplers = false;

SourceOptions();

Expand Down
1 change: 0 additions & 1 deletion impeller/compiler/switches.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -128,7 +128,6 @@ Switches::Switches(const fml::CommandLine& command_line)
command_line.GetOptionValueWithDefault("reflection-cc", "")),
depfile_path(command_line.GetOptionValueWithDefault("depfile", "")),
json_format(command_line.HasOption("json")),
remap_samplers(command_line.HasOption("remap-samplers")),
gles_language_version(
stoi(command_line.GetOptionValueWithDefault("gles-language-version",
"0"))),
Expand Down
1 change: 0 additions & 1 deletion impeller/compiler/switches.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,6 @@ struct Switches {
std::string depfile_path;
std::vector<std::string> defines;
bool json_format;
bool remap_samplers;
SourceLanguage source_language = SourceLanguage::kUnknown;
uint32_t gles_language_version;
std::string entry_point;
Expand Down
9 changes: 0 additions & 9 deletions impeller/tools/impeller.gni
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -242,13 +242,9 @@ template("impellerc") {
iplr = invoker.iplr
}
json = false
remap_samplers = false
if (defined(invoker.json) && invoker.json) {
json = invoker.json
}
if (defined(invoker.remap_samplers) && invoker.remap_samplers) {
remap_samplers = invoker.remap_samplers
}

# Not needed on every path.
not_needed([
Expand All @@ -261,8 +257,6 @@ template("impellerc") {
# Optional: invoker.intermediates_subdir specifies the subdirectory in which
# to put intermediates.
# Optional: invoker.json Causes output format to be JSON instead of flatbuffer.
# Optional: invoker.remap_samplers Output metal samplers according to
# declaration order instead of usage order.

_impellerc(target_name) {
sources = invoker.shaders
Expand Down Expand Up @@ -299,9 +293,6 @@ template("impellerc") {
if (json) {
args += [ "--json" ]
}
if (remap_samplers) {
args += [ "--remap-samplers" ]
}

if (sksl) {
sl_intermediate =
Expand Down
1 change: 0 additions & 1 deletion lib/ui/fixtures/shaders/BUILD.gn
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,6 @@ if (enable_unittests) {
intermediates_subdir = "iplr-remap"
sl_file_extension = "iplr"
iplr = true
remap_samplers = true
}

test_fixtures("fixtures") {
Expand Down