always enabl remapping

Author: jonahwilliams

impeller/compiler/compiler.cc

@@ -20,6 +20,24 @@
 namespace impeller {
 namespace compiler {
 
+static std::optional<spv::ExecutionModel> SourceTypeToExecutionModel(
+    const SourceType& type) {
+  switch (type) {
+    case SourceType::kUnknown:
+      return std::nullopt;
+    case SourceType::kVertexShader:
+      return spv::ExecutionModel::ExecutionModelVertex;
+    case SourceType::kFragmentShader:
+      return spv::ExecutionModel::ExecutionModelFragment;
+    case SourceType::kTessellationControlShader:
+      return spv::ExecutionModel::ExecutionModelTessellationControl;
+    case SourceType::kTessellationEvaluationShader:
+      return spv::ExecutionModel::ExecutionModelTessellationEvaluation;
+    case SourceType::kComputeShader:
+      return spv::ExecutionModel::ExecutionModelGLCompute;
+  }
+}
+
 const uint32_t kFragBindingBase = 128;
 const size_t kNumUniformKinds =
     static_cast<int>(shaderc_uniform_kind::shaderc_uniform_kind_buffer) + 1;
@@ -34,42 +52,40 @@ static CompilerBackend CreateMSLCompiler(const spirv_cross::ParsedIR& ir,
   // Metal to AIR must be updated as well.
   sl_options.msl_version =
       spirv_cross::CompilerMSL::Options::make_msl_version(1, 2);
+  sl_options.enable_decoration_binding = true;
   sl_compiler->set_msl_options(sl_options);
 
   // Set metal resource mappings to be consistent with location based mapping
-  // used on other backends when creating fragment shaders. This relies on the
-  // fact that the order of uniforms in the IR mirrors the declared order in the
-  // shader source.
-  if (source_options.remap_samplers) {
-    std::vector<uint32_t> sampler_offsets;
-    ir.for_each_typed_id<spirv_cross::SPIRVariable>(
-        [&](uint32_t, const spirv_cross::SPIRVariable& var) {
-          if (var.storage != spv::StorageClassUniformConstant) {
-            return;
-          }
-          const auto spir_type = sl_compiler->get_type(var.basetype);
-          if (spir_type.basetype !=
-              spirv_cross::SPIRType::BaseType::SampledImage) {
-            return;
-          }
-          auto location = sl_compiler->get_decoration(
-              var.self, spv::Decoration::DecorationLocation);
-          sampler_offsets.push_back(location);
-        });
-    if (sampler_offsets.size() > 0) {
-      auto start_offset =
-          *std::min_element(sampler_offsets.begin(), sampler_offsets.end());
-      for (auto offset : sampler_offsets) {
-        sl_compiler->add_msl_resource_binding({
-            .stage = spv::ExecutionModel::ExecutionModelFragment,
-            .basetype = spirv_cross::SPIRType::BaseType::SampledImage,
-            .binding = offset,
-            .count = 1u,
-            .msl_buffer = offset - start_offset,
-            .msl_texture = offset - start_offset,
-            .msl_sampler = offset - start_offset,
-        });
-      }
+  // used on other backends when creating shaders.
+  std::vector<uint32_t> sampler_offsets;
+  ir.for_each_typed_id<spirv_cross::SPIRVariable>(
+      [&](uint32_t, const spirv_cross::SPIRVariable& var) {
+        if (var.storage != spv::StorageClassUniformConstant) {
+          return;
+        }
+        const auto spir_type = sl_compiler->get_type(var.basetype);
+        if (spir_type.basetype !=
+            spirv_cross::SPIRType::BaseType::SampledImage) {
+          return;
+        }
+        auto location = sl_compiler->get_decoration(
+            var.self, spv::Decoration::DecorationLocation);
+        sampler_offsets.push_back(location);
+      });
+  auto stage = SourceTypeToExecutionModel(source_options.type);
+  if (stage.has_value() && sampler_offsets.size() > 0) {
+    auto start_offset =
+        *std::min_element(sampler_offsets.begin(), sampler_offsets.end());
+    for (auto offset : sampler_offsets) {
+      sl_compiler->add_msl_resource_binding({
+          .stage = stage.value(),
+          .basetype = spirv_cross::SPIRType::BaseType::SampledImage,
+          .binding = offset,
+          .count = 1u,
+          .msl_buffer = offset - start_offset,
+          .msl_texture = offset - start_offset,
+          .msl_sampler = offset - start_offset,
+      });
     }
   }
 

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;

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();
 

impeller/compiler/switches.cc

@@ -71,9 +71,6 @@ void Switches::PrintHelp(std::ostream& stream) {
   stream << "[optional] --depfile=<depfile_path>" << std::endl;
   stream << "[optional] --gles-language-verision=<number>" << std::endl;
   stream << "[optional] --json" << std::endl;
-  stream << "[optional] --remap-samplers (force metal sampler index to match "
-            "declared order)"
-         << std::endl;
 }
 
 Switches::Switches() = default;
@@ -128,7 +125,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"))),

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;