[impellerc] remove remaining remap sampler support (#39198)

flutter · Jan 27, 2023 · 4bab184 · 4bab184
1 parent 70f96af
commit 4bab184
Show file tree

Hide file tree

Showing 6 changed files with 0 additions and 14 deletions.
diff --git a/impeller/compiler/impellerc_main.cc b/impeller/compiler/impellerc_main.cc
@@ -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;

diff --git a/impeller/compiler/source_options.h b/impeller/compiler/source_options.h
@@ -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();
 

diff --git a/impeller/compiler/switches.cc b/impeller/compiler/switches.cc
@@ -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"))),

diff --git a/impeller/compiler/switches.h b/impeller/compiler/switches.h
@@ -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;

diff --git a/impeller/tools/impeller.gni b/impeller/tools/impeller.gni
@@ -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([
@@ -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
@@ -299,9 +293,6 @@ template("impellerc") {
     if (json) {
       args += [ "--json" ]
     }
-    if (remap_samplers) {
-      args += [ "--remap-samplers" ]
-    }
 
     if (sksl) {
       sl_intermediate =

diff --git a/lib/ui/fixtures/shaders/BUILD.gn b/lib/ui/fixtures/shaders/BUILD.gn
@@ -42,7 +42,6 @@ if (enable_unittests) {
     intermediates_subdir = "iplr-remap"
     sl_file_extension = "iplr"
     iplr = true
-    remap_samplers = true
   }
 
   test_fixtures("fixtures") {