Remove SetShaderModel from API (google#734)

The downstream users that use this method have been updated. SetHLSLShaderModel is the replacement. Fixes google#673
dneto0 · Jun 24, 2019 · 16f6e6a · 16f6e6a
1 parent b3523d5
commit 16f6e6a
Show file tree

Hide file tree

Showing 3 changed files with 0 additions and 14 deletions.
diff --git a/libshaderc_spvc/include/shaderc/spvc.h b/libshaderc_spvc/include/shaderc/spvc.h
@@ -164,10 +164,6 @@ shaderc_spvc_compile_options_set_msl_discrete_descriptor_sets(
     shaderc_spvc_compile_options_t options, const uint32_t* descriptors,
     size_t num_descriptors);
 
-// DEPRECATED: Set HLSL shader model.  Default is 30.
-SHADERC_EXPORT void shaderc_spvc_compile_options_set_shader_model(
-    shaderc_spvc_compile_options_t options, uint32_t model);
-
 // Set HLSL shader model.  Default is 30.
 SHADERC_EXPORT void shaderc_spvc_compile_options_set_hlsl_shader_model(
     shaderc_spvc_compile_options_t options, uint32_t model);

diff --git a/libshaderc_spvc/include/shaderc/spvc.hpp b/libshaderc_spvc/include/shaderc/spvc.hpp
@@ -203,11 +203,6 @@ class CompileOptions {
         options_, descriptors.data(), descriptors.size());
   }
 
-  // DEPRECATED: Which HLSL shader model should be used.  Default is 30.
-  void SetShaderModel(uint32_t model) {
-    shaderc_spvc_compile_options_set_shader_model(options_, model);
-  }
-
   // Which HLSL shader model should be used.  Default is 30.
   void SetHLSLShaderModel(uint32_t model) {
     shaderc_spvc_compile_options_set_hlsl_shader_model(options_, model);

diff --git a/libshaderc_spvc/src/spvc.cc b/libshaderc_spvc/src/spvc.cc
@@ -206,11 +206,6 @@ void shaderc_spvc_compile_options_set_msl_discrete_descriptor_sets(
               options->msl_discrete_descriptor_sets.begin());
 }
 
-void shaderc_spvc_compile_options_set_shader_model(
-    shaderc_spvc_compile_options_t options, uint32_t model) {
-  options->hlsl.shader_model = model;
-}
-
 void shaderc_spvc_compile_options_set_hlsl_shader_model(
     shaderc_spvc_compile_options_t options, uint32_t model) {
   options->hlsl.shader_model = model;